From cce140699a5d410d207fc813c5258bb2ec60ed2e Mon Sep 17 00:00:00 2001 From: Luka Stocker Date: Fri, 3 Nov 2023 15:16:43 +0100 Subject: [PATCH] COMP: adjus references for moved 'Services' and add Update Steps. --- .gitignore | 4 +- cli/inc.header.php | 2 +- cli/sso/index.php | 2 +- .../ILIAS/ADT/test/ilServicesADTSuite.php | 2 +- ...ccessCustomRBACOperationAddedObjective.php | 2 +- .../classes/class.ilAccessControlImporter.php | 2 +- ...lass.ilAccessPermissionsStatusTableGUI.php | 2 +- .../classes/class.ilAssignedUsersTableGUI.php | 2 +- .../class.ilAvailableRolesStatusTableGUI.php | 2 +- .../classes/class.ilObjRoleGUI.php | 4 +- .../classes/class.ilObjRoleTemplateGUI.php | 2 +- .../class.ilObjectPermissionStatusGUI.php | 2 +- .../class.ilObjectRolePermissionTableGUI.php | 4 +- ...ss.ilObjectRoleTemplateOptionsTableGUI.php | 2 +- ...ilObjectRoleTemplatePermissionTableGUI.php | 2 +- .../classes/class.ilPermissionGUI.php | 2 +- .../classes/class.ilRbacAdmin.php | 4 +- .../classes/class.ilRbacLogTableGUI.php | 2 +- .../class.ilRoleAdoptPermissionTableGUI.php | 2 +- .../classes/class.ilRoleSelectionTableGUI.php | 2 +- .../classes/class.ilRoleTableGUI.php | 2 +- .../test/ilServicesAccessControlSuite.php | 2 +- .../class.ilAccessibilityDocumentTableGUI.php | 2 +- ...class.ilAccessibilityControlConceptGUI.php | 2 +- .../test/ilServicesAccessibilitySuite.php | 2 +- .../classes/class.ilAccordionGUI.php | 6 +- .../test/ilServicesAccordionSuite.php | 2 +- .../Fields/Converter/class.arConverter.php | 2 +- .../Converter/templates/class.arTemplate.txt | 2 +- .../test/ilServicesActiveRecordSuite.php | 4 +- ...ss.ilAdministrationSettingsFormHandler.php | 2 +- .../test/ilServicesAdministrationSuite.php | 2 +- .../AdministrativeNotification/PRIVACY.md | 2 +- .../class.ilADNNotificationTableGUI.php | 2 +- ...ervicesAdministrativeNotificationSuite.php | 2 +- .../test/ilServicesAdvancedEditingSuite.php | 2 +- ....ilAdvancedMDRecordExportFilesTableGUI.php | 2 +- .../class.ilAdvancedMDRecordTableGUI.php | 2 +- ...ass.ilAdvancedMDRecordLanguageTableGUI.php | 2 +- ...AdvancedMDFieldDefinitionGroupTableGUI.php | 2 +- .../class.ilAdvancedMDFieldTableGUI.php | 2 +- .../classes/class.ilAdvancedMDParser.php | 6 +- .../test/ilServicesAdvancedMetaDataSuite.php | 2 +- .../classes/class.ilAsqFactory.php | 2 +- .../class.ilAsqQuestionResourcesCollector.php | 2 +- .../classes/class.ilAsqQuestionResult.php | 2 +- .../classes/class.ilAsqService.php | 2 +- .../class.ilAssessmentQuestionExporter.php | 2 +- .../examples/class.exQuestionPoolExporter.php | 2 +- .../examples/class.exQuestionPoolImporter.php | 4 +- .../interfaces/interface.ilAsqQuestion.php | 2 +- .../interface.ilAsqQuestionAuthoring.php | 2 +- ...interface.ilAsqQuestionNavigationAware.php | 2 +- ...AsqQuestionOfflinePresentationExporter.php | 2 +- .../interface.ilAsqQuestionPresentation.php | 2 +- .../interface.ilAsqQuestionSolution.php | 2 +- .../interface.ilAsqResultCalculator.php | 2 +- .../Config/class.ilShibbolethSettingsForm.php | 2 +- .../class.ilAuthShibbolethSettingsGUI.php | 8 +- ...ass.ilShibbolethRoleAssignmentTableGUI.php | 2 +- .../test/ilServicesAuthShibbolethSuite.php | 2 +- .../classes/Frontend/class.ilAuthFrontend.php | 2 +- .../class.ilAuthLoginPageEditorGUI.php | 2 +- .../class.ilAuthLoginPageEditorTableGUI.php | 2 +- .../classes/class.ilObjAuthSettingsGUI.php | 6 +- .../classes/class.ilSessionControl.php | 2 +- .../classes/class.ilSessionReminderGUI.php | 2 +- .../classes/class.ilSessionStatisticsGUI.php | 4 +- .../Awareness/User/class.ProviderFactory.php | 14 +- .../classes/class.ilAwarenessGUI.php | 4 +- .../test/ilServicesAwarenessSuite.php | 2 +- .../ROADMAP.md | 0 .../Jobs/class.ilCheckSumOfFileSizesJob.php | 0 .../classes/Jobs/class.ilCollectFilesJob.php | 0 .../class.ilCopyFilesToTempDirectoryJob.php | 0 .../classes/Jobs/class.ilZipJob.php | 0 .../Provider/BTNotificationProvider.php | 2 +- ...ilBackgroundTasksConfigStoredObjective.php | 2 +- .../Setup/class.ilBackgroundTasksDB80.php | 0 ...ckgroundTasksMetricsCollectedObjective.php | 0 .../class.ilBackgroundTasksSetupAgent.php | 0 .../class.ilBackgroundTasksSetupConfig.php | 0 .../classes/StateTranslator.php | 0 .../class.ilDownloadZipInteraction.php | 0 ...ss.ilSumOfFileSizesTooLargeInteraction.php | 0 .../classes/class.ilBTControllerGUI.php | 0 .../classes/class.ilBTPopOverGUI.php | 0 .../classes/class.ilCopyDefinition.php | 0 ...ss.ilSoapBackgroundTasksAdministration.php | 2 +- .../js/background_task_refresh.js | 0 .../maintenance.json | 2 +- .../service.xml | 0 .../classes/class.ilBadgeAppEventListener.php | 4 +- .../class.ilBadgeImageTemplateTableGUI.php | 2 +- .../classes/class.ilBadgePersonalTableGUI.php | 2 +- .../Badge/classes/class.ilBadgeProfileGUI.php | 4 +- .../Badge/classes/class.ilBadgeTableGUI.php | 2 +- .../classes/class.ilBadgeTypesTableGUI.php | 2 +- .../classes/class.ilBadgeUserTableGUI.php | 2 +- .../classes/class.ilObjectBadgeTableGUI.php | 2 +- .../ILIAS/Badge/test/ilServicesBadgeSuite.php | 2 +- .../classes/class.ilBibliographicDataSet.php | 2 +- .../classes/class.ilBibliographicExporter.php | 2 +- .../ILIAS/Block/classes/class.ilBlockGUI.php | 4 +- .../ILIAS/Block/classes/class.ilColumnGUI.php | 18 +- .../ILIAS/Block/test/ilServicesBlockSuite.php | 2 +- .../ILIAS/Blog/Export/BlogHtmlExport.php | 4 +- .../ILIAS/Blog/Export/class.ilBlogDataSet.php | 4 +- .../Blog/Export/class.ilBlogExporter.php | 6 +- .../Blog/Export/class.ilBlogImporter.php | 6 +- .../COPage/Editor/Server/class.UIWrapper.php | 4 +- components/ILIAS/COPage/Editor/UI/Init.php | 4 +- .../class.ilPageLayoutAdministrationGUI.php | 4 +- .../Layout/classes/class.ilPageLayout.php | 4 +- .../classes/class.ilPageLayoutTableGUI.php | 2 +- .../FileList/class.ilPCFileListTableGUI.php | 2 +- .../PC/Grid/class.ilPCGridCellTableGUI.php | 2 +- .../PC/InteractiveImage/IIMEditorInit.php | 2 +- .../InteractiveImageQueryActionHandler.php | 4 +- .../class.ilPCIIMOverlaysTableGUI.php | 2 +- .../class.ilPCIIMPopupTableGUI.php | 2 +- .../class.ilPCIIMTriggerEditorGUI.php | 4 +- .../class.ilPCIIMTriggerTableGUI.php | 2 +- .../class.ilPCInteractiveImage.php | 4 +- .../COPage/PC/Question/class.ilPCQuestion.php | 2 +- .../PC/Resources/class.ilPCResourcesGUI.php | 2 +- .../PC/Table/class.ilPCDataTableEditorGUI.php | 2 +- .../COPage/PC/Table/class.ilPCTableGUI.php | 8 +- .../COPage/PC/Tabs/class.ilPCTabsTableGUI.php | 2 +- .../Page/class.PageQueryActionHandler.php | 10 +- components/ILIAS/COPage/ROADMAP.md | 2 +- .../COPage/Resources/ResourcesCollector.php | 4 +- .../Setup/class.ilCOPageDBUpdateSteps.php | 11 + .../COPage/classes/class.ilCOPageDataSet.php | 4 +- .../COPage/classes/class.ilCOPageExporter.php | 6 +- .../classes/class.ilCOPageHTMLExport.php | 8 +- .../COPage/classes/class.ilCOPageImporter.php | 12 +- .../class.ilCopySelfAssQuestionTableGUI.php | 2 +- .../class.ilPageComponentPluginImporter.php | 2 +- .../COPage/classes/class.ilPageEditorGUI.php | 2 +- .../classes/class.ilPageHistoryTableGUI.php | 2 +- .../classes/class.ilPageMultiLangGUI.php | 2 +- .../classes/class.ilPageMultiLangTableGUI.php | 2 +- .../COPage/classes/class.ilPageObjectGUI.php | 20 +- .../classes/class.ilQuestionExporter.php | 2 +- .../COPage/test/PCInteractiveImageTest.php | 2 +- .../ILIAS/COPage/test/PCMediaObjectTest.php | 2 +- .../test/class.ilUnitTestPCDefinition.php | 2 +- .../COPage/test/ilServicesCOPageSuite.php | 80 +- components/ILIAS/COPage/xsl/XslManager.php | 2 +- .../classes/class.ilCache.php | 0 .../classes/class.ilExampleCache.php | 0 .../ILIAS/{Cache => Cache_}/maintenance.json | 2 +- .../{Cache => Cache_}/test/ilCacheTest.php | 0 .../test/ilServicesCacheSuite.php | 2 +- ...lass.ilConsultationHourBookingTableGUI.php | 2 +- .../class.ilConsultationHourGroupTableGUI.php | 2 +- .../class.ilConsultationHoursTableGUI.php | 2 +- .../classes/Export/class.ilCalendarExport.php | 4 +- .../Form/class.ilRecurrenceInputGUI.php | 4 +- .../class.ilCalendarAppEventListener.php | 4 +- .../class.ilCalendarAppointmentGUI.php | 2 +- .../class.ilCalendarAppointmentPanelGUI.php | 2 +- ...s.ilCalendarAppointmentPresentationGUI.php | 2 +- .../class.ilCalendarAppointmentsTableGUI.php | 2 +- .../classes/class.ilCalendarBlockGUI.php | 8 +- .../classes/class.ilCalendarCategoryGUI.php | 6 +- ....ilCalendarChangedAppointmentsTableGUI.php | 2 +- .../classes/class.ilCalendarDataSet.php | 14 +- .../classes/class.ilCalendarDayGUI.php | 6 +- .../class.ilCalendarHeaderNavigationGUI.php | 2 +- .../classes/class.ilCalendarInboxGUI.php | 2 +- .../class.ilCalendarInboxSharedTableGUI.php | 2 +- .../class.ilCalendarManageTableGUI.php | 2 +- .../classes/class.ilCalendarMonthGUI.php | 4 +- .../class.ilCalendarPresentationGUI.php | 2 +- .../class.ilCalendarRecurrenceTableGUI.php | 2 +- .../class.ilCalendarRemoteAccessHandler.php | 6 +- .../class.ilCalendarSelectionBlockGUI.php | 2 +- .../class.ilCalendarSharedListTableGUI.php | 2 +- ...class.ilCalendarSharedRoleListTableGUI.php | 2 +- ...class.ilCalendarSharedUserListTableGUI.php | 2 +- .../class.ilCalendarSubscriptionGUI.php | 2 +- .../Calendar/classes/class.ilCalendarUtil.php | 10 +- .../classes/class.ilCalendarViewGUI.php | 2 +- .../classes/class.ilCalendarWeekGUI.php | 6 +- .../classes/class.ilMiniCalendarGUI.php | 4 +- .../class.ilObjCalendarSettingsGUI.php | 2 +- .../classes/iCal/class.ilICalParser.php | 2 +- .../Calendar/test/ilServicesCalendarSuite.php | 2 +- .../Calendar/zoneinfo/zoneinfo_generator.php | 6 +- .../Export/class.ilCategoryExporter.php | 4 +- .../Export/class.ilCategoryImporter.php | 12 +- .../class.ilObjCategoryReferenceListGUI.php | 2 +- components/ILIAS/Certificate/README.md | 2 +- .../XLS/class.ilCertificateXlsFileLoader.php | 2 +- .../classes/Form/class.ilFormFieldParser.php | 2 +- .../Helper/ilCertificateDateHelper.php | 4 +- .../class.ilCoursePlaceholderDescription.php | 2 +- .../class.ilDefaultPlaceholderDescription.php | 2 +- ...class.ilExercisePlaceholderDescription.php | 2 +- ...CustomUserFieldsPlaceholderDescription.php | 2 +- .../class.ilScormPlaceholderDescription.php | 2 +- ...ilStudyProgrammePlaceholderDescription.php | 2 +- .../class.ilTestPlaceholderDescription.php | 2 +- ...serDefinedFieldsPlaceholderDescription.php | 2 +- .../class.ilDefaultPlaceholderValues.php | 2 +- .../class.ilCertificateAppEventListener.php | 4 +- .../classes/class.ilCertificateCron.php | 2 +- .../classes/class.ilCertificateGUI.php | 2 +- .../test/UserCertificateAPITest.php | 2 +- .../ILIAS/Chart/classes/class.ilChart.php | 10 +- .../ILIAS/Chart/classes/class.ilChartPie.php | 2 +- .../Chart/classes/class.ilChartSpider.php | 4 +- .../ILIAS/Chart/test/ilServicesChartSuite.php | 2 +- .../classes/class.ilChatroomExporter.php | 2 +- .../classes/class.ilChatroomImporter.php | 2 +- .../classes/gui/class.ilChatroomViewGUI.php | 2 +- .../class.ilCmiXapiPlaceholderDescription.php | 2 +- .../CmiXapi/classes/XapiProxy/DataService.php | 8 +- .../class.ilCmiXapiAppEventListener.php | 4 +- .../classes/class.ilCmiXapiDataSet.php | 2 +- .../classes/class.ilCmiXapiImporter.php | 4 +- components/ILIAS/CmiXapi/xapiproxy.php | 2 +- .../Component/artifacts/component_data.php | 188 +- .../Settings/class.ilObjComponentSettings.php | 2 +- .../class.ilObjComponentSettingsAccess.php | 2 +- .../class.ilObjComponentSettingsGUI.php | 2 +- ...ss.ilComponentActivatePluginsObjective.php | 4 +- ...ss.ilComponentBuildPluginInfoObjective.php | 2 +- ....ilComponentDefinitionsStoredObjective.php | 2 +- ...ass.ilComponentInfoDefinitionProcessor.php | 2 +- ...lass.ilComponentInstallPluginObjective.php | 4 +- ...class.ilComponentUpdatePluginObjective.php | 6 +- .../class.ilArtifactComponentRepository.php | 7 +- .../class.ilComponentDefinitionReader.php | 4 +- .../classes/class.ilComponentInfo.php | 4 +- .../Component/classes/class.ilPluginLP.php | 2 +- ...lComponentBuildPluginInfoObjectiveTest.php | 20 +- ...ilComponentDefinitionInfoProcessorTest.php | 6 +- .../ilArtifactComponentRepositoryTest.php | 22 +- .../test/ilComponentDefinitionReaderTest.php | 4 +- .../test/ilServicesComponentSuite.php | 18 +- .../classes/class.ilConditionHandlerGUI.php | 2 +- .../class.ilConditionHandlerTableGUI.php | 2 +- .../test/ilServicesConditionsSuite.php | 2 +- .../BuddySystem/classes/class.ilBuddyList.php | 8 +- .../classes/class.ilBuddySystemGUI.php | 2 +- .../classes/class.ilBuddySystemLinkButton.php | 2 +- ...BuddySystemRelationStateButtonRenderer.php | 2 +- .../class.ilBuddySystemRelationsTableGUI.php | 4 +- .../class.ilContactAppEventListener.php | 4 +- .../class.ilMailMemberSearchTableGUI.php | 2 +- .../Contact/classes/class.ilMailSearchGUI.php | 8 +- .../classes/class.ilMailSearchObjectGUI.php | 4 +- ....ilMailSearchObjectMembershipsTableGUI.php | 2 +- .../class.ilMailSearchObjectsTableGUI.php | 2 +- .../classes/class.ilMailingListsGUI.php | 14 +- .../class.ilMailingListsMembersTableGUI.php | 2 +- .../classes/class.ilMailingListsTableGUI.php | 2 +- .../class.ilClassificationBlockGUI.php | 6 +- .../ObjectiveView/class.ObjectiveRenderer.php | 6 +- .../class.ilContainerObjectiveGUI.php | 10 +- .../class.ilContainerSessionsContentGUI.php | 2 +- .../Content/class.ilContainerContentGUI.php | 8 +- .../Content/class.ilContainerRenderer.php | 2 +- .../Export/class.ilContainerExporter.php | 10 +- .../Export/class.ilContainerImporter.php | 10 +- .../Export/class.ilContainerXmlParser.php | 24 +- .../class.ilContainerFilterTableGUI.php | 2 +- .../classes/class.ilContProfileTableGUI.php | 2 +- .../class.ilContSkillMemberTableGUI.php | 2 +- .../classes/class.ilContSkillTableGUI.php | 2 +- ...ilContainerStartObjectsContentTableGUI.php | 2 +- .../class.ilContainerStartObjectsTableGUI.php | 2 +- .../class.ilContainerAppEventListener.php | 2 +- .../classes/class.ilContainerGUI.php | 2 +- .../test/ilServicesContainerSuite.php | 4 +- ...s.ilContainerReferenceAppEventListener.php | 2 +- .../class.ilContainerReferenceExporter.php | 2 +- .../classes/class.ilContainerReferenceGUI.php | 4 +- .../class.ilContainerReferenceImporter.php | 4 +- .../class.ilContainerReferenceXmlParser.php | 2 +- .../class.ilContainerSelectionExplorer.php | 2 +- .../ilServicesContainerReferenceSuite.php | 2 +- .../classes/class.ilContentPageDataSet.php | 6 +- .../classes/class.ilContentPageExporter.php | 8 +- .../classes/class.ilContentPageImporter.php | 4 +- .../Context/classes/class.ilContextSaml.php | 4 +- .../ILIAS/Context/test/ilContextTest.php | 2 +- .../Context/test/ilServicesContextSuite.php | 2 +- .../test/ilServicesCopyWizardSuite.php | 2 +- .../class.ilCourseObjectiveListGUI.php | 2 +- .../Objectives/class.ilLOXmlParser.php | 6 +- .../class.ilCourseAppEventListener.php | 4 +- .../Course/classes/class.ilCourseExporter.php | 8 +- .../Course/classes/class.ilCourseImporter.php | 6 +- .../classes/class.ilCourseRegistrationGUI.php | 8 +- ...lass.ilCourseReferenceAppEventListener.php | 4 +- .../class.ilCourseReferenceExporter.php | 4 +- .../class.ilCourseReferenceImporter.php | 4 +- .../class.ilCourseReferenceXmlParser.php | 2 +- .../class.ilCourseReferenceXmlWriter.php | 2 +- .../classes/class.ilObjCourseReference.php | 2 +- .../class.ilObjCourseReferenceAccess.php | 2 +- .../class.ilObjCourseReferenceListGUI.php | 2 +- .../Setup/class.ilCronDefinitionProcessor.php | 2 +- .../classes/class.ilCronManagerTableGUI.php | 2 +- .../class.ilDashboardSortationTableGUI.php | 2 +- .../class.ilObjDashboardSettingsGUI.php | 2 +- .../Dashboard/Block/classes/BlockDTO.php | 2 +- .../classes/class.ilDashboardBlockGUI.php | 6 +- .../classes/class.ilMembershipBlockGUI.php | 2 +- .../classes/class.ilSelectedItemsBlockGUI.php | 2 +- .../classes/class.ilDashObjectsTableGUI.php | 2 +- .../classes/class.ilDashboardGUI.php | 6 +- .../test/ilServicesDashboardSuite.php | 2 +- .../class.ilDclDetailedViewGUI.php | 2 +- .../classes/class.ilDataCollectionDataSet.php | 8 +- .../class.ilDataCollectionExporter.php | 4 +- .../class.ilDataCollectionGlobalTemplate.php | 16 +- .../classes/class.ilObjDataCollectionGUI.php | 2 +- .../ILIAS/DataProtection/classes/Consumer.php | 2 +- .../DataSet/test/ilServicesDataSetSuite.php | 2 +- .../classes/Integrity/Association.php | 2 +- .../Database/classes/Integrity/Definition.php | 4 +- .../Database/classes/Integrity/Field.php | 2 +- .../Database/classes/Integrity/Ignore.php | 2 +- .../Database/classes/Integrity/Integrity.php | 2 +- .../Database/classes/Integrity/Result.php | 2 +- .../FieldDefinition/ForeignKeyConstraints.php | 2 +- .../Database/classes/PDO/class.ilDBPdo.php | 4 +- ...ss.ilDatabaseMetricsCollectedObjective.php | 4 +- .../class.ilDatabaseUpdatedObjective.php | 4 +- .../interfaces/interface.ilDBInterface.php | 4 +- .../test/Integrity/AssociationTest.php | 4 +- .../test/Integrity/DefinitionTest.php | 10 +- .../Database/test/Integrity/FieldTest.php | 2 +- .../Database/test/Integrity/IgnoreTest.php | 2 +- .../Database/test/Integrity/IntegrityTest.php | 10 +- .../Database/test/Integrity/ResultTest.php | 2 +- .../Database/test/ilServicesDatabaseSuite.php | 4 +- .../test/ilServicesDidacticTemplateSuite.php | 2 +- .../Environment/classes/class.ilRuntime.php | 2 +- .../artifacts/event_handling_data.php | 144 +- .../classes/class.ilAppEventHandler.php | 8 +- .../class.ilArtifactEventHandlingData.php | 2 +- .../class.ilEventHandlingAppEventListener.php | 2 +- .../classes/class.ilEventHookPlugin.php | 2 +- .../interface.ilAppEventListener.php | 2 +- .../ILIAS/EventHandling/test/EventTest.php | 4 +- .../test/ilServicesEventHandlingSuite.php | 2 +- components/ILIAS/Excel/README.md | 2 +- .../ILIAS/Excel/test/ilServicesExcelSuite.php | 2 +- .../test/ilServicesExceptionsSuite.php | 2 +- .../Assignment/class.ilExAssignment.php | 2 +- .../class.ilExAssignmentEditorGUI.php | 2 +- .../Exercise/IRSS/CollectionWrapperGUI.php | 4 +- .../classes/class.ilExerciseDataSet.php | 8 +- .../classes/class.ilExerciseExporter.php | 8 +- components/ILIAS/Export/HTML/class.Util.php | 2 +- .../Export/Print/class.PrintProcessGUI.php | 6 +- .../ILIAS/Export/classes/class.ilExport.php | 6 +- .../Export/classes/class.ilExportGUI.php | 2 +- .../class.ilExportSelectionTableGUI.php | 2 +- .../Export/classes/class.ilExportTableGUI.php | 2 +- .../ILIAS/Export/classes/class.ilImport.php | 6 +- .../classes/class.ilImportContainer.php | 4 +- .../class.ilSubItemSelectionTableGUI.php | 2 +- .../Export/test/ilServicesExportSuite.php | 2 +- .../Feeds/classes/class.ilFeedWriter.php | 2 +- .../ILIAS/Feeds/test/ilServicesFeedsSuite.php | 2 +- .../Versions/class.ilFileVersionsGUI.php | 8 +- .../File/classes/class.ilFileExporter.php | 4 +- .../File/classes/class.ilFileImporter.php | 4 +- .../ILIAS/File/classes/class.ilObjFileGUI.php | 10 +- .../File/classes/class.ilObjFileListGUI.php | 4 +- .../ILIAS/FileDelivery/classes/Delivery.php | 4 +- .../test/ilServicesFileDeliverySuite.php | 6 +- .../classes/class.ilFileServicesSettings.php | 2 +- .../test/ilServicesFileServicesSuite.php | 4 +- ...ComponentDataDirectoryCreatedObjective.php | 2 +- ...lFileSystemDirectoriesCreatedObjective.php | 4 +- .../Setup/class.ilFileSystemSetupConfig.php | 2 +- .../classes/class.ilFileSystemTableGUI.php | 2 +- .../test/ilServicesFileSystemSuite.php | 2 +- .../Folder/classes/class.ilFolderExporter.php | 2 +- .../Folder/classes/class.ilFolderImporter.php | 4 +- .../Form/classes/class.ilAlphabetInputGUI.php | 2 +- .../classes/class.ilCheckboxGroupInputGUI.php | 2 +- .../Form/classes/class.ilCheckboxInputGUI.php | 2 +- .../classes/class.ilColorPickerInputGUI.php | 2 +- .../classes/class.ilCombinationInputGUI.php | 2 +- .../classes/class.ilDateDurationInputGUI.php | 2 +- .../Form/classes/class.ilDateTimeInputGUI.php | 2 +- .../Form/classes/class.ilDurationInputGUI.php | 2 +- .../Form/classes/class.ilEMailInputGUI.php | 2 +- .../Form/classes/class.ilFileInputGUI.php | 2 +- .../classes/class.ilFileWizardInputGUI.php | 6 +- .../ILIAS/Form/classes/class.ilFormGUI.php | 4 +- .../Form/classes/class.ilFormPropertyGUI.php | 2 +- .../Form/classes/class.ilHierarchyFormGUI.php | 8 +- .../classes/class.ilImageFileInputGUI.php | 4 +- .../Form/classes/class.ilLinkInputGUI.php | 2 +- .../Form/classes/class.ilLocationInputGUI.php | 2 +- .../classes/class.ilMultiSelectInputGUI.php | 2 +- .../classes/class.ilNonEditableValueGUI.php | 2 +- .../Form/classes/class.ilNumberInputGUI.php | 2 +- .../Form/classes/class.ilPasswordInputGUI.php | 2 +- .../Form/classes/class.ilPropertyFormGUI.php | 8 +- .../classes/class.ilRadioGroupInputGUI.php | 2 +- .../class.ilRepositorySelectorInputGUI.php | 2 +- .../classes/class.ilSelectBuilderInputGUI.php | 6 +- .../Form/classes/class.ilSelectInputGUI.php | 2 +- .../Form/classes/class.ilTextAreaInputGUI.php | 2 +- .../Form/classes/class.ilTextInputGUI.php | 4 +- .../classes/class.ilTextWizardInputGUI.php | 6 +- .../ILIAS/Form/test/ilServicesFormSuite.php | 2 +- .../classes/class.ilForumAppEventListener.php | 6 +- .../Forum/classes/class.ilForumExporter.php | 8 +- .../Forum/classes/class.ilForumImporter.php | 6 +- .../Forum/classes/class.ilForumXMLParser.php | 2 +- .../Forum/classes/class.ilObjForumGUI.php | 2 +- .../{GlobalCache => GlobalCache_}/PRIVACY.md | 0 .../{GlobalCache => GlobalCache_}/ROADMAP.md | 0 ...class.ilGlobalCacheAllFlushedObjective.php | 0 ...ass.ilGlobalCacheConfigStoredObjective.php | 2 +- ...ilGlobalCacheMetricsCollectedObjective.php | 0 .../Setup/class.ilGlobalCacheSetupAgent.php | 0 .../class.ilGlobalCacheSettingsAdapter.php | 0 .../class.ilMemcacheNodesRepository.php | 0 .../maintenance.json | 2 +- .../ROADMAP.md | 0 .../artifacts/global_screen_providers.php | 4 +- .../Helper/BasicAccessCheckClosures.php | 0 .../BasicAccessCheckClosuresSingleton.php | 0 ...lGlobalScreenBuildProviderMapObjective.php | 2 +- .../Setup/class.ilGlobalScreenSetupAgent.php | 0 .../classes/class.ilGSProviderFactory.php | 2 +- .../maintenance.json | 2 +- .../test/ilServicesGlobalScreenSuite.php | 2 +- .../test/ilServicesGlobalScreenTest.php | 0 .../Glossary/Export/GlossaryHtmlExport.php | 4 +- .../Export/class.ilGlossaryDataSet.php | 16 +- .../Export/class.ilGlossaryExporter.php | 12 +- .../Export/class.ilGlossaryImporter.php | 6 +- .../class.ilGlossaryPresentationGUI.php | 2 +- .../class.ilGlossaryAppEventListener.php | 2 +- .../classes/class.ilGroupAppEventListener.php | 4 +- .../Group/classes/class.ilGroupExporter.php | 6 +- .../Group/classes/class.ilGroupImporter.php | 6 +- .../classes/class.ilGroupRegistrationGUI.php | 8 +- .../class.ilGroupReferenceExporter.php | 4 +- .../class.ilGroupReferenceImporter.php | 4 +- .../class.ilGroupReferenceXmlParser.php | 2 +- .../class.ilGroupReferenceXmlWriter.php | 2 +- .../classes/class.ilObjGroupReference.php | 2 +- .../class.ilObjGroupReferenceAccess.php | 2 +- .../classes/class.ilObjGroupReferenceGUI.php | 2 +- .../class.ilObjGroupReferenceListGUI.php | 2 +- .../class.ilHTMLLearningModuleDataSet.php | 4 +- .../class.ilHTMLLearningModuleExporter.php | 4 +- .../class.ilHelpModuleTableGUI.php | 2 +- .../ILIAS/Help/Export/class.ilHelpDataSet.php | 6 +- .../Help/Export/class.ilHelpExporter.php | 4 +- .../Help/Export/class.ilHelpImporter.php | 4 +- .../ILIAS/Help/Module/ModuleManager.php | 4 +- .../ILIAS/Help/classes/class.ilHelpGUI.php | 12 +- .../ILIAS/Help/test/ilServicesHelpSuite.php | 2 +- .../classes/class.ilHistoryTableGUI.php | 2 +- .../History/test/ilServicesHistorySuite.php | 2 +- .../Imprint/test/ilServicesImprintSuite.php | 2 +- .../class.ilIndividualAssessmentDataSet.php | 2 +- .../class.ilIndividualAssessmentExporter.php | 2 +- .../ilIndividualAssessmentExporterTest.php | 2 +- .../classes/class.ilInfoScreenGUI.php | 4 +- .../test/ilServicesInfoScreenSuite.php | 2 +- .../classes/Dependencies/InitCtrlService.php | 4 +- .../Init/classes/class.ilErrorHandling.php | 6 +- .../Init/classes/class.ilInitialisation.php | 44 +- .../ILIAS/Init/classes/class.ilStartUpGUI.php | 24 +- .../classes/class.ilItemGroupDataSet.php | 4 +- .../ILIAS/{KioskMode => KioskMode_}/README.md | 0 .../classes/class.ilKioskModeService.php | 0 .../classes/class.ilKioskModeView.php | 0 .../maintenance.json | 2 +- .../test/class.ilDummyKioskModeView.php | 0 .../test/ilKioskModeServiceTest.php | 0 .../test/ilServicesKioskModeSuite.php | 0 .../class.ilLDAPRoleAssignmentTableGUI.php | 2 +- .../class.ilLDAPRoleMappingTableGUI.php | 2 +- .../classes/class.ilLDAPServerTableGUI.php | 2 +- .../LDAP/classes/class.ilLDAPSettingsGUI.php | 8 +- .../class.ilObjectConsumerTableGUI.php | 2 +- ...s.ilLTIProviderReleasedObjectsTableGUI.php | 2 +- .../classes/Screen/LtiViewLayoutProvider.php | 2 +- .../classes/class.ilLTIAppEventListener.php | 2 +- .../class.ilObjLTIAdministrationGUI.php | 2 +- ...ss.ilLTIConsumerPlaceholderDescription.php | 2 +- components/ILIAS/LTIConsumer/ltiauth.php | 2 +- components/ILIAS/LTIConsumer/lticerts.php | 2 +- components/ILIAS/LTIConsumer/lticonfig.php | 2 +- components/ILIAS/LTIConsumer/ltiregend.php | 2 +- .../ILIAS/LTIConsumer/ltiregistration.php | 2 +- components/ILIAS/LTIConsumer/ltiregstart.php | 2 +- components/ILIAS/LTIConsumer/ltiservices.php | 2 +- components/ILIAS/LTIConsumer/ltitoken.php | 2 +- components/ILIAS/LTIConsumer/result.php | 2 +- .../ILIAS/{Language => Language_}/README.md | 0 .../ILIAS/{Language => Language_}/ROADMAP.md | 0 .../class.ilDefaultLanguageSetObjective.php | 0 ...ss.ilLanguageMetricsCollectedObjective.php | 0 .../Setup/class.ilLanguageObjective.php | 0 .../Setup/class.ilLanguageSetupAgent.php | 4 +- ...lLanguagesInstalledAndUpdatedObjective.php | 0 .../class.ilLanguagesUpdatedObjective.php | 0 ...class.ilPluginLanguageUpdatedObjective.php | 6 +- .../classes/Setup/class.ilSetupLanguage.php | 2 +- .../classes/class.ilCachedLanguage.php | 0 .../class.ilDefaultLanguageDetector.php | 4 +- .../class.ilHttpRequestsLanguageDetector.php | 6 +- .../classes/class.ilLangDeprecated.php | 0 .../classes/class.ilLanguage.php | 4 +- .../classes/class.ilLanguageDetection.php | 6 +- .../class.ilLanguageDetectorFactory.php | 8 +- .../classes/class.ilLanguageExtTableGUI.php | 14 +- .../classes/class.ilLanguageFactory.php | 0 .../classes/class.ilLanguageFile.php | 2 +- .../classes/class.ilLanguageTableGUI.php | 6 +- .../classes/class.ilObjLanguage.php | 4 +- .../classes/class.ilObjLanguageAccess.php | 0 .../classes/class.ilObjLanguageDBAccess.php | 0 .../classes/class.ilObjLanguageExt.php | 8 +- .../classes/class.ilObjLanguageExtGUI.php | 24 +- .../classes/class.ilObjLanguageFolder.php | 4 +- .../class.ilObjLanguageFolderAccess.php | 2 +- .../classes/class.ilObjLanguageFolderGUI.php | 12 +- .../classes/class.ilObjLanguageGUI.php | 2 +- .../classes/class.ilPluginLanguage.php | 0 .../exceptions/class.ilLanguageException.php | 2 +- .../interface.ilLanguageDetector.php | 2 +- .../{Language => Language_}/maintenance.json | 2 +- .../ILIAS/{Language => Language_}/service.xml | 0 .../default/tpl.lang_file_header.html | 0 .../templates/default/tpl.lang_items_row.html | 0 .../templates/default/tpl.lang_list_row.html | 0 .../default/tpl.lang_list_row_extended.html | 0 .../default/tpl.lang_statistics_row.html | 0 .../test/bootstrap.php | 0 .../test/ilLanguageBaseTest.php | 0 .../test/ilLanguageSetupAgentTest.php | 4 +- .../test/ilObjLanguageDBAccessTest.php | 0 .../test/ilServicesLanguageSuite.php | 0 .../test/ilSetupLanguageTest.php | 0 .../use-language-logging.md | 0 .../use-language-object.md | 0 .../classes/class.ilLearningHistoryGUI.php | 4 +- .../class.ilLearningHistoryTimelineItem.php | 4 +- .../classes/class.ilPCLearningHistory.php | 2 +- ...lass.ilAbstractLearningHistoryProvider.php | 2 +- .../test/ilServicesLearningHistorySuite.php | 2 +- .../Export/class.LMHtmlExport.php | 10 +- .../Export/class.ilContObjectExport.php | 2 +- .../class.ilLMPresentationGUI.php | 2 +- .../classes/class.ilLMMenuGUI.php | 2 +- .../classes/class.ilLearningModuleDataSet.php | 18 +- .../class.ilLearningModuleExporter.php | 18 +- .../class.ilLearningModuleImporter.php | 12 +- .../templates/default/tpl.blank.html | 2 +- .../class.ilDashboardLearningSequenceGUI.php | 2 +- ...ass.ilLearningSequenceAppEventListener.php | 4 +- .../class.ilLearningSequenceExporter.php | 4 +- .../class.ilLearningSequenceImporter.php | 8 +- .../ConsumerSlots/ModifyFooter.php | 2 +- .../ILIAS/LegalDocuments/classes/Internal.php | 2 +- .../LegalDocuments/classes/Legacy/Table.php | 4 +- .../ILIAS/Like/classes/class.ilLikeGUI.php | 8 +- .../ILIAS/Like/test/ilServicesLikeSuite.php | 2 +- .../Link/classes/class.ilInternalLinkGUI.php | 14 +- .../Link/classes/class.ilLinkifyUtil.php | 2 +- .../ILIAS/Link/test/ilServicesLinkSuite.php | 2 +- .../Locator/classes/class.ilLocatorGUI.php | 4 +- .../Locator/test/ilServicesLocatorSuite.php | 2 +- .../ILIAS/Logging/classes/NullLogger.php | 2 +- .../classes/class.ilLogComponentTableGUI.php | 2 +- .../Logging/test/ilServicesLoggingSuite.php | 2 +- components/ILIAS/Mail/README.md | 4 +- .../Error/class.ilMailErrorFormatter.php | 2 +- .../Form/class.ilMailQuickFilterInputGUI.php | 2 +- .../class.ilMailTemplateSelectInputGUI.php | 2 +- .../class.ilManualPlaceholderInputGUI.php | 4 +- .../class.ilMailMimeTransportBase.php | 2 +- .../ILIAS/Mail/classes/class.ilMail.php | 2 +- .../classes/class.ilMailAppEventListener.php | 4 +- .../class.ilMailAttachmentTableGUI.php | 2 +- .../Mail/classes/class.ilMailFolderGUI.php | 4 +- .../classes/class.ilMailFolderTableGUI.php | 4 +- .../class.ilMailFormAttachmentPropertyGUI.php | 2 +- .../Mail/classes/class.ilMailFormGUI.php | 4 +- .../classes/class.ilMailTemplateTableGUI.php | 2 +- .../class.ilMailUserFieldChangeListener.php | 6 +- .../ILIAS/Mail/classes/class.ilMimeMail.php | 10 +- .../Mail/classes/class.ilPDMailBlockGUI.php | 2 +- .../ILIAS/Mail/classes/class.ilPDMailGUI.php | 2 +- .../class.ilMMItemTranslationTableGUI.php | 2 +- .../class.ilMMSubItemTableGUI.php | 2 +- .../class.ilMMTopItemTableGUI.php | 2 +- .../MainMenu/test/ilServicesMainMenuSuite.php | 2 +- .../Maps/classes/class.ilGoogleMapGUI.php | 6 +- .../Maps/classes/class.ilOpenLayersMapGUI.php | 10 +- .../ILIAS/Maps/js/dist/ServiceOpenLayers.js | 2 +- .../ILIAS/Maps/js/src/ServiceOpenLayers.js | 2 +- .../Maps/templates/default/tpl.google_map.js | 4 +- .../ILIAS/Maps/test/ilServicesMapsSuite.php | 2 +- .../ILIAS/Math/classes/class.ilMath.php | 2 +- .../ILIAS/Math/test/ilMathBCAdapterTest.php | 2 +- .../ILIAS/Math/test/ilMathPhpAdapterTest.php | 2 +- .../ILIAS/Math/test/ilServicesMathSuite.php | 6 +- .../classes/class.ilMathJaxSettingsGUI.php | 2 +- .../classes/class.ilMediaCastDataSet.php | 4 +- .../classes/class.ilMediaCastExporter.php | 4 +- .../classes/class.ilMediaCastImporter.php | 2 +- .../Creation/class.ilMediaCreationGUI.php | 2 +- .../ImageMap/class.ilImageMapEditorGUI.php | 4 +- .../ImageMap/class.ilImageMapTableGUI.php | 2 +- .../class.ilMediaObjectsPlayerWrapperGUI.php | 2 +- ...ass.ilMobMultiSrtConfirmationTable2GUI.php | 2 +- .../SubTitles/class.ilMobSubtitleTableGUI.php | 2 +- .../class.ilMultiSrtConfirmationTable2GUI.php | 2 +- .../classes/class.ilMediaObjectDataSet.php | 12 +- .../class.ilMediaObjectUsagesTableGUI.php | 2 +- .../classes/class.ilMediaObjectsExporter.php | 2 +- .../classes/class.ilMediaObjectsImporter.php | 2 +- .../classes/class.ilObjMediaObject.php | 4 +- .../classes/class.ilObjMediaObjectGUI.php | 4 +- .../classes/class.ilWidthHeightInputGUI.php | 4 +- .../test/ilServicesMediaObjectsSuite.php | 4 +- .../Clipboard/class.ilEditClipboardGUI.php | 2 +- .../classes/class.MediaPoolRepository.php | 2 +- .../class.ilMediaPoolAppEventListener.php | 4 +- .../classes/class.ilMediaPoolDataSet.php | 10 +- .../classes/class.ilMediaPoolExporter.php | 12 +- .../classes/class.ilMediaPoolImporter.php | 4 +- .../classes/class.ilObjMediaPoolGUI.php | 4 +- .../class.ilMemberExportFileTableGUI.php | 2 +- .../classes/class.ilAttendanceList.php | 2 +- .../classes/class.ilMemberAgreementGUI.php | 2 +- ...class.ilObjectCustomUserFieldsTableGUI.php | 2 +- .../classes/class.ilRegistrationGUI.php | 2 +- .../classes/class.ilSubscriberTableGUI.php | 2 +- .../classes/class.ilWaitingListTableGUI.php | 2 +- .../test/ilServicesMembershipSuite.php | 2 +- .../Editor/Digest/ContentAssembler.php | 2 +- .../Full/Services/Tables/TableBuilder.php | 2 +- .../class.ilMDCopyrightUsageTableGUI.php | 2 +- .../Copyright/class.ilMDCopyrightTableGUI.php | 2 +- .../classes/class.ilMetaDataImporter.php | 2 +- .../classes/class.ilDBUpdateNewObjectType.php | 2 +- .../class.ilMultilingualismTableGUI.php | 2 +- .../test/ilServicesMultilingualismSuite.php | 2 +- .../class.ilMStListCertificatesTableGUI.php | 2 +- .../class.ilMStListCompetencesSkills.php | 2 +- ...ass.ilMStListCompetencesSkillsTableGUI.php | 2 +- .../ListCourses/class.ilMStListCourses.php | 2 +- .../class.ilMStListCoursesTableGUI.php | 2 +- .../ListUsers/class.ilMStListUsers.php | 2 +- .../class.ilMStListUsersTableGUI.php | 2 +- .../class.ilMStShowUserCoursesTableGUI.php | 2 +- .../classes/Utils/ListFetcherResult.php | 2 +- .../News/Timeline/class.ilTimelineGUI.php | 6 +- .../News/classes/class.ilNewsDataSet.php | 6 +- .../News/classes/class.ilNewsExporter.php | 2 +- .../class.ilNewsForContextBlockGUI.php | 10 +- .../class.ilNewsForContextTableGUI.php | 2 +- .../ILIAS/News/classes/class.ilNewsItem.php | 4 +- .../News/classes/class.ilNewsItemGUI.php | 4 +- .../News/classes/class.ilNewsTimelineGUI.php | 4 +- .../classes/class.ilNewsTimelineItemGUI.php | 4 +- .../News/classes/class.ilPDNewsBlockGUI.php | 6 +- .../News/classes/class.ilPDNewsTableGUI.php | 2 +- .../News/classes/class.ilRSSButtonGUI.php | 2 +- .../ILIAS/News/test/ilServicesNewsSuite.php | 2 +- .../Notes/Export/class.NotesHtmlExport.php | 4 +- .../Notes/Export/class.ilNotesDataSet.php | 2 +- .../ILIAS/Notes/Note/class.ilNoteGUI.php | 6 +- .../Service/class.InternalGUIService.php | 2 +- .../ILIAS/Notes/test/ilServicesNotesSuite.php | 2 +- .../class.ilNotificationAppEventListener.php | 2 +- .../test/ilServicesNotificationSuite.php | 2 +- .../Setup/ilNotificationSetupHelper.php | 4 +- .../classes/ilNotificationOSDGUI.php | 6 +- .../classes/ilNotificationSettingsTable.php | 2 +- ...ypeSpecificPropertiesArtifactObjective.php | 2 +- .../Setup/class.ilObjectDBUpdateSteps.php | 20 + .../Setup/class.ilObjectSetupAgent.php | 2 +- .../class.ilObjectTranslation2TableGUI.php | 2 +- .../class.ilObjectTranslationTableGUI.php | 2 +- .../classes/class.ilObjClipboardTableGUI.php | 2 +- .../ILIAS/Object/classes/class.ilObject.php | 14 +- .../class.ilObjectAppEventListener.php | 2 +- .../Object/classes/class.ilObjectCopyGUI.php | 4 +- .../class.ilObjectCopyProgressTableGUI.php | 4 +- ...class.ilObjectCopySearchResultTableGUI.php | 2 +- .../class.ilObjectCopySelectionTableGUI.php | 2 +- .../Object/classes/class.ilObjectDataSet.php | 6 +- .../Object/classes/class.ilObjectGUI.php | 2 +- .../Object/classes/class.ilObjectListGUI.php | 4 +- .../class.ilObjectMetaDataBlockGUI.php | 2 +- ...ss.ilObjectOwnershipManagementTableGUI.php | 2 +- .../Object/classes/class.ilObjectTableGUI.php | 2 +- .../Object/classes/class.ilSubItemListGUI.php | 2 +- .../Object/test/ilServicesObjectSuite.php | 2 +- .../classes/class.ilOnScreenChatGUI.php | 18 +- ...ass.ilOnScreenChatUserUserAutoComplete.php | 2 +- .../class.ilOpenIdConnectAppEventListener.php | 2 +- .../class.ilOrgUnitGenericMultiInputGUI.php | 2 +- ...ass.ilOrgUnitDefaultPermissionTableGUI.php | 2 +- .../class.ilOrgUnitPermissionTableGUI.php | 2 +- .../OrgUnit/classes/Webservices/SOAP/Base.php | 2 +- .../class.ilOrgUnitAppEventListener.php | 4 +- .../classes/class.ilOrgUnitImporter.php | 2 +- .../class.ilObjOrgUnitException.php | 2 +- .../PermanentLink/classes/class.ilLink.php | 2 +- .../class.ilWorkspaceAccessTableGUI.php | 2 +- .../class.ilWorkspaceShareTableGUI.php | 2 +- .../test/ilServicesPersonalWorkspaceSuite.php | 2 +- .../Poll/classes/class.ilPollDataSet.php | 2 +- .../Portfolio/Export/PortfolioHtmlExport.php | 4 +- .../Export/class.ilPortfolioDataSet.php | 6 +- .../Export/class.ilPortfolioExporter.php | 6 +- .../Export/class.ilPortfolioImporter.php | 2 +- .../Page/class.ilPortfolioPageGUI.php | 2 +- .../class.ilPortfolioAppEventListener.php | 4 +- .../classes/class.ilPrivacySettings.php | 2 +- .../classes/class.ilSecuritySettings.php | 2 +- .../test/ilServicesPrivacySecuritySuite.php | 2 +- .../RTE/classes/class.ilRTEGlobalTemplate.php | 8 +- .../ILIAS/RTE/classes/class.ilTinyMCE.php | 6 +- components/ILIAS/RTE/test/ilTinyMCETest.php | 4 +- .../class.ilRatingCategoryTableGUI.php | 2 +- .../Rating/classes/class.ilRatingDataSet.php | 2 +- .../Rating/classes/class.ilRatingGUI.php | 4 +- .../Rating/test/ilServicesRatingSuite.php | 2 +- .../class.ilAccountRegistrationGUI.php | 4 +- .../class.ilRegistrationCodesTableGUI.php | 2 +- .../class.ilRegistrationSettingsGUI.php | 2 +- .../test/ilServicesRegistrationSuite.php | 2 +- .../class.ilAdminSubItemsTableGUI.php | 2 +- .../class.ilModulesTableGUI.php | 2 +- .../class.ilNewItemGroupTableGUI.php | 2 +- ...class.ilDashboardRecommendedContentGUI.php | 2 +- ...class.ilRecommendedContentRoleTableGUI.php | 2 +- .../Service/Form/class.FormAdapterGUI.php | 2 +- .../Trash/class.ilRepDependenciesTableGUI.php | 2 +- .../Repository/Trash/class.ilRepUtil.php | 6 +- .../Trash/class.ilRepositoryTrashGUI.php | 2 +- .../Trash/class.ilTrashTableGUI.php | 2 +- .../class.ilRepositoryAppEventListener.php | 2 +- .../test/ilServicesRepositorySuite.php | 4 +- .../MIGRATIONS.md | 0 .../ROADMAP.md | 0 .../artifacts/flavour_data.php | 2 +- .../classes/BinToHexSerializer.php | 2 +- .../classes/CollectionDBRepository.php | 0 .../DataProvider/TableDataProvider.php | 4 +- .../Collections/View/ActionBuilder.php | 4 +- .../Collections/View/Configuration.php | 2 +- .../classes/Collections/View/Formatter.php | 2 +- .../classes/Collections/View/Mode.php | 2 +- .../Collections/View/PreviewDefinition.php | 2 +- .../classes/Collections/View/RIDHelper.php | 2 +- .../classes/Collections/View/Request.php | 2 +- .../Collections/View/RequestToComponents.php | 4 +- .../Collections/View/RequestToDataTable.php | 8 +- .../Collections/View/RequestToDeckOfCards.php | 8 +- .../Collections/View/RequestToItems.php | 8 +- .../View/RequestToPresentationTable.php | 8 +- .../Collections/View/UploadBuilder.php | 2 +- .../Collections/View/ViewControlBuilder.php | 4 +- .../classes/Collections/View/ViewFactory.php | 6 +- .../class.ilResourceCollectionGUI.php | 18 +- .../classes/DBRepositoryPreloader.php | 0 .../classes/FlavourDBRepository.php | 0 .../classes/InformationDBRepository.php | 0 .../classes/ResourceDBRepository.php | 0 .../DataSource/AllResourcesDataSource.php | 6 +- .../DataSource/BaseTableDataSource.php | 4 +- .../DataSource/CollectionDataSource.php | 4 +- .../Resources/DataSource/TableDataSource.php | 2 +- .../Resources/Listing/SortDirection.php | 2 +- .../Resources/Listing/ViewDefinition.php | 2 +- .../Resources/UI/Actions/ActionGenerator.php | 2 +- .../UI/Actions/NullActionGenerator.php | 2 +- .../UI/Actions/OverviewActionGenerator.php | 2 +- .../classes/Resources/UI/BaseToComponent.php | 6 +- .../Resources/UI/ResourceListingUI.php | 12 +- .../Resources/UI/ResourceToComponent.php | 4 +- .../Resources/UI/RevisionListingUI.php | 10 +- .../Resources/UI/RevisionToComponent.php | 6 +- .../classes/Resources/UI/ToComponent.php | 2 +- .../Resources/class.ilResourceOverviewGUI.php | 12 +- .../classes/RevisionDBRepository.php | 0 ...class.ilResourceStorageFlavourArtifact.php | 2 +- .../Setup/DB/class.ilResourceStorageDB80.php | 0 .../Setup/DB/class.ilResourceStorageDB90.php | 0 ...class.ilResourceStorageMigrationHelper.php | 4 +- .../class.ilResourceStorageSetupAgent.php | 0 ...s.ilStorageContainersExistingObjective.php | 0 .../classes/StakeholderDBRepository.php | 0 .../class.ilResourceStorageInfoGUI.php | 0 .../class.ilWACSignedResourceStorage.php | 0 .../maintenance.json | 2 +- .../service.xml | 0 .../ILIAS/SOAPAuth/examples/dummy_server.php | 2 +- .../classes/class.ilSamlAppEventListener.php | 2 +- .../class.ilSamlIdpSelectionTableGUI.php | 2 +- .../Saml/classes/class.ilSamlIdpTableGUI.php | 4 +- .../classes/class.ilSimpleSAMLphpWrapper.php | 6 +- components/ILIAS/Saml/lib/metadata.php | 6 +- components/ILIAS/Saml/lib/saml1-acs.php | 4 +- components/ILIAS/Saml/lib/saml2-acs.php | 4 +- components/ILIAS/Saml/lib/saml2-logout.php | 6 +- .../class.ilObjSCORM2004LearningModule.php | 2 +- .../classes/class.ilSCORM13PlayerGUI.php | 6 +- .../classes/class.ilScorm2004DataSet.php | 2 +- components/ILIAS/Scorm2004/test/bootstrap.php | 2 +- .../test/ilModulesScorm2004Suite.php | 2 +- .../SCORM/class.ilObjSCORMTracking.php | 2 +- .../classes/SCORM/class.ilSCORMExplorer.php | 2 +- .../SCORM/class.ilSCORMPresentationGUI.php | 4 +- .../classes/class.ilObjSAHSLearningModule.php | 4 +- .../class.ilObjSCORMLearningModule.php | 2 +- .../classes/class.ilScormAiccImporter.php | 6 +- ...LuceneAdvancedSearchActivationTableGUI.php | 2 +- .../class.ilLuceneAdvancedSearchFields.php | 2 +- .../class.ilLuceneAdvancedSearchGUI.php | 4 +- .../Lucene/class.ilLuceneSearchGUI.php | 4 +- .../Lucene/class.ilLuceneUserSearchGUI.php | 4 +- .../Provider/SearchMetaBarProvider.php | 2 +- .../classes/class.ilAdvancedSearchGUI.php | 4 +- .../classes/class.ilMainMenuSearchGUI.php | 4 +- .../classes/class.ilObjSearchSettings.php | 2 +- .../Search/classes/class.ilObjectSearch.php | 2 +- ...class.ilRepositoryObjectResultTableGUI.php | 2 +- ...class.ilRepositoryObjectSearchBlockGUI.php | 2 +- ...ilRepositoryObjectSearchResultTableGUI.php | 4 +- .../classes/class.ilRepositorySearchGUI.php | 6 +- .../class.ilRepositoryUserResultTableGUI.php | 8 +- .../class.ilSearchAppEventListener.php | 6 +- .../Search/classes/class.ilSearchGUI.php | 4 +- .../class.ilSearchResultPresentation.php | 6 +- .../classes/class.ilSearchResultTableGUI.php | 2 +- .../classes/class.ilSearchRootSelector.php | 2 +- .../Search/classes/class.ilUserFilterGUI.php | 2 +- .../Search/test/ilServicesSearchSuite.php | 4 +- .../class.ilSessionAppEventListener.php | 2 +- .../classes/class.ilSessionDataSet.php | 10 +- .../classes/class.ilSessionExporter.php | 8 +- .../Skill/Export/class.ilSkillDataSet.php | 28 +- .../Skill/Export/class.ilSkillExporter.php | 2 +- .../Skill/Export/class.ilSkillImporter.php | 2 +- .../Level/class.ilSkillLevelTableGUI.php | 2 +- .../Skill/Node/class.SkillDeletionManager.php | 6 +- .../Skill/Node/class.ilSkillCatTableGUI.php | 2 +- .../ILIAS/Skill/Node/class.ilSkillRootGUI.php | 4 +- .../Skill/Node/class.ilSkillTreeNodeGUI.php | 2 +- .../Personal/class.ilPersonalSkillsGUI.php | 32 +- .../Skill/Profile/class.ilSkillProfileGUI.php | 8 +- .../class.ilSkillProfileLevelsTableGUI.php | 2 +- .../classes/class.ilSkillAppEventListener.php | 4 +- .../ILIAS/Skill/test/ilServicesSkillSuite.php | 12 +- ...lStudyProgrammePCStatusInfoUpdateSteps.php | 11 + .../classes/class.ilObjStudyProgramme.php | 4 +- ....ilObjStudyProgrammeAutoMembershipsGUI.php | 2 +- .../classes/class.ilObjectFactoryWrapper.php | 2 +- ...class.ilStudyProgrammeAppEventListener.php | 12 +- ...class.ilStudyProgrammeDashboardViewGUI.php | 2 +- ...tudyProgrammeExpandableProgressListGUI.php | 2 +- ...lass.ilAsyncContainerSelectionExplorer.php | 2 +- .../helpers/class.ilAsyncPropertyFormGUI.php | 2 +- ...ilStudyProgrammeSettingsRepositoryTest.php | 2 +- .../Settings/ilStudyProgrammeSettingsTest.php | 2 +- .../class.ilBackgroundImageInputGUI.php | 2 +- .../class.ilBackgroundPositionInputGUI.php | 4 +- .../Inputs/class.ilFontSizeInputGUI.php | 2 +- .../class.ilNumericStyleValueInputGUI.php | 2 +- .../class.ilTRBLBorderStyleInputGUI.php | 4 +- .../class.ilTRBLBorderWidthInputGUI.php | 4 +- .../class.ilTRBLColorPickerInputGUI.php | 4 +- .../class.ilTRBLNumericStyleValueInputGUI.php | 4 +- .../class.CharacteristicTableGUI.php | 2 +- .../class.ilStyleCharacteristicGUI.php | 2 +- .../Color/class.ilStyleColorTableGUI.php | 2 +- .../Images/class.ilStyleImageTableGUI.php | 2 +- .../classes/class.ilContentStylesTableGUI.php | 2 +- .../Content/classes/class.ilObjStyleSheet.php | 8 +- .../classes/class.ilObjStyleSheetGUI.php | 6 +- ...ass.ilPasteStyleCharacteristicTableGUI.php | 2 +- .../class.ilStyleMediaQueryTableGUI.php | 2 +- .../class.ilTableTemplatesTableGUI.php | 2 +- .../test/ilServicesStyleContentSuite.php | 2 +- .../Config/class.ilSubStyleAssignmentGUI.php | 2 +- .../class.ilSysStyleCatAssignmentTableGUI.php | 2 +- .../class.ilSystemStyleDocumentationGUI.php | 4 +- .../class.ilSystemStyleOverviewGUI.php | 4 +- .../Overview/class.ilSystemStylesTableGUI.php | 4 +- .../ilSystemStyleColorExceptionTest.php | 2 +- .../ilSystemStyleIconExceptionTest.php | 2 +- ...ilSystemStyleMessageStackExceptionTest.php | 2 +- .../mocks/ilSystemStyleConfigMock.php | 18 +- .../customSkins/skin1/style1/style1.scss | 2 +- .../customSkins/skin1/style2/style2.scss | 2 +- .../test/ilServicesStyleSystemSuite.php | 2 +- .../Style/classes/class.ilStyleDataSet.php | 18 +- .../Style/classes/class.ilStyleImporter.php | 2 +- .../ILIAS/Style/test/ilServicesStyleSuite.php | 4 +- .../Survey/Export/class.ilSurveyExporter.php | 2 +- .../Survey/Export/class.ilSurveyImporter.php | 2 +- .../Participants/class.ilSurveyRaterGUI.php | 2 +- .../class.ilSurveyAppEventListener.php | 2 +- .../class.ilCategoryWizardInputGUI.php | 2 +- .../class.ilSurveyQuestionPoolExporter.php | 2 +- .../class.ilSurveyQuestionPoolImporter.php | 2 +- .../class.ilMatrixRowWizardInputGUI.php | 2 +- .../classes/class.ilSCGroupTableGUI.php | 2 +- .../classes/class.ilSCTaskTableGUI.php | 2 +- .../test/ilServicesSystemCheckSuite.php | 2 +- .../classes/class.ilObjSystemFolderGUI.php | 2 +- .../ILIAS/Table/classes/class.ilTable2GUI.php | 4 +- .../ILIAS/Table/classes/class.ilTableGUI.php | 2 +- .../ILIAS/Table/test/ilServicesTableSuite.php | 2 +- .../class.ilTaggingAppEventListener.php | 6 +- .../class.ilTaggingClassificationProvider.php | 2 +- .../Tagging/classes/class.ilTaggingGUI.php | 8 +- .../class.ilTaggingSlateContentGUI.php | 2 +- .../classes/class.ilUserForTagTableGUI.php | 2 +- .../Tagging/test/ilServicesTaggingSuite.php | 2 +- .../Tasks/classes/class.ilPDTasksBlockGUI.php | 2 +- .../ILIAS/Tasks/test/ilServicesTasksSuite.php | 6 +- components/ILIAS/Taxonomy/README-technical.md | 2 +- .../class.ilTaxAssignedItemsTableGUI.php | 2 +- ...xonomyAdministrationRepositoryTableGUI.php | 2 +- .../classes/class.ilTaxonomyDataSet.php | 18 +- .../classes/class.ilTaxonomyListTableGUI.php | 2 +- .../classes/class.ilTaxonomyTableGUI.php | 2 +- .../Taxonomy/test/ilServicesTaxonomySuite.php | 2 +- .../ILIAS/TermsOfService/classes/Consumer.php | 2 +- .../classes/class.ilTestAppEventListener.php | 2 +- .../Test/classes/class.ilTestExporter.php | 4 +- .../Test/classes/class.ilTestImporter.php | 12 +- .../class.ilTestScoringByQuestionsGUI.php | 6 +- .../tables/ilTestVerificationTableGUITest.php | 2 +- .../classes/class.assQuestion.php | 2 +- ...class.ilAssQuestionSkillAssignmentsGUI.php | 2 +- .../classes/class.ilObjQuestionPoolGUI.php | 4 +- ...ass.ilTestQuestionPoolAppEventListener.php | 2 +- .../class.ilTestQuestionPoolExporter.php | 2 +- .../class.ilTestQuestionPoolImporter.php | 8 +- .../classes/class.ilUnitConfigurationGUI.php | 4 +- .../class.ilImagemapCorrectionsInputGUI.php | 2 +- ...MultipleNestedOrderingElementsInputGUI.php | 2 +- .../Tracking/classes/class.ilLPStatus.php | 2 +- .../class.ilLearningProgressBaseGUI.php | 4 +- .../class.ilTrackingAppEventListener.php | 6 +- .../collection/class.ilLPCollection.php | 2 +- ...lass.ilLPObjectStatisticsAdminTableGUI.php | 2 +- ...lass.ilLPObjectStatisticsDailyTableGUI.php | 2 +- .../class.ilLPObjectStatisticsGUI.php | 2 +- .../class.ilLPObjectStatisticsLPTableGUI.php | 4 +- .../class.ilLPObjectStatisticsTableGUI.php | 2 +- ...lass.ilLPObjectStatisticsTypesTableGUI.php | 2 +- .../class.ilLPCollectionSettingsTableGUI.php | 10 +- .../class.ilLPListOfObjectsGUI.php | 8 +- .../class.ilLPListOfProgressGUI.php | 4 +- .../class.ilLPListOfSettingsGUI.php | 2 +- .../class.ilLPProgressTableGUI.php | 2 +- .../class.ilTrMatrixTableGUI.php | 4 +- .../class.ilTrObjectUsersPropsTableGUI.php | 2 +- .../class.ilTrSummaryTableGUI.php | 4 +- .../class.ilTrUserObjectsPropsTableGUI.php | 2 +- .../Tracking/test/ilServicesTrackingSuite.php | 2 +- .../classes/Setup/class.ilTreeSetupAgent.php | 2 +- .../class.ilSCTreeDuplicatesTableGUI.php | 2 +- .../ILIAS/Tree/classes/class.ilPathGUI.php | 4 +- .../ILIAS/Tree/classes/class.ilTree.php | 6 +- .../ILIAS/Tree/test/ilServicesTreeSuite.php | 2 +- .../class.ilAdvancedSelectionListGUI.php | 6 +- .../class.ilCheckboxListOverlayGUI.php | 2 +- .../class.ilConfirmationTableGUI.php | 2 +- .../Explorer/classes/class.ilExplorer.php | 4 +- .../classes/class.ilExplorerBaseGUI.php | 10 +- .../class.ilExplorerSelectInputGUI.php | 6 +- .../classes/class.ilGroupedListGUI.php | 2 +- .../Modal/classes/class.ilModalGUI.php | 4 +- .../NestedList/classes/class.ilNestedList.php | 2 +- .../Overlay/classes/class.ilOverlayGUI.php | 2 +- .../Panel/classes/class.ilPanelGUI.php | 2 +- .../classes/class.ilProgressBar.php | 4 +- .../classes/class.ilSplitButtonGUI.php | 2 +- .../Tabs/classes/class.ilTabsGUI.php | 4 +- .../classes/class.ilTextHighlighterGUI.php | 2 +- .../Toolbar/classes/class.ilToolbarGUI.php | 10 +- .../Tooltip/classes/class.ilTooltipGUI.php | 2 +- .../classes/class.ilUIHookPluginGUI.php | 2 +- .../test/ilServicesUIComponentSuite.php | 2 +- .../ILIAS/UICore/artifacts/ctrl_structure.php | 2240 +++++++++-------- .../ILIAS/UICore/classes/Cache/BlockCache.php | 2 +- .../UICore/classes/Cache/TemplateCache.php | 2 +- .../UICore/classes/Cache/VariableCache.php | 2 +- .../classes/MetaTemplate/PageContentGUI.php | 2 +- ...class.ilCtrlBaseClassArtifactObjective.php | 2 +- .../class.ilCtrlSecurityArtifactObjective.php | 4 +- ...class.ilCtrlStructureArtifactObjective.php | 4 +- .../Structure/class.ilCtrlStructureReader.php | 4 +- .../ILIAS/UICore/classes/class.ilCtrl.php | 2 +- .../classes/class.ilGlobalPageTemplate.php | 4 +- .../UICore/classes/class.ilGlobalTemplate.php | 10 +- components/ILIAS/UICore/lib/html-it/IT.php | 6 +- .../test/Data/ClassMaps/invalid_class_map.php | 2 +- .../Data/Structure/test_ctrl_structure.php | 10 +- components/ILIAS/{UI => UI_}/README.md | 0 .../class.ilUIAsyncDemoFileUploadHandler.php | 0 ...lass.ilUIAsyncDemoFileUploadHandlerGUI.php | 0 .../class.ilUIDemoFileUploadHandlerGUI.php | 0 .../class.ilUIFilterRequestAdapter.php | 0 .../classes/class.ilUIFilterService.php | 0 .../class.ilUIFilterServiceSessionGateway.php | 0 .../classes/class.ilUIMarkdownPreviewGUI.php | 0 .../{UI => UI_}/classes/class.ilUIService.php | 0 .../classes/class.ilUIServiceDependencies.php | 0 .../UIFilterServiceSessionGatewayTest.php | 0 .../{UI => UI_}/test/ilServiceUISuite.php | 2 +- .../class.ilUserActionAdminTableGUI.php | 2 +- .../class.ilUserActionContextFactory.php | 4 +- .../class.ilUserActionProviderFactory.php | 10 +- .../Avatar/class.ilUserAvatarLetter.php | 2 +- .../classes/ChangedUserFieldAttribute.php | 2 +- ...ss.ilCronDeleteInactivatedUserAccounts.php | 2 +- .../Gallery/class.ilUsersGalleryGUI.php | 2 +- .../classes/InterestedUserFieldAttribute.php | 2 +- .../InterestedUserFieldChangeListener.php | 2 +- .../classes/InterestedUserFieldComponent.php | 2 +- .../Profile/class.ilPublicUserProfileGUI.php | 2 +- .../class.ilUserPrivacySettingsGUI.php | 2 +- .../classes/Setup/class.ilUserSetupAgent.php | 2 +- .../UserFieldAttributesChangeListener.php | 4 +- ...lass.ilCustomUserFieldSettingsTableGUI.php | 2 +- .../class.ilCustomUserFieldsHelper.php | 2 +- .../ILIAS/User/classes/class.ilObjUser.php | 22 +- .../User/classes/class.ilObjUserFolderGUI.php | 12 +- .../ILIAS/User/classes/class.ilObjUserGUI.php | 2 +- .../class.ilRoleAssignmentTableGUI.php | 2 +- .../classes/class.ilUserAppEventListener.php | 2 +- .../classes/class.ilUserClipboardTableGUI.php | 2 +- .../User/classes/class.ilUserDataSet.php | 8 +- .../class.ilUserExportFileTableGUI.php | 2 +- .../User/classes/class.ilUserExporter.php | 10 +- .../class.ilUserFieldSettingsTableGUI.php | 2 +- .../User/classes/class.ilUserImportParser.php | 2 +- .../User/classes/class.ilUserLPTableGUI.php | 2 +- .../class.ilUserRoleStartingPointTableGUI.php | 2 +- .../User/classes/class.ilUserTableGUI.php | 2 +- .../test/ChangedUserFieldAttributeTest.php | 2 +- .../test/InterestedUserFieldAttributeTest.php | 2 +- .../InterestedUserFieldChangeListenerTest.php | 2 +- .../test/InterestedUserFieldComponentTest.php | 2 +- .../ILIAS/User/test/ilObjUserPasswordTest.php | 14 +- .../test/ilServicesUtilitiesSuite.php | 6 +- .../test/ilServicesVerificationSuite.php | 2 +- ...ss.ilVirusScannerConfigStoredObjective.php | 2 +- ...lVirusScannerMetricsCollectedObjective.php | 0 .../Setup/class.ilVirusScannerSetupAgent.php | 0 .../Setup/class.ilVirusScannerSetupConfig.php | 0 .../classes/class.ilVirusScanner.php | 0 .../classes/class.ilVirusScannerAntiVir.php | 0 .../classes/class.ilVirusScannerClamAV.php | 0 .../classes/class.ilVirusScannerFactory.php | 0 .../class.ilVirusScannerICapClient.php | 0 .../class.ilVirusScannerICapRemote.php | 0 ...class.ilVirusScannerICapRemoteAvClient.php | 0 .../class.ilVirusScannerPreProcessor.php | 0 .../classes/class.ilVirusScannerSophos.php | 0 .../maintenance.json | 2 +- .../phpunit.xml | 0 .../test/VirusScannerBaseTest.php | 0 .../test/VirusScannerFactoryTest.php | 0 .../test/bootstrap.php | 0 .../test/ilServicesVirusScannerSuite.php | 0 .../class.ilWOPIAdministrationGUI.php | 6 +- .../class.ilWOPISettingsForm.php | 2 +- .../WOPI/classes/Cron/class.ilWOPICrawler.php | 10 +- .../ILIAS/WOPI/classes/Discovery/Action.php | 2 +- .../classes/Discovery/ActionDBRepository.php | 2 +- .../classes/Discovery/ActionRepository.php | 2 +- .../WOPI/classes/Discovery/ActionTarget.php | 2 +- .../ILIAS/WOPI/classes/Discovery/App.php | 2 +- .../classes/Discovery/AppDBRepository.php | 2 +- .../WOPI/classes/Discovery/AppRepository.php | 2 +- .../ILIAS/WOPI/classes/Discovery/Apps.php | 2 +- .../ILIAS/WOPI/classes/Discovery/Crawler.php | 2 +- .../classes/Embed/EmbeddedApplication.php | 6 +- .../Embed/EmbeddedApplicationGSProvider.php | 2 +- .../ILIAS/WOPI/classes/Embed/Renderer.php | 4 +- .../class.ilWOPIEmbeddedApplicationGUI.php | 10 +- .../classes/Handler/GetFileInfoResponse.php | 2 +- .../WOPI/classes/Handler/RequestHandler.php | 2 +- .../ILIAS/WOPI/classes/Handler/Response.php | 2 +- .../class.ilSecurePathDefinitionProcessor.php | 2 +- .../classes/class.ilWACToken.php | 2 +- .../class.ilWebAccessCheckerDelivery.php | 4 +- .../ILIAS/WebAccessChecker/implement-wac.md | 2 +- .../test/SecurePath/ilWACSecurePathTest.php | 2 +- .../test/ilServicesWebAccessCheckerSuite.php | 6 +- ...ebDAVMountInstructionsDocumentTableGUI.php | 2 +- .../test/dav/class.ilDAVClientNodeTest.php | 2 +- .../test/dav/class.ilDAVContainerTest.php | 2 +- .../WebDAV/test/ilServicesWebDAVSuite.php | 8 +- .../lock/ilWebDAVLockUriPathResolverTest.php | 2 +- .../classes/class.ilObjLinkResourceGUI.php | 2 +- .../classes/class.ilWebResourceExporter.php | 2 +- .../classes/class.ilWebResourceImporter.php | 2 +- .../class.ilCurlConnectionException.php | 2 +- .../Mapping/class.ilECSMappingSettingsGUI.php | 8 +- .../Mapping/class.ilECSMappingUtils.php | 2 +- .../class.ilECSNodeMappingTreeTableGUI.php | 2 +- .../classes/class.ilECSAppEventListener.php | 6 +- .../class.ilECSCategoryMappingTableGUI.php | 2 +- .../classes/class.ilECSCommunityTableGUI.php | 2 +- .../class.ilECSExportedContentTableGUI.php | 2 +- .../class.ilECSImportedContentTableGUI.php | 2 +- .../ECS/classes/class.ilECSServerTableGUI.php | 2 +- .../ECS/classes/class.ilECSSettingsGUI.php | 8 +- .../ECS/classes/class.ilECSTaskScheduler.php | 2 +- .../classes/class.ilRpcClientException.php | 2 +- components/ILIAS/WebServices/Rest/server.php | 4 +- .../SOAP/classes/class.ilSoapHookPlugin.php | 2 +- .../classes/class.ilSoapPluginException.php | 2 +- .../test/ilServicesWebServicesSuite.php | 2 +- .../ILIAS/Wiki/Export/WikiHtmlExport.php | 4 +- .../Wiki/classes/class.ilWikiDataSet.php | 12 +- .../Wiki/classes/class.ilWikiExporter.php | 12 +- .../classes/class.ilObjWorkspaceFolderGUI.php | 2 +- .../ILIAS/Xml/test/ilServicesXmlSuite.php | 2 +- .../ILIAS/YUI/classes/class.ilYuiUtil.php | 2 +- .../ILIAS/YUI/test/ilServicesYUISuite.php | 2 +- .../jQuery/test/ilServicesjQuerySuite.php | 2 +- ...lass.ilNusoapUserAdministrationAdapter.php | 4 +- .../classes/class.ilObjectXMLException.php | 2 +- .../soap/classes/class.ilObjectXMLWriter.php | 6 +- .../classes/class.ilSoapAdministration.php | 14 +- .../class.ilSoapCourseAdministration.php | 6 +- .../class.ilSoapInstallationInfoXMLWriter.php | 6 +- ...s.ilSoapLearningProgressAdministration.php | 20 +- .../class.ilSoapObjectAdministration.php | 26 +- .../class.ilSoapRBACAdministration.php | 8 +- .../class.ilSoapRoleObjectXMLWriter.php | 2 +- .../class.ilSoapSCORMAdministration.php | 4 +- .../class.ilSoapStructureObjectXMLWriter.php | 2 +- .../class.ilSoapUserAdministration.php | 28 +- .../ILIAS/soap/classes/class.ilSoapUtils.php | 18 +- .../ILIAS/soap/include/inc.soap_functions.php | 6 +- composer.json | 29 +- confirmReg.php | 2 +- docs/development/file-handling.md | 2 +- docs/development/language.md | 2 +- docs/development/refactorings.md | 8 +- error.php | 2 +- feed.php | 4 +- index.php | 2 +- login.php | 2 +- logout.php | 2 +- lti.php | 2 +- privfeed.php | 4 +- public/soap/server.php | 2 +- pwassist.php | 2 +- register.php | 2 +- saml.php | 4 +- scripts/Rector/ilUtils/ilutil_rector.php | 4 +- sessioncheck.php | 4 +- setup/sql/ilias3.sql | 462 ++-- src/BackgroundTasks/PRIVACY.md | 2 +- .../MetaContent/Media/CssCollection.php | 2 +- .../MetaContent/Media/InlineCssCollection.php | 2 +- .../Layout/MetaContent/Media/JsCollection.php | 2 +- .../Media/OnLoadCodeCollection.php | 2 +- src/KioskMode/README.md | 4 +- src/ResourceStorage/README.md | 2 +- src/Setup/README.md | 6 +- src/UI/examples/Input/Field/File/base.php | 2 +- src/UI/examples/Input/Field/File/in_form.php | 2 +- storeScorm.php | 2 +- storeScorm2004.php | 2 +- .../UIComponent/_component_explorer2.scss | 2 +- templates/default/delos.css | 2 +- tests/App/RootFolderTest.php | 1 - .../Setup/ilGlobalCacheSetupAgentTest.php | 4 +- tests/ILIASSuite.php | 2 +- .../Setup/ilLanguageSetupAgentTest.php | 4 +- tests/UI/Base.php | 2 +- webdav.php | 2 +- wopi/index.php | 2 +- 1201 files changed, 3707 insertions(+), 3584 deletions(-) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/ROADMAP.md (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Jobs/class.ilCheckSumOfFileSizesJob.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Jobs/class.ilCollectFilesJob.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Jobs/class.ilCopyFilesToTempDirectoryJob.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Jobs/class.ilZipJob.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Provider/BTNotificationProvider.php (94%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php (96%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Setup/class.ilBackgroundTasksDB80.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Setup/class.ilBackgroundTasksMetricsCollectedObjective.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Setup/class.ilBackgroundTasksSetupAgent.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/Setup/class.ilBackgroundTasksSetupConfig.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/StateTranslator.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/UserInteractions/class.ilDownloadZipInteraction.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/UserInteractions/class.ilSumOfFileSizesTooLargeInteraction.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/class.ilBTControllerGUI.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/class.ilBTPopOverGUI.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/class.ilCopyDefinition.php (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/classes/class.ilSoapBackgroundTasksAdministration.php (94%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/js/background_task_refresh.js (100%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/maintenance.json (86%) rename components/ILIAS/{BackgroundTasks => BackgroundTasks_}/service.xml (100%) rename components/ILIAS/{Cache => Cache_}/classes/class.ilCache.php (100%) rename components/ILIAS/{Cache => Cache_}/classes/class.ilExampleCache.php (100%) rename components/ILIAS/{Cache => Cache_}/maintenance.json (90%) rename components/ILIAS/{Cache => Cache_}/test/ilCacheTest.php (100%) rename components/ILIAS/{Cache => Cache_}/test/ilServicesCacheSuite.php (92%) rename components/ILIAS/{GlobalCache => GlobalCache_}/PRIVACY.md (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/ROADMAP.md (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/Setup/class.ilGlobalCacheAllFlushedObjective.php (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php (96%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/Setup/class.ilGlobalCacheMetricsCollectedObjective.php (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/Setup/class.ilGlobalCacheSetupAgent.php (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/class.ilGlobalCacheSettingsAdapter.php (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/classes/class.ilMemcacheNodesRepository.php (100%) rename components/ILIAS/{GlobalCache => GlobalCache_}/maintenance.json (90%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/ROADMAP.md (100%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/artifacts/global_screen_providers.php (97%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/classes/Helper/BasicAccessCheckClosures.php (100%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/classes/Helper/BasicAccessCheckClosuresSingleton.php (100%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php (95%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/classes/Setup/class.ilGlobalScreenSetupAgent.php (100%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/classes/class.ilGSProviderFactory.php (98%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/maintenance.json (85%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/test/ilServicesGlobalScreenSuite.php (89%) rename components/ILIAS/{GlobalScreen => GlobalScreen_}/test/ilServicesGlobalScreenTest.php (100%) rename components/ILIAS/{KioskMode => KioskMode_}/README.md (100%) rename components/ILIAS/{KioskMode => KioskMode_}/classes/class.ilKioskModeService.php (100%) rename components/ILIAS/{KioskMode => KioskMode_}/classes/class.ilKioskModeView.php (100%) rename components/ILIAS/{KioskMode => KioskMode_}/maintenance.json (88%) rename components/ILIAS/{KioskMode => KioskMode_}/test/class.ilDummyKioskModeView.php (100%) rename components/ILIAS/{KioskMode => KioskMode_}/test/ilKioskModeServiceTest.php (100%) rename components/ILIAS/{KioskMode => KioskMode_}/test/ilServicesKioskModeSuite.php (100%) rename components/ILIAS/{Language => Language_}/README.md (100%) rename components/ILIAS/{Language => Language_}/ROADMAP.md (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilDefaultLanguageSetObjective.php (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilLanguageMetricsCollectedObjective.php (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilLanguageObjective.php (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilLanguageSetupAgent.php (94%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilLanguagesInstalledAndUpdatedObjective.php (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilLanguagesUpdatedObjective.php (100%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilPluginLanguageUpdatedObjective.php (97%) rename components/ILIAS/{Language => Language_}/classes/Setup/class.ilSetupLanguage.php (99%) rename components/ILIAS/{Language => Language_}/classes/class.ilCachedLanguage.php (100%) rename components/ILIAS/{Language => Language_}/classes/class.ilDefaultLanguageDetector.php (89%) rename components/ILIAS/{Language => Language_}/classes/class.ilHttpRequestsLanguageDetector.php (89%) rename components/ILIAS/{Language => Language_}/classes/class.ilLangDeprecated.php (100%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguage.php (99%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageDetection.php (88%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageDetectorFactory.php (86%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageExtTableGUI.php (93%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageFactory.php (100%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageFile.php (99%) rename components/ILIAS/{Language => Language_}/classes/class.ilLanguageTableGUI.php (97%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguage.php (99%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageAccess.php (100%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageDBAccess.php (100%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageExt.php (98%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageExtGUI.php (97%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageFolder.php (98%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageFolderAccess.php (90%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageFolderGUI.php (97%) rename components/ILIAS/{Language => Language_}/classes/class.ilObjLanguageGUI.php (93%) rename components/ILIAS/{Language => Language_}/classes/class.ilPluginLanguage.php (100%) rename components/ILIAS/{Language => Language_}/exceptions/class.ilLanguageException.php (90%) rename components/ILIAS/{Language => Language_}/interfaces/interface.ilLanguageDetector.php (95%) rename components/ILIAS/{Language => Language_}/maintenance.json (89%) rename components/ILIAS/{Language => Language_}/service.xml (100%) rename components/ILIAS/{Language => Language_}/templates/default/tpl.lang_file_header.html (100%) rename components/ILIAS/{Language => Language_}/templates/default/tpl.lang_items_row.html (100%) rename components/ILIAS/{Language => Language_}/templates/default/tpl.lang_list_row.html (100%) rename components/ILIAS/{Language => Language_}/templates/default/tpl.lang_list_row_extended.html (100%) rename components/ILIAS/{Language => Language_}/templates/default/tpl.lang_statistics_row.html (100%) rename components/ILIAS/{Language => Language_}/test/bootstrap.php (100%) rename components/ILIAS/{Language => Language_}/test/ilLanguageBaseTest.php (100%) rename components/ILIAS/{Language => Language_}/test/ilLanguageSetupAgentTest.php (90%) rename components/ILIAS/{Language => Language_}/test/ilObjLanguageDBAccessTest.php (100%) rename components/ILIAS/{Language => Language_}/test/ilServicesLanguageSuite.php (100%) rename components/ILIAS/{Language => Language_}/test/ilSetupLanguageTest.php (100%) rename components/ILIAS/{Language => Language_}/use-language-logging.md (100%) rename components/ILIAS/{Language => Language_}/use-language-object.md (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/MIGRATIONS.md (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/ROADMAP.md (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/artifacts/flavour_data.php (95%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/BinToHexSerializer.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/CollectionDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/DataProvider/TableDataProvider.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/ActionBuilder.php (97%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/Configuration.php (96%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/Formatter.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/Mode.php (92%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/PreviewDefinition.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RIDHelper.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/Request.php (98%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RequestToComponents.php (88%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RequestToDataTable.php (95%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RequestToDeckOfCards.php (90%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RequestToItems.php (88%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/RequestToPresentationTable.php (88%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/UploadBuilder.php (96%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/ViewControlBuilder.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/View/ViewFactory.php (92%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Collections/class.ilResourceCollectionGUI.php (95%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/DBRepositoryPreloader.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/FlavourDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/InformationDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/ResourceDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/DataSource/AllResourcesDataSource.php (97%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/DataSource/BaseTableDataSource.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/DataSource/CollectionDataSource.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/DataSource/TableDataSource.php (95%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/Listing/SortDirection.php (93%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/Listing/ViewDefinition.php (97%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/Actions/ActionGenerator.php (92%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/Actions/NullActionGenerator.php (93%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/Actions/OverviewActionGenerator.php (98%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/BaseToComponent.php (90%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/ResourceListingUI.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/ResourceToComponent.php (96%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/RevisionListingUI.php (91%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/RevisionToComponent.php (96%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/UI/ToComponent.php (94%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Resources/class.ilResourceOverviewGUI.php (93%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/RevisionDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php (97%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/DB/class.ilResourceStorageDB80.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/DB/class.ilResourceStorageDB90.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/class.ilResourceStorageMigrationHelper.php (98%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/class.ilResourceStorageSetupAgent.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/Setup/class.ilStorageContainersExistingObjective.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/StakeholderDBRepository.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/class.ilResourceStorageInfoGUI.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/classes/class.ilWACSignedResourceStorage.php (100%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/maintenance.json (82%) rename components/ILIAS/{ResourceStorage => ResourceStorage_}/service.xml (100%) rename components/ILIAS/{UI => UI_}/README.md (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIAsyncDemoFileUploadHandler.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIDemoFileUploadHandlerGUI.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIFilterRequestAdapter.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIFilterService.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIFilterServiceSessionGateway.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIMarkdownPreviewGUI.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIService.php (100%) rename components/ILIAS/{UI => UI_}/classes/class.ilUIServiceDependencies.php (100%) rename components/ILIAS/{UI => UI_}/test/UIFilterServiceSessionGatewayTest.php (100%) rename components/ILIAS/{UI => UI_}/test/ilServiceUISuite.php (92%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/Setup/class.ilVirusScannerConfigStoredObjective.php (97%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/Setup/class.ilVirusScannerMetricsCollectedObjective.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/Setup/class.ilVirusScannerSetupAgent.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/Setup/class.ilVirusScannerSetupConfig.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScanner.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerAntiVir.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerClamAV.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerFactory.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerICapClient.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerICapRemote.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerICapRemoteAvClient.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerPreProcessor.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/classes/class.ilVirusScannerSophos.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/maintenance.json (87%) rename components/ILIAS/{VirusScanner => VirusScanner_}/phpunit.xml (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/test/VirusScannerBaseTest.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/test/VirusScannerFactoryTest.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/test/bootstrap.php (100%) rename components/ILIAS/{VirusScanner => VirusScanner_}/test/ilServicesVirusScannerSuite.php (100%) diff --git a/.gitignore b/.gitignore index e2e287305092..381f996c7ca9 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ /db_template_writer.php /setup/sql/dbupdate_custom.php /install_client.php -/Services/GlobalScreen/artifacts/global_screen_providers.php +/components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php /Services/Style/System/data/data.php /Services/UICore/artifacts/ctrl_structure.php /Services/UICore/artifacts/ctrl_plugin_structure.php @@ -67,7 +67,7 @@ phpstan-baseline.neon # File Delivery override.php -Services/ResourceStorage/artifacts/flavour_data.php +components/ILIAS/ResourceStorage_/artifacts/flavour_data.php Services/FileHandlingDemo src/FileDelivery/artifacts src/StaticURL/artifacts diff --git a/cli/inc.header.php b/cli/inc.header.php index 8eb249d5313b..bf94460393ee 100644 --- a/cli/inc.header.php +++ b/cli/inc.header.php @@ -32,5 +32,5 @@ * @package ilias-core */ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); diff --git a/cli/sso/index.php b/cli/sso/index.php index f0f7eb02344e..80c8ad0edf7d 100644 --- a/cli/sso/index.php +++ b/cli/sso/index.php @@ -26,7 +26,7 @@ include_once './Services/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_APACHE_SSO); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->setCmd('doApacheAuthentication'); diff --git a/components/ILIAS/ADT/test/ilServicesADTSuite.php b/components/ILIAS/ADT/test/ilServicesADTSuite.php index dbe453c6b097..1ad923616761 100644 --- a/components/ILIAS/ADT/test/ilServicesADTSuite.php +++ b/components/ILIAS/ADT/test/ilServicesADTSuite.php @@ -12,7 +12,7 @@ public static function suite(): ilServicesADTSuite { $suite = new ilServicesADTSuite(); - include_once("./Services/ADT/test/ilADTFactoryTest.php"); + include_once("./components/ILIAS/ADT/test/ilADTFactoryTest.php"); $suite->addTestSuite(ilADTFactoryTest::class); return $suite; } diff --git a/components/ILIAS/AccessControl/classes/Setup/class.ilAccessCustomRBACOperationAddedObjective.php b/components/ILIAS/AccessControl/classes/Setup/class.ilAccessCustomRBACOperationAddedObjective.php index 2d7f5e625471..d08b92d6631e 100644 --- a/components/ILIAS/AccessControl/classes/Setup/class.ilAccessCustomRBACOperationAddedObjective.php +++ b/components/ILIAS/AccessControl/classes/Setup/class.ilAccessCustomRBACOperationAddedObjective.php @@ -180,7 +180,7 @@ protected function initEnvironment(Setup\Environment $environment) $GLOBALS["DIC"]["ilDB"] = $db; if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } return $DIC; diff --git a/components/ILIAS/AccessControl/classes/class.ilAccessControlImporter.php b/components/ILIAS/AccessControl/classes/class.ilAccessControlImporter.php index 640fdd59e33e..8e354359c324 100644 --- a/components/ILIAS/AccessControl/classes/class.ilAccessControlImporter.php +++ b/components/ILIAS/AccessControl/classes/class.ilAccessControlImporter.php @@ -38,7 +38,7 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - $role_folder_id = $a_mapping->getMapping('Services/AccessControl', 'rolf', (string) 0); + $role_folder_id = $a_mapping->getMapping('components/ILIAS/AccessControl', 'rolf', (string) 0); $importer = new ilRoleXmlImporter((int) $role_folder_id); $importer->setXml($a_xml); diff --git a/components/ILIAS/AccessControl/classes/class.ilAccessPermissionsStatusTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilAccessPermissionsStatusTableGUI.php index 2cefb8325c6d..d384242efabe 100644 --- a/components/ILIAS/AccessControl/classes/class.ilAccessPermissionsStatusTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilAccessPermissionsStatusTableGUI.php @@ -43,7 +43,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->disable('sort'); $this->disable('numinfo'); $this->setLimit(100); - $this->setRowTemplate("tpl.access_permissions_status_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.access_permissions_status_row.html", "components/ILIAS/AccessControl"); $this->addColumn($this->lng->txt("status"), "status", "5%"); $this->addColumn($this->lng->txt("operation"), "operation", "45%"); diff --git a/components/ILIAS/AccessControl/classes/class.ilAssignedUsersTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilAssignedUsersTableGUI.php index d897e800788a..e1d3d536ab6c 100644 --- a/components/ILIAS/AccessControl/classes/class.ilAssignedUsersTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilAssignedUsersTableGUI.php @@ -52,7 +52,7 @@ public function __construct( $this->setExternalSegmentation(true); $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($parent_obj, $parent_cmd)); - $this->setRowTemplate('tpl.user_assignment_row.html', 'Services/AccessControl'); + $this->setRowTemplate('tpl.user_assignment_row.html', 'components/ILIAS/AccessControl'); $this->setEnableTitle(true); $this->setDefaultOrderField('login'); diff --git a/components/ILIAS/AccessControl/classes/class.ilAvailableRolesStatusTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilAvailableRolesStatusTableGUI.php index 050ce22eb522..f17bad4becd9 100644 --- a/components/ILIAS/AccessControl/classes/class.ilAvailableRolesStatusTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilAvailableRolesStatusTableGUI.php @@ -44,7 +44,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd) $this->setEnableHeader(true); $this->disable('numinfo'); $this->setLimit(100); - $this->setRowTemplate("tpl.available_roles_status_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.available_roles_status_row.html", "components/ILIAS/AccessControl"); $this->addColumn($this->lng->txt("status"), "status", "5%"); $this->addColumn($this->lng->txt("role"), "role", "32%"); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php index e13e52ceb257..b85af7a6df88 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php @@ -469,7 +469,7 @@ protected function permObject(bool $a_show_admin_permissions = false): void 'ADM_CONTENT', 'adm_content', 'tpl.rbac_template_permissions.html', - 'Services/AccessControl' + 'components/ILIAS/AccessControl' ); $this->tpl->setVariable('PERM_ACTION', $this->ctrl->getFormAction($this)); @@ -929,7 +929,7 @@ public function userassignmentObject(): void $this->tabs_gui->setTabActive('user_assignment'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rbac_ua.html', 'Services/AccessControl'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rbac_ua.html', 'components/ILIAS/AccessControl'); $tb = new ilToolbarGUI(); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php index d3c584ac6a39..92f8f74065f6 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php @@ -225,7 +225,7 @@ protected function permObject(): void 'ADM_CONTENT', 'adm_content', 'tpl.rbac_template_permissions.html', - 'Services/AccessControl' + 'components/ILIAS/AccessControl' ); $this->tpl->setVariable('PERM_ACTION', $this->ctrl->getFormAction($this)); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php index f808ccecf7d0..e913b71e0ed5 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php @@ -93,7 +93,7 @@ public function executeCommand(): void */ public function perminfo(): void { - $tpl = new ilTemplate("tpl.info_layout.html", false, false, "Services/AccessControl"); + $tpl = new ilTemplate("tpl.info_layout.html", false, false, "components/ILIAS/AccessControl"); $tpl->setVariable("INFO_SUMMARY", $this->accessStatusInfo()); $tpl->setVariable("INFO_PERMISSIONS", $this->accessPermissionsTable()); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php index 60556f499727..f8ed78cbe822 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjectRolePermissionTableGUI.php @@ -57,14 +57,14 @@ public function __construct(ilPermissionGUI $a_parent_obj, string $a_parent_cmd, $this->tree_path_ids = $this->tree->getPathId($this->ref_id); $tpl = $DIC->ui()->mainTemplate(); - $tpl->addJavaScript('./Services/AccessControl/js/ilPermSelect.js'); + $tpl->addJavaScript('./components/ILIAS/AccessControl/js/ilPermSelect.js'); $this->setTitle($this->lng->txt('permission_settings')); $this->setEnableHeader(true); $this->disable('sort'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); $this->disable('numinfo'); - $this->setRowTemplate("tpl.obj_role_perm_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.obj_role_perm_row.html", "components/ILIAS/AccessControl"); $this->setLimit(100); $this->setShowRowsSelector(false); $this->setDisableFilterHiding(true); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplateOptionsTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplateOptionsTableGUI.php index 6efd709ae362..aa7634f99a96 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplateOptionsTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplateOptionsTableGUI.php @@ -52,7 +52,7 @@ public function __construct( $this->role_id = $a_role_id; $this->obj_ref_id = $a_obj_ref_id; - $this->setRowTemplate("tpl.obj_role_template_options_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.obj_role_template_options_row.html", "components/ILIAS/AccessControl"); $this->setLimit(100); $this->setShowRowsSelector(false); $this->setDisableFilterHiding(true); diff --git a/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplatePermissionTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplatePermissionTableGUI.php index 5c09f3ecc227..9a24465a6482 100644 --- a/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplatePermissionTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilObjectRoleTemplatePermissionTableGUI.php @@ -64,7 +64,7 @@ public function __construct( $this->ref_id = $a_ref_id; $this->role_id = $a_role_id; - $this->setRowTemplate("tpl.obj_role_template_perm_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.obj_role_template_perm_row.html", "components/ILIAS/AccessControl"); $this->setLimit(100); $this->setShowRowsSelector(false); $this->setDisableFilterHiding(true); diff --git a/components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php b/components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php index e0bbf40d5e88..7137666c9917 100644 --- a/components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php @@ -581,7 +581,7 @@ protected function doImportRole(): void // For global roles set import id to parent of current ref_id (adm) $imp = new ilImport($this->getCurrentObject()->getRefId()); $imp->getMapping()->addMapping( - 'Services/AccessControl', + 'components/ILIAS/AccessControl', 'rolf', '0', (string) $this->getCurrentObject()->getRefId() diff --git a/components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php b/components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php index e5410e922fb2..ec508e83d357 100644 --- a/components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php +++ b/components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php @@ -211,7 +211,7 @@ public function assignUser(int $a_rol_id, int $a_usr_id): void if (!$alreadyAssigned) { ilLoggerFactory::getInstance()->getLogger('ac')->debug('Raise event assign user'); $GLOBALS['DIC']['ilAppEventHandler']->raise( - 'Services/AccessControl', + 'components/ILIAS/AccessControl', 'assignUser', [ 'obj_id' => $obj_id, @@ -244,7 +244,7 @@ public function deassignUser(int $a_rol_id, int $a_usr_id): void $type = ilObject::_lookupType($obj_id); ilLoggerFactory::getInstance()->getLogger('ac')->debug('Raise event deassign user'); - $GLOBALS['DIC']['ilAppEventHandler']->raise('Services/AccessControl', 'deassignUser', [ + $GLOBALS['DIC']['ilAppEventHandler']->raise('components/ILIAS/AccessControl', 'deassignUser', [ 'obj_id' => $obj_id, 'usr_id' => $a_usr_id, 'role_id' => $a_rol_id, diff --git a/components/ILIAS/AccessControl/classes/class.ilRbacLogTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilRbacLogTableGUI.php index 4bef2c9f23b5..bb49238040a7 100644 --- a/components/ILIAS/AccessControl/classes/class.ilRbacLogTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilRbacLogTableGUI.php @@ -51,7 +51,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_r $this->setExternalSegmentation(true); $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); - $this->setRowTemplate('tpl.rbac_log_row.html', 'Services/AccessControl'); + $this->setRowTemplate('tpl.rbac_log_row.html', 'components/ILIAS/AccessControl'); $this->setFilterCommand('applyLogFilter'); $this->setResetCommand('resetLogFilter'); diff --git a/components/ILIAS/AccessControl/classes/class.ilRoleAdoptPermissionTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilRoleAdoptPermissionTableGUI.php index f82e49675516..e6e46a837c7f 100644 --- a/components/ILIAS/AccessControl/classes/class.ilRoleAdoptPermissionTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilRoleAdoptPermissionTableGUI.php @@ -37,7 +37,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.obj_role_adopt_permission_row.html", - "Services/AccessControl" + "components/ILIAS/AccessControl" ); $this->addCommandButton("perm", $this->lng->txt("cancel")); $this->addMultiCommand("adoptPermSave", $this->lng->txt("save")); diff --git a/components/ILIAS/AccessControl/classes/class.ilRoleSelectionTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilRoleSelectionTableGUI.php index 73163acbf673..e11102e8d2e4 100644 --- a/components/ILIAS/AccessControl/classes/class.ilRoleSelectionTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilRoleSelectionTableGUI.php @@ -38,7 +38,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->addColumn($this->lng->txt('context'), 'context', "30%"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_role_selection_row.html", "Services/AccessControl"); + $this->setRowTemplate("tpl.show_role_selection_row.html", "components/ILIAS/AccessControl"); $this->setDefaultOrderField('type'); $this->setDefaultOrderDirection("desc"); } diff --git a/components/ILIAS/AccessControl/classes/class.ilRoleTableGUI.php b/components/ILIAS/AccessControl/classes/class.ilRoleTableGUI.php index c182b7113090..ca3762cc62f4 100644 --- a/components/ILIAS/AccessControl/classes/class.ilRoleTableGUI.php +++ b/components/ILIAS/AccessControl/classes/class.ilRoleTableGUI.php @@ -176,7 +176,7 @@ public function init(): void break; } - $this->setRowTemplate('tpl.role_row.html', 'Services/AccessControl'); + $this->setRowTemplate('tpl.role_row.html', 'components/ILIAS/AccessControl'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); $this->setSelectAllCheckbox('roles'); diff --git a/components/ILIAS/AccessControl/test/ilServicesAccessControlSuite.php b/components/ILIAS/AccessControl/test/ilServicesAccessControlSuite.php index 39e2c22641dd..f9b184cfb1c7 100644 --- a/components/ILIAS/AccessControl/test/ilServicesAccessControlSuite.php +++ b/components/ILIAS/AccessControl/test/ilServicesAccessControlSuite.php @@ -26,7 +26,7 @@ public static function suite(): TestSuite { $suite = new ilServicesAccessControlSuite(); /** @noRector */ - include_once("./Services/AccessControl/test/ilRBACTest.php"); + include_once("./components/ILIAS/AccessControl/test/ilRBACTest.php"); $suite->addTestSuite(ilRBACTest::class); return $suite; } diff --git a/components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentTableGUI.php b/components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentTableGUI.php index e0c48c668cca..f72640d751af 100644 --- a/components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentTableGUI.php +++ b/components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentTableGUI.php @@ -61,7 +61,7 @@ public function __construct( $this->setExternalSegmentation(true); $this->setLimit(PHP_INT_MAX); - $this->setRowTemplate('tpl.acc_documents_row.html', 'Services/Accessibility'); + $this->setRowTemplate('tpl.acc_documents_row.html', 'components/ILIAS/Accessibility'); if ($this->isEditable) { $this->setSelectAllCheckbox('acc_id[]'); diff --git a/components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php b/components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php index d20edb3846b5..24293ed17c47 100644 --- a/components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php +++ b/components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php @@ -74,7 +74,7 @@ protected function initTemplate(string $a_tmpl): ilGlobalTemplate { $tpl = new ilGlobalTemplate("tpl.main.html", true, true); $template_file = $a_tmpl; - $template_dir = 'Services/Accessibility'; + $template_dir = 'components/ILIAS/Accessibility'; $tpl->addBlockFile('CONTENT', 'content', $template_file, $template_dir); return $tpl; } diff --git a/components/ILIAS/Accessibility/test/ilServicesAccessibilitySuite.php b/components/ILIAS/Accessibility/test/ilServicesAccessibilitySuite.php index 63d3d46ffef7..24a64f17d541 100644 --- a/components/ILIAS/Accessibility/test/ilServicesAccessibilitySuite.php +++ b/components/ILIAS/Accessibility/test/ilServicesAccessibilitySuite.php @@ -31,7 +31,7 @@ public static function suite() { $suite = new self(); - require_once("./Services/Accessibility/test/AccessibilityCriterionConfigTest.php"); + require_once("./components/ILIAS/Accessibility/test/AccessibilityCriterionConfigTest.php"); $suite->addTestSuite("AccessibilityCriterionConfigTest"); return $suite; diff --git a/components/ILIAS/Accordion/classes/class.ilAccordionGUI.php b/components/ILIAS/Accordion/classes/class.ilAccordionGUI.php index 0c0f316f62a6..2f5d7c644181 100644 --- a/components/ILIAS/Accordion/classes/class.ilAccordionGUI.php +++ b/components/ILIAS/Accordion/classes/class.ilAccordionGUI.php @@ -254,7 +254,7 @@ public static function addCss(): void public static function getLocalJavascriptFiles(): array { return array( - "./Services/Accordion/js/accordion.js", + "./components/ILIAS/Accordion/js/accordion.js", self::$owl_path . self::$owl_js_path ); } @@ -262,7 +262,7 @@ public static function getLocalJavascriptFiles(): array public static function getLocalCssFiles(): array { return array( - "./Services/Accordion/css/accordion.css", + "./components/ILIAS/Accordion/css/accordion.css", self::$owl_path . self::$owl_css_path ); } @@ -309,7 +309,7 @@ public function getHTML(bool $async = false): string $this->addJavascript(); $this->addCss(); - $tpl = new ilTemplate("tpl.accordion.html", true, true, "Services/Accordion"); + $tpl = new ilTemplate("tpl.accordion.html", true, true, "components/ILIAS/Accordion"); foreach ($this->getItems() as $item) { $tpl->setCurrentBlock("item"); $tpl->setVariable("HEADER", $item["header"]); diff --git a/components/ILIAS/Accordion/test/ilServicesAccordionSuite.php b/components/ILIAS/Accordion/test/ilServicesAccordionSuite.php index 5c6f72478d50..4c2d5d79d57e 100644 --- a/components/ILIAS/Accordion/test/ilServicesAccordionSuite.php +++ b/components/ILIAS/Accordion/test/ilServicesAccordionSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Accordion/test/AccordionStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Accordion/test/AccordionStandardGUIRequestTest.php"); $suite->addTestSuite("AccordionStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/ActiveRecord/Fields/Converter/class.arConverter.php b/components/ILIAS/ActiveRecord/Fields/Converter/class.arConverter.php index 2eb193f01890..922a33877098 100644 --- a/components/ILIAS/ActiveRecord/Fields/Converter/class.arConverter.php +++ b/components/ILIAS/ActiveRecord/Fields/Converter/class.arConverter.php @@ -69,7 +69,7 @@ public function readStructure(): void public function downloadClassFile(): void { $header = " addTestSuite("ilServicesActiveRecordConnectorTest"); /** @noRector */ - require_once("./Services/ActiveRecord/test/ilServicesActiveRecordFieldTest.php"); + require_once("./components/ILIAS/ActiveRecord/test/ilServicesActiveRecordFieldTest.php"); $self->addTestSuite("ilServicesActiveRecordFieldTest"); return $self; diff --git a/components/ILIAS/Administration/classes/class.ilAdministrationSettingsFormHandler.php b/components/ILIAS/Administration/classes/class.ilAdministrationSettingsFormHandler.php index a3ee62679341..be6cb86e1b06 100644 --- a/components/ILIAS/Administration/classes/class.ilAdministrationSettingsFormHandler.php +++ b/components/ILIAS/Administration/classes/class.ilAdministrationSettingsFormHandler.php @@ -259,7 +259,7 @@ protected static function parseFieldDefinition( $cmd = $fields[0]; $fields = $fields[1]; if (is_array($fields)) { - $ftpl = new ilTemplate("tpl.external_settings.html", true, true, "Services/Administration"); + $ftpl = new ilTemplate("tpl.external_settings.html", true, true, "components/ILIAS/Administration"); $stack = array(); diff --git a/components/ILIAS/Administration/test/ilServicesAdministrationSuite.php b/components/ILIAS/Administration/test/ilServicesAdministrationSuite.php index a00534c5d10c..9d9c6c6b7cbe 100644 --- a/components/ILIAS/Administration/test/ilServicesAdministrationSuite.php +++ b/components/ILIAS/Administration/test/ilServicesAdministrationSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Administration/test/AdminGUIRequestTest.php"); + require_once("./components/ILIAS/Administration/test/AdminGUIRequestTest.php"); $suite->addTestSuite("AdminGUIRequestTest"); return $suite; diff --git a/components/ILIAS/AdministrativeNotification/PRIVACY.md b/components/ILIAS/AdministrativeNotification/PRIVACY.md index 02fe9124e55c..4fb67a1f2e98 100644 --- a/components/ILIAS/AdministrativeNotification/PRIVACY.md +++ b/components/ILIAS/AdministrativeNotification/PRIVACY.md @@ -5,7 +5,7 @@ Disclaimer: This documentation does not warrant completeness or correctness. Ple - User IDs of the persons that created and last updated the AdministrativeNotification entry as well as the timestamps of the creation and last update of the entry are stored. This data is stored in order to ensure internal traceability regarding timing and authorship in the event of any problems caused by the AdministrativeNotification entry. - User IDs of the persons that dismissed the notification are stored. This prevents the AdministrativeNotification service from showing dismissed notifications again. - The AdministrativeNotification service employs the following services, please consult the respective privacy.mds: - - [GlobalScreen](../../Services/GlobalScreen/PRIVACY.md) + - [GlobalScreen](../../components/ILIAS/GlobalScreen_/PRIVACY.md) ## Data being presented - The AdministrativeNotification service does not present any personal data. diff --git a/components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationTableGUI.php b/components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationTableGUI.php index fe342d91d332..398c879ce59f 100644 --- a/components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationTableGUI.php +++ b/components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationTableGUI.php @@ -54,7 +54,7 @@ public function __construct(ilADNNotificationGUI $a_parent_obj, string $a_parent $this->access = new ilObjAdministrativeNotificationAccess(); $this->setId('msg_msg_table'); - $this->setRowTemplate('Services/AdministrativeNotification/templates/default/tpl.row.html'); + $this->setRowTemplate('components/ILIAS/AdministrativeNotification/templates/default/tpl.row.html'); parent::__construct($a_parent_obj, $a_parent_cmd); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); // diff --git a/components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationSuite.php b/components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationSuite.php index 7a5cf1377716..81fcd205c46f 100644 --- a/components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationSuite.php +++ b/components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/AdministrativeNotification/test/ilServicesAdministrativeNotificationTest.php"); + require_once("./components/ILIAS/AdministrativeNotification/test/ilServicesAdministrativeNotificationTest.php"); $suite->addTestSuite("ilServicesAdministrativeNotificationTest"); return $suite; diff --git a/components/ILIAS/AdvancedEditing/test/ilServicesAdvancedEditingSuite.php b/components/ILIAS/AdvancedEditing/test/ilServicesAdvancedEditingSuite.php index ee08c23febe0..84b676b10686 100644 --- a/components/ILIAS/AdvancedEditing/test/ilServicesAdvancedEditingSuite.php +++ b/components/ILIAS/AdvancedEditing/test/ilServicesAdvancedEditingSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/AdvancedEditing/test/AdveStandardGUIRequestTest.php"); + require_once("./components/ILIAS/AdvancedEditing/test/AdveStandardGUIRequestTest.php"); $suite->addTestSuite("AdveStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordExportFilesTableGUI.php b/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordExportFilesTableGUI.php index a2d080186be7..512e81120202 100644 --- a/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordExportFilesTableGUI.php +++ b/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordExportFilesTableGUI.php @@ -39,7 +39,7 @@ public function __construct($a_parent_obj, $a_parent_cmd = '') $this->addColumn($this->lng->txt('filesize'), 'file_size', "33%"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.edit_files_row.html", "Services/AdvancedMetaData"); + $this->setRowTemplate("tpl.edit_files_row.html", "components/ILIAS/AdvancedMetaData"); $this->setDefaultOrderField("date"); $this->setDefaultOrderDirection('desc'); } diff --git a/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordTableGUI.php b/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordTableGUI.php index 87cd85bc8151..5efa3d56f384 100644 --- a/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordTableGUI.php +++ b/components/ILIAS/AdvancedMetaData/classes/Record/class.ilAdvancedMDRecordTableGUI.php @@ -51,7 +51,7 @@ public function __construct( $this->addColumn($this->lng->txt('actions')); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_records_row.html", "Services/AdvancedMetaData"); + $this->setRowTemplate("tpl.show_records_row.html", "components/ILIAS/AdvancedMetaData"); $this->setDefaultOrderField('position'); $this->setDefaultOrderDirection('asc'); $this->setShowRowsSelector(true); diff --git a/components/ILIAS/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordLanguageTableGUI.php b/components/ILIAS/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordLanguageTableGUI.php index 0082d78f8a35..4a17b93e742b 100644 --- a/components/ILIAS/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordLanguageTableGUI.php +++ b/components/ILIAS/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordLanguageTableGUI.php @@ -59,7 +59,7 @@ public function init(): void $this->setSelectAllCheckbox('active_languages'); $this->enable('select_all'); - $this->setRowTemplate('tpl.record_language_selection_row.html', 'Services/AdvancedMetaData'); + $this->setRowTemplate('tpl.record_language_selection_row.html', 'components/ILIAS/AdvancedMetaData'); $this->setDefaultOrderField(self::COL_LANGUAGE); $this->setDefaultOrderDirection('asc'); diff --git a/components/ILIAS/AdvancedMetaData/classes/Types/class.ilAdvancedMDFieldDefinitionGroupTableGUI.php b/components/ILIAS/AdvancedMetaData/classes/Types/class.ilAdvancedMDFieldDefinitionGroupTableGUI.php index 08defe2e2c31..d7455b26427a 100644 --- a/components/ILIAS/AdvancedMetaData/classes/Types/class.ilAdvancedMDFieldDefinitionGroupTableGUI.php +++ b/components/ILIAS/AdvancedMetaData/classes/Types/class.ilAdvancedMDFieldDefinitionGroupTableGUI.php @@ -28,7 +28,7 @@ public function __construct($a_parent_obj, $a_parent_cmd, ilAdvancedMDFieldDefin $this->addColumn($this->lng->txt("action"), ""); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.edit_complex_row.html", "Services/AdvancedMetaData"); + $this->setRowTemplate("tpl.edit_complex_row.html", "components/ILIAS/AdvancedMetaData"); $this->setDefaultOrderField("option"); $this->initItems($a_def); } diff --git a/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDFieldTableGUI.php b/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDFieldTableGUI.php index 2d2f88017256..5de15315c344 100644 --- a/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDFieldTableGUI.php +++ b/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDFieldTableGUI.php @@ -58,7 +58,7 @@ public function __construct( $this->addColumn($this->lng->txt('options'), 'obj_types', "30%"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.edit_fields_row.html", "Services/AdvancedMetaData"); + $this->setRowTemplate("tpl.edit_fields_row.html", "components/ILIAS/AdvancedMetaData"); $this->setDefaultOrderField("position"); /* * BT 35830: disable pagination to prevent that and similar issues due to diff --git a/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDParser.php b/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDParser.php index 426f5980ffc0..9df2bdff6fc3 100644 --- a/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDParser.php +++ b/components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDParser.php @@ -92,7 +92,7 @@ public function createLocalRecord(int $a_old_id, string $a_xml, int $a_obj_id, ? foreach ($fields as $import_id => $new_id) { $import_ids = explode('_', $import_id); $old_id = array_pop($import_ids); - $this->mapping->addMapping("Services/AdvancedMetaData", "lfld", $old_id, (string) $new_id); + $this->mapping->addMapping("components/ILIAS/AdvancedMetaData", "lfld", $old_id, (string) $new_id); } } $map_keys = array_keys($map); @@ -166,7 +166,7 @@ protected function initValue( $this->current_value = null; // get parent objects - $new_parent_id = (int) $this->mapping->getMapping("Services/AdvancedMetaData", "parent", (string) $this->obj_id); + $new_parent_id = (int) $this->mapping->getMapping("components/ILIAS/AdvancedMetaData", "parent", (string) $this->obj_id); $this->log->notice('Found new parent id:' . $new_parent_id); if (!$new_parent_id) { return; @@ -174,7 +174,7 @@ protected function initValue( $new_sub_id = ''; if ($a_sub_type && strcmp($a_sub_type, '-') !== 0) { $new_sub_id = $this->mapping->getMapping( - "Services/AdvancedMetaData", + "components/ILIAS/AdvancedMetaData", "advmd_sub_item", "advmd:" . $a_sub_type . ":" . $a_sub_id ); diff --git a/components/ILIAS/AdvancedMetaData/test/ilServicesAdvancedMetaDataSuite.php b/components/ILIAS/AdvancedMetaData/test/ilServicesAdvancedMetaDataSuite.php index b5fd697fd57b..5fd26e1d7024 100644 --- a/components/ILIAS/AdvancedMetaData/test/ilServicesAdvancedMetaDataSuite.php +++ b/components/ILIAS/AdvancedMetaData/test/ilServicesAdvancedMetaDataSuite.php @@ -11,7 +11,7 @@ public static function suite(): self { $suite = new self(); - include_once './Services/AdvancedMetaData/test/record/ilAdvancedMDRecordObjectOrderingsTest.php'; + include_once './components/ILIAS/AdvancedMetaData/test/record/ilAdvancedMDRecordObjectOrderingsTest.php'; $suite->addTestSuite(ilAdvancedMDRecordObjectOrderingsTest::class); return $suite; diff --git a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqFactory.php b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqFactory.php index 9684e0d98f9b..370c35b7cd8a 100644 --- a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqFactory.php +++ b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqFactory.php @@ -19,7 +19,7 @@ /** * Class ilAsqQuestionAuthoringFactory * @author Björn Heyser - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ class ilAsqFactory { diff --git a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResourcesCollector.php b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResourcesCollector.php index 5792c8e0d932..e6b27b6dbbb0 100644 --- a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResourcesCollector.php +++ b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResourcesCollector.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ class ilAsqQuestionResourcesCollector { diff --git a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResult.php b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResult.php index 313819e704ef..44b9b67ceccb 100644 --- a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResult.php +++ b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqQuestionResult.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ class ilAsqQuestionResult { diff --git a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqService.php b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqService.php index 451abae34825..262cbf7ac2a9 100644 --- a/components/ILIAS/AssessmentQuestion/classes/class.ilAsqService.php +++ b/components/ILIAS/AssessmentQuestion/classes/class.ilAsqService.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ class ilAsqService { diff --git a/components/ILIAS/AssessmentQuestion/classes/class.ilAssessmentQuestionExporter.php b/components/ILIAS/AssessmentQuestion/classes/class.ilAssessmentQuestionExporter.php index 9e3514657c0e..d61d3b5ec868 100644 --- a/components/ILIAS/AssessmentQuestion/classes/class.ilAssessmentQuestionExporter.php +++ b/components/ILIAS/AssessmentQuestion/classes/class.ilAssessmentQuestionExporter.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ class ilAssessmentQuestionExporter extends ilXmlExporter { diff --git a/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolExporter.php b/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolExporter.php index 4c42e9281347..18c9c8618467 100644 --- a/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolExporter.php +++ b/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolExporter.php @@ -56,7 +56,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($questionIds)) { $deps[] = array( - 'component' => 'Services/AssessmentQuestion', + 'component' => 'components/ILIAS/AssessmentQuestion', 'entity' => 'qst', 'ids' => $questionIds ); diff --git a/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolImporter.php b/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolImporter.php index 798eaab35d5e..4bfa6f6c8558 100644 --- a/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolImporter.php +++ b/components/ILIAS/AssessmentQuestion/examples/class.exQuestionPoolImporter.php @@ -42,7 +42,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void foreach ($maps as $old => $new) { if ($old != "new_id" && (int) $old > 0) { - $newQstIds = $a_mapping->getMapping("Services/AssessmentQuestion", "qst", $old); + $newQstIds = $a_mapping->getMapping("components/ILIAS/AssessmentQuestion", "qst", $old); if ($newQstIds !== false) { $qstIds = explode(":", $newQstIds); @@ -53,7 +53,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void } } - $qstMappings = $a_mapping->getMappingsOfEntity('Services/AssessmentQuestion', 'qst'); + $qstMappings = $a_mapping->getMappingsOfEntity('components/ILIAS/AssessmentQuestion', 'qst'); foreach ($qstMappings as $oldQstId => $newQstId) { // process all question ids within the consumer component database, diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestion.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestion.php index 427a5b54c133..9f9f94fe20b2 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestion.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestion.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestion { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionAuthoring.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionAuthoring.php index ca58adade95a..551cc0511e68 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionAuthoring.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionAuthoring.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestionAuthoring { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionNavigationAware.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionNavigationAware.php index fa4d3544897f..511e09070f68 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionNavigationAware.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionNavigationAware.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestionNavigationAware { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionOfflinePresentationExporter.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionOfflinePresentationExporter.php index b20ac2cac4d0..d35df1ec5047 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionOfflinePresentationExporter.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionOfflinePresentationExporter.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestionOfflinePresentationExporter { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionPresentation.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionPresentation.php index 69e0231a6dbf..7a6405ec3a96 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionPresentation.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionPresentation.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestionPresentation { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionSolution.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionSolution.php index 89dbdea14d72..67d09a9cadd0 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionSolution.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqQuestionSolution.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqQuestionSolution { diff --git a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqResultCalculator.php b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqResultCalculator.php index 4bbcbd31ac28..22804048a972 100644 --- a/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqResultCalculator.php +++ b/components/ILIAS/AssessmentQuestion/interfaces/interface.ilAsqResultCalculator.php @@ -8,7 +8,7 @@ * @author Björn Heyser * @version $Id$ * - * @package Services/AssessmentQuestion + * @package components/ILIAS/AssessmentQuestion */ interface ilAsqResultCalculator { diff --git a/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettingsForm.php b/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettingsForm.php index 73197aba5945..6fb304f93260 100644 --- a/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettingsForm.php +++ b/components/ILIAS/AuthShibboleth/classes/Config/class.ilShibbolethSettingsForm.php @@ -76,7 +76,7 @@ public function initForm(): void $field = $this->ui->input()->field(); $custom_trafo = fn (callable $c) => $this->refinery->custom()->transformation($c); /** @noRector */ - $read_me_link = "./Services/AuthShibboleth/README.SHIBBOLETH.txt"; + $read_me_link = "./components/ILIAS/AuthShibboleth/README.SHIBBOLETH.txt"; $active = $field->checkbox($this->txt('shib_active'), $this->lng->txt("auth_shib_instructions")) ->withValue($this->settings->isActive()) ->withAdditionalTransformation($custom_trafo(function ($v): void { diff --git a/components/ILIAS/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php b/components/ILIAS/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php index 4d0ddbad372f..815012931e9c 100644 --- a/components/ILIAS/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php +++ b/components/ILIAS/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php @@ -109,7 +109,7 @@ protected function roleAssignment(): bool 'ADM_CONTENT', 'adm_content', 'tpl.shib_role_assignment.html', - 'Services/AuthShibboleth' + 'components/ILIAS/AuthShibboleth' ); $this->tpl->setVariable('NEW_RULE_TABLE', $this->form->getHTML()); if (($html = $this->parseRulesTable()) !== '') { @@ -280,7 +280,7 @@ protected function addRoleAssignmentRule(): bool 'ADM_CONTENT', 'adm_content', 'tpl.shib_role_assignment.html', - 'Services/AuthShibboleth' + 'components/ILIAS/AuthShibboleth' ); $this->tpl->setVariable('NEW_RULE_TABLE', $this->form->getHTML()); if (($html = $this->parseRulesTable()) !== '') { @@ -306,7 +306,7 @@ protected function editRoleAssignment(): bool 'ADM_CONTENT', 'adm_content', 'tpl.shib_role_assignment.html', - 'Services/AuthShibboleth' + 'components/ILIAS/AuthShibboleth' ); $this->tpl->setVariable('NEW_RULE_TABLE', $this->form->getHTML()); @@ -337,7 +337,7 @@ protected function updateRoleAssignmentRule(): bool 'ADM_CONTENT', 'adm_content', 'tpl.shib_role_assignment.html', - 'Services/AuthShibboleth' + 'components/ILIAS/AuthShibboleth' ); $this->tpl->setVariable('NEW_RULE_TABLE', $this->form->getHTML()); diff --git a/components/ILIAS/AuthShibboleth/classes/class.ilShibbolethRoleAssignmentTableGUI.php b/components/ILIAS/AuthShibboleth/classes/class.ilShibbolethRoleAssignmentTableGUI.php index 485417946e7d..9fabca2c6649 100644 --- a/components/ILIAS/AuthShibboleth/classes/class.ilShibbolethRoleAssignmentTableGUI.php +++ b/components/ILIAS/AuthShibboleth/classes/class.ilShibbolethRoleAssignmentTableGUI.php @@ -37,7 +37,7 @@ public function __construct(ilAuthShibbolethSettingsGUI $a_parent_obj, string $a $this->addColumn($this->lng->txt('shib_rule_condition'), 'condition', "20%"); $this->addColumn($this->lng->txt('shib_add_remove'), 'add_remove', "30%"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_role_assignment_row.html", "Services/AuthShibboleth"); + $this->setRowTemplate("tpl.show_role_assignment_row.html", "components/ILIAS/AuthShibboleth"); $this->setDefaultOrderField('type'); $this->setDefaultOrderDirection("desc"); } diff --git a/components/ILIAS/AuthShibboleth/test/ilServicesAuthShibbolethSuite.php b/components/ILIAS/AuthShibboleth/test/ilServicesAuthShibbolethSuite.php index f8a9133cbd7c..47b16756dc5c 100644 --- a/components/ILIAS/AuthShibboleth/test/ilServicesAuthShibbolethSuite.php +++ b/components/ILIAS/AuthShibboleth/test/ilServicesAuthShibbolethSuite.php @@ -26,7 +26,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/AuthShibboleth/test/ilServicesAuthShibbolethTest.php"); + require_once("./components/ILIAS/AuthShibboleth/test/ilServicesAuthShibbolethTest.php"); $suite->addTestSuite("ilServicesAuthShibbolethTest"); return $suite; diff --git a/components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontend.php b/components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontend.php index 2b546d23a1b1..95b7531f1063 100644 --- a/components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontend.php +++ b/components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontend.php @@ -360,7 +360,7 @@ protected function handleAuthenticationSuccess(ilAuthProviderInterface $provider // finally raise event $this->ilAppEventHandler->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'afterLogin', array( 'username' => $user->getLogin()) diff --git a/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorGUI.php b/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorGUI.php index eddff16f5c65..438cd4228d72 100644 --- a/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorGUI.php +++ b/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorGUI.php @@ -293,7 +293,7 @@ protected function showRichtextEditor(): void "ADM_CONTENT", "adm_content", "tpl.auth_login_messages.html", - "Services/Authentication" + "components/ILIAS/Authentication" ); $this->tpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this)); $this->tpl->setVariable("TXT_HEADLINE", $this->lng->txt("login_information")); diff --git a/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorTableGUI.php b/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorTableGUI.php index 66610a7c0378..42c1814f56b9 100644 --- a/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorTableGUI.php +++ b/components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorTableGUI.php @@ -88,7 +88,7 @@ protected function fillRow(array $a_set): void protected function initTable(): void { $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); - $this->setRowTemplate('tpl.auth_login_page_editor_table_row.html', 'Services/Authentication'); + $this->setRowTemplate('tpl.auth_login_page_editor_table_row.html', 'components/ILIAS/Authentication'); $this->setId('loginpageeditor'); $this->setSelectAllCheckbox('languages'); $this->setFormName('login_pages'); diff --git a/components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php b/components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php index bf2896106421..6103b070da41 100644 --- a/components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php +++ b/components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php @@ -68,7 +68,7 @@ public function authSettingsObject(): void $this->setSubTabs('authSettings'); $this->tabs_gui->setSubTabActive("auth_settings"); - $generalSettingsTpl = new ilTemplate('tpl.auth_general.html', true, true, 'Services/Authentication'); + $generalSettingsTpl = new ilTemplate('tpl.auth_general.html', true, true, 'components/ILIAS/Authentication'); $generalSettingsTpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this)); $generalSettingsTpl->setVariable("TXT_AUTH_TITLE", $this->lng->txt("auth_select")); @@ -255,7 +255,7 @@ public function loginInfoObject(): void "ADM_CONTENT", "adm_content", "tpl.auth_login_messages.html", - "Services/Authentication" + "components/ILIAS/Authentication" ); $this->tpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this)); $this->tpl->setVariable("TXT_HEADLINE", $this->lng->txt("login_information")); @@ -549,7 +549,7 @@ public function editScriptObject(): void "ADM_CONTENT", "adm_content", "tpl.auth_script.html", - "Services/Authentication" + "components/ILIAS/Authentication" ); $this->tpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this)); diff --git a/components/ILIAS/Authentication/classes/class.ilSessionControl.php b/components/ILIAS/Authentication/classes/class.ilSessionControl.php index 80f1ccb51cc6..3e165e24975a 100644 --- a/components/ILIAS/Authentication/classes/class.ilSessionControl.php +++ b/components/ILIAS/Authentication/classes/class.ilSessionControl.php @@ -207,7 +207,7 @@ private static function checkCurrentSessionIsAllowed(ilAuthSession $auth, int $a // Trigger reachedSessionPoolLimit Event $ilAppEventHandler = $DIC['ilAppEventHandler']; $ilAppEventHandler->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'reachedSessionPoolLimit', array() ); diff --git a/components/ILIAS/Authentication/classes/class.ilSessionReminderGUI.php b/components/ILIAS/Authentication/classes/class.ilSessionReminderGUI.php index c2606b5c52b3..e76e330b8c63 100644 --- a/components/ILIAS/Authentication/classes/class.ilSessionReminderGUI.php +++ b/components/ILIAS/Authentication/classes/class.ilSessionReminderGUI.php @@ -42,7 +42,7 @@ public function populatePage(): void iljQueryUtil::initjQuery($this->page); - $this->page->addJavaScript('./Services/Authentication/js/session_reminder.js'); + $this->page->addJavaScript('./components/ILIAS/Authentication/js/session_reminder.js'); $url = './sessioncheck.php?client_id=' . CLIENT_ID . '&lang=' . $this->lng->getLangKey(); $devMode = defined('DEVMODE') && DEVMODE ? 1 : 0; diff --git a/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php b/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php index 1113c4a18064..f1b6e2f0de9c 100644 --- a/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php +++ b/components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php @@ -483,7 +483,7 @@ protected function renderCurrentBasics(): string // build left column - $left = new ilTemplate("tpl.session_statistics_left.html", true, true, "Services/Authentication"); + $left = new ilTemplate("tpl.session_statistics_left.html", true, true, "components/ILIAS/Authentication"); $left->setVariable("CAPTION_CURRENT", $this->lng->txt("users_online")); $left->setVariable("VALUE_CURRENT", $active); @@ -564,7 +564,7 @@ protected function buildData(int $a_time_from, int $a_time_to, string $a_title): protected function render(array $a_data, int $a_scale, string $a_measure = null): string { - $center = new ilTemplate("tpl.session_statistics_center.html", true, true, "Services/Authentication"); + $center = new ilTemplate("tpl.session_statistics_center.html", true, true, "components/ILIAS/Authentication"); foreach ($a_data as $idx => $item) { switch ($idx) { diff --git a/components/ILIAS/Awareness/User/class.ProviderFactory.php b/components/ILIAS/Awareness/User/class.ProviderFactory.php index 34e2287b5774..0807767a7b55 100644 --- a/components/ILIAS/Awareness/User/class.ProviderFactory.php +++ b/components/ILIAS/Awareness/User/class.ProviderFactory.php @@ -31,31 +31,31 @@ class ProviderFactory */ protected static array $providers = array( array( - "component" => "Services/Contact/BuddySystem", + "component" => "components/ILIAS/Contact/BuddySystem", "class" => "ilAwarenessUserProviderContactRequests" ), array( - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "\ILIAS\Awareness\User\ProviderSystemContacts" ), array( - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "\ILIAS\Awareness\User\ProviderCourseContacts" ), array( - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "\ILIAS\Awareness\User\ProviderCurrentCourse" ), array( - "component" => "Services/Contact/BuddySystem", + "component" => "components/ILIAS/Contact/BuddySystem", "class" => "ilAwarenessUserProviderApprovedContacts" ), array( - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "\ILIAS\Awareness\User\ProviderMemberships" ), array( - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "\ILIAS\Awareness\User\ProviderAllUsers" ) ); diff --git a/components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php b/components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php index ea65ef22f201..17e0bc16df82 100644 --- a/components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php +++ b/components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php @@ -93,7 +93,7 @@ public function initJS(): void { $ilUser = $this->user; // init js - $this->main_tpl->addJavaScript("./Services/Awareness/js/Awareness.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/Awareness/js/Awareness.js"); $this->ctrl->setParameter($this, "ref_id", $this->ref_id); $this->main_tpl->addOnLoadCode("il.Awareness.setBaseUrl('" . $this->ctrl->getLinkTarget( $this, @@ -117,7 +117,7 @@ public function getAwarenessList(bool $return = false): ?array { $filter = $this->request->getFilter(); - $tpl = new ilTemplate("tpl.awareness_list.html", true, true, "Services/Awareness"); + $tpl = new ilTemplate("tpl.awareness_list.html", true, true, "components/ILIAS/Awareness"); $ad = $this->manager->getListData($filter); diff --git a/components/ILIAS/Awareness/test/ilServicesAwarenessSuite.php b/components/ILIAS/Awareness/test/ilServicesAwarenessSuite.php index 9cc216cee046..3840d12a515f 100644 --- a/components/ILIAS/Awareness/test/ilServicesAwarenessSuite.php +++ b/components/ILIAS/Awareness/test/ilServicesAwarenessSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Awareness/test/AwarenessSessionRepositoryTest.php"); + require_once("./components/ILIAS/Awareness/test/AwarenessSessionRepositoryTest.php"); $suite->addTestSuite("AwarenessSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/BackgroundTasks/ROADMAP.md b/components/ILIAS/BackgroundTasks_/ROADMAP.md similarity index 100% rename from components/ILIAS/BackgroundTasks/ROADMAP.md rename to components/ILIAS/BackgroundTasks_/ROADMAP.md diff --git a/components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCheckSumOfFileSizesJob.php b/components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCheckSumOfFileSizesJob.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCheckSumOfFileSizesJob.php rename to components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCheckSumOfFileSizesJob.php diff --git a/components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCollectFilesJob.php b/components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCollectFilesJob.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCollectFilesJob.php rename to components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCollectFilesJob.php diff --git a/components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCopyFilesToTempDirectoryJob.php b/components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCopyFilesToTempDirectoryJob.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Jobs/class.ilCopyFilesToTempDirectoryJob.php rename to components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCopyFilesToTempDirectoryJob.php diff --git a/components/ILIAS/BackgroundTasks/classes/Jobs/class.ilZipJob.php b/components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilZipJob.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Jobs/class.ilZipJob.php rename to components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilZipJob.php diff --git a/components/ILIAS/BackgroundTasks/classes/Provider/BTNotificationProvider.php b/components/ILIAS/BackgroundTasks_/classes/Provider/BTNotificationProvider.php similarity index 94% rename from components/ILIAS/BackgroundTasks/classes/Provider/BTNotificationProvider.php rename to components/ILIAS/BackgroundTasks_/classes/Provider/BTNotificationProvider.php index 4b87dc319245..8ca9ba52011d 100644 --- a/components/ILIAS/BackgroundTasks/classes/Provider/BTNotificationProvider.php +++ b/components/ILIAS/BackgroundTasks_/classes/Provider/BTNotificationProvider.php @@ -39,7 +39,7 @@ public function getNotifications(): array return []; } - $this->dic->ui()->mainTemplate()->addJavaScript("./Services/BackgroundTasks/js/background_task_refresh.js"); + $this->dic->ui()->mainTemplate()->addJavaScript("./components/ILIAS/BackgroundTasks_/js/background_task_refresh.js"); $this->dic->language()->loadLanguageModule('background_tasks'); $id = fn (string $id): IdentificationInterface => $this->if->identifier($id); diff --git a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php similarity index 96% rename from components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php rename to components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php index f954dfd075d9..95be9f05c605 100644 --- a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php +++ b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksConfigStoredObjective.php @@ -35,7 +35,7 @@ public function getHash(): string public function getLabel(): string { - return "Fill ini with settings for Services/BackgroundTasks"; + return "Fill ini with settings for components/ILIAS/BackgroundTasks_"; } public function isNotable(): bool diff --git a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksDB80.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksDB80.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksDB80.php rename to components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksDB80.php diff --git a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksMetricsCollectedObjective.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksMetricsCollectedObjective.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksMetricsCollectedObjective.php rename to components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksMetricsCollectedObjective.php diff --git a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksSetupAgent.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksSetupAgent.php rename to components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupAgent.php diff --git a/components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksSetupConfig.php b/components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupConfig.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/Setup/class.ilBackgroundTasksSetupConfig.php rename to components/ILIAS/BackgroundTasks_/classes/Setup/class.ilBackgroundTasksSetupConfig.php diff --git a/components/ILIAS/BackgroundTasks/classes/StateTranslator.php b/components/ILIAS/BackgroundTasks_/classes/StateTranslator.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/StateTranslator.php rename to components/ILIAS/BackgroundTasks_/classes/StateTranslator.php diff --git a/components/ILIAS/BackgroundTasks/classes/UserInteractions/class.ilDownloadZipInteraction.php b/components/ILIAS/BackgroundTasks_/classes/UserInteractions/class.ilDownloadZipInteraction.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/UserInteractions/class.ilDownloadZipInteraction.php rename to components/ILIAS/BackgroundTasks_/classes/UserInteractions/class.ilDownloadZipInteraction.php diff --git a/components/ILIAS/BackgroundTasks/classes/UserInteractions/class.ilSumOfFileSizesTooLargeInteraction.php b/components/ILIAS/BackgroundTasks_/classes/UserInteractions/class.ilSumOfFileSizesTooLargeInteraction.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/UserInteractions/class.ilSumOfFileSizesTooLargeInteraction.php rename to components/ILIAS/BackgroundTasks_/classes/UserInteractions/class.ilSumOfFileSizesTooLargeInteraction.php diff --git a/components/ILIAS/BackgroundTasks/classes/class.ilBTControllerGUI.php b/components/ILIAS/BackgroundTasks_/classes/class.ilBTControllerGUI.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/class.ilBTControllerGUI.php rename to components/ILIAS/BackgroundTasks_/classes/class.ilBTControllerGUI.php diff --git a/components/ILIAS/BackgroundTasks/classes/class.ilBTPopOverGUI.php b/components/ILIAS/BackgroundTasks_/classes/class.ilBTPopOverGUI.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/class.ilBTPopOverGUI.php rename to components/ILIAS/BackgroundTasks_/classes/class.ilBTPopOverGUI.php diff --git a/components/ILIAS/BackgroundTasks/classes/class.ilCopyDefinition.php b/components/ILIAS/BackgroundTasks_/classes/class.ilCopyDefinition.php similarity index 100% rename from components/ILIAS/BackgroundTasks/classes/class.ilCopyDefinition.php rename to components/ILIAS/BackgroundTasks_/classes/class.ilCopyDefinition.php diff --git a/components/ILIAS/BackgroundTasks/classes/class.ilSoapBackgroundTasksAdministration.php b/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php similarity index 94% rename from components/ILIAS/BackgroundTasks/classes/class.ilSoapBackgroundTasksAdministration.php rename to components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php index f57325dc3b46..a19545d6bec9 100644 --- a/components/ILIAS/BackgroundTasks/classes/class.ilSoapBackgroundTasksAdministration.php +++ b/components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php @@ -17,7 +17,7 @@ *********************************************************************/ /** @noRector */ -require_once __DIR__ . "/../../../libs/composer/vendor/autoload.php"; +require_once __DIR__ . "/../../../../libs/composer/vendor/autoload.php"; use ILIAS\BackgroundTasks\Implementation\TaskManager\AsyncTaskManager; use ILIAS\BackgroundTasks\Persistence; diff --git a/components/ILIAS/BackgroundTasks/js/background_task_refresh.js b/components/ILIAS/BackgroundTasks_/js/background_task_refresh.js similarity index 100% rename from components/ILIAS/BackgroundTasks/js/background_task_refresh.js rename to components/ILIAS/BackgroundTasks_/js/background_task_refresh.js diff --git a/components/ILIAS/BackgroundTasks/maintenance.json b/components/ILIAS/BackgroundTasks_/maintenance.json similarity index 86% rename from components/ILIAS/BackgroundTasks/maintenance.json rename to components/ILIAS/BackgroundTasks_/maintenance.json index ffa956be97e7..328f898c75bf 100644 --- a/components/ILIAS/BackgroundTasks/maintenance.json +++ b/components/ILIAS/BackgroundTasks_/maintenance.json @@ -8,7 +8,7 @@ ], "tester": "", "testcase_writer": "", - "path": "Services/BackgroundTasks", + "path": "components/ILIAS/BackgroundTasks_", "belong_to_component": "BackgroundTasks", "used_in_components": [ "File" diff --git a/components/ILIAS/BackgroundTasks/service.xml b/components/ILIAS/BackgroundTasks_/service.xml similarity index 100% rename from components/ILIAS/BackgroundTasks/service.xml rename to components/ILIAS/BackgroundTasks_/service.xml diff --git a/components/ILIAS/Badge/classes/class.ilBadgeAppEventListener.php b/components/ILIAS/Badge/classes/class.ilBadgeAppEventListener.php index b63a5b45ce2e..b563fb439fe5 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeAppEventListener.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeAppEventListener.php @@ -26,7 +26,7 @@ class ilBadgeAppEventListener implements ilAppEventListener public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { switch ($a_component) { - case 'Services/User': + case 'components/ILIAS/User': switch ($a_event) { case 'afterUpdate': $user_obj = $a_parameter['user_obj']; @@ -38,7 +38,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ } break; - case 'Services/Tracking': + case 'components/ILIAS/Tracking': switch ($a_event) { case 'updateStatus': if ((int) $a_parameter['status'] === ilLPStatus::LP_STATUS_COMPLETED_NUM) { diff --git a/components/ILIAS/Badge/classes/class.ilBadgeImageTemplateTableGUI.php b/components/ILIAS/Badge/classes/class.ilBadgeImageTemplateTableGUI.php index 5206a2bc8cc0..a7e7f2fbe4ae 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeImageTemplateTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeImageTemplateTableGUI.php @@ -57,7 +57,7 @@ public function __construct( $this->setSelectAllCheckbox("id"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.template_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.template_row.html", "components/ILIAS/Badge"); $this->setDefaultOrderField("title"); $this->getItems(); diff --git a/components/ILIAS/Badge/classes/class.ilBadgePersonalTableGUI.php b/components/ILIAS/Badge/classes/class.ilBadgePersonalTableGUI.php index 798e26b044c1..46782dbfaf92 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgePersonalTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgePersonalTableGUI.php @@ -72,7 +72,7 @@ public function __construct( $this->setDefaultOrderField("title"); $this->setFormAction($ilCtrl->getFormAction($this->getParentObject())); - $this->setRowTemplate("tpl.personal_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.personal_row.html", "components/ILIAS/Badge"); $this->addMultiCommand("activate", $lng->txt("badge_add_to_profile")); $this->addMultiCommand("deactivate", $lng->txt("badge_remove_from_profile")); diff --git a/components/ILIAS/Badge/classes/class.ilBadgeProfileGUI.php b/components/ILIAS/Badge/classes/class.ilBadgeProfileGUI.php index 4d44044249ea..a3a64aa69ca3 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeProfileGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeProfileGUI.php @@ -118,7 +118,7 @@ protected function listBadges(): void private function renderDeck(string $deck): string { - $template = new ilTemplate('tpl.badge_backpack.html', true, true, 'Services/Badge'); + $template = new ilTemplate('tpl.badge_backpack.html', true, true, 'components/ILIAS/Badge'); $template->setVariable('DECK', $deck); return $template->get(); } @@ -265,7 +265,7 @@ protected function listBackpackGroups(): void return; } - $tmpl = new ilTemplate("tpl.badge_backpack.html", true, true, "Services/Badge"); + $tmpl = new ilTemplate("tpl.badge_backpack.html", true, true, "components/ILIAS/Badge"); $tmpl->setVariable("BACKPACK_TITLE", $lng->txt("badge_backpack_list")); diff --git a/components/ILIAS/Badge/classes/class.ilBadgeTableGUI.php b/components/ILIAS/Badge/classes/class.ilBadgeTableGUI.php index 0357ddda5031..065b9dda6b40 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeTableGUI.php @@ -74,7 +74,7 @@ public function __construct( } $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.badge_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.badge_row.html", "components/ILIAS/Badge"); $this->setDefaultOrderField("title"); $this->setFilterCommand("applyBadgeFilter"); diff --git a/components/ILIAS/Badge/classes/class.ilBadgeTypesTableGUI.php b/components/ILIAS/Badge/classes/class.ilBadgeTypesTableGUI.php index d9e5f748cc6e..d02c839f99f7 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeTypesTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeTypesTableGUI.php @@ -58,7 +58,7 @@ public function __construct( $this->addMultiCommand("deactivateTypes", $lng->txt("deactivate")); } - $this->setRowTemplate("tpl.type_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.type_row.html", "components/ILIAS/Badge"); $this->setDefaultOrderField("name"); $this->setSelectAllCheckbox("id"); diff --git a/components/ILIAS/Badge/classes/class.ilBadgeUserTableGUI.php b/components/ILIAS/Badge/classes/class.ilBadgeUserTableGUI.php index 081ac89dc2cf..5f4fe2ac69c6 100644 --- a/components/ILIAS/Badge/classes/class.ilBadgeUserTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilBadgeUserTableGUI.php @@ -95,7 +95,7 @@ public function __construct( $this->setDefaultOrderField("name"); - $this->setRowTemplate("tpl.user_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.user_row.html", "components/ILIAS/Badge"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setFilterCommand("apply" . ucfirst($this->getParentCmd())); diff --git a/components/ILIAS/Badge/classes/class.ilObjectBadgeTableGUI.php b/components/ILIAS/Badge/classes/class.ilObjectBadgeTableGUI.php index 3ef7aab335ed..5f757c7d4e66 100644 --- a/components/ILIAS/Badge/classes/class.ilObjectBadgeTableGUI.php +++ b/components/ILIAS/Badge/classes/class.ilObjectBadgeTableGUI.php @@ -72,7 +72,7 @@ public function __construct( } $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.object_badge_row.html", "Services/Badge"); + $this->setRowTemplate("tpl.object_badge_row.html", "components/ILIAS/Badge"); $this->setDefaultOrderField("title"); $this->setFilterCommand("applyObjectFilter"); diff --git a/components/ILIAS/Badge/test/ilServicesBadgeSuite.php b/components/ILIAS/Badge/test/ilServicesBadgeSuite.php index 26714bda908e..78960e3ace62 100644 --- a/components/ILIAS/Badge/test/ilServicesBadgeSuite.php +++ b/components/ILIAS/Badge/test/ilServicesBadgeSuite.php @@ -49,7 +49,7 @@ public static function suite(): self foreach ($tests as $test) { $name = current(array_reverse(explode('\\', $test))); - require_once('./Services/Badge/test/' . $name . '.php'); + require_once('./components/ILIAS/Badge/test/' . $name . '.php'); $suite->addTestSuite($test); } diff --git a/components/ILIAS/Bibliographic/classes/class.ilBibliographicDataSet.php b/components/ILIAS/Bibliographic/classes/class.ilBibliographicDataSet.php index 57c6a1281b55..5081ac482046 100644 --- a/components/ILIAS/Bibliographic/classes/class.ilBibliographicDataSet.php +++ b/components/ILIAS/Bibliographic/classes/class.ilBibliographicDataSet.php @@ -87,7 +87,7 @@ public function importRecord( ): void { switch ($a_entity) { case 'bibl': - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['id'])) { // container content $new_obj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { diff --git a/components/ILIAS/Bibliographic/classes/class.ilBibliographicExporter.php b/components/ILIAS/Bibliographic/classes/class.ilBibliographicExporter.php index c09f112d3983..95ad1e780fb9 100644 --- a/components/ILIAS/Bibliographic/classes/class.ilBibliographicExporter.php +++ b/components/ILIAS/Bibliographic/classes/class.ilBibliographicExporter.php @@ -74,7 +74,7 @@ public function getXmlExportTailDependencies( $res = []; if ($a_entity == "bibl") { $res[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; diff --git a/components/ILIAS/Block/classes/class.ilBlockGUI.php b/components/ILIAS/Block/classes/class.ilBlockGUI.php index e0b1759f8583..f70e09588da5 100644 --- a/components/ILIAS/Block/classes/class.ilBlockGUI.php +++ b/components/ILIAS/Block/classes/class.ilBlockGUI.php @@ -122,7 +122,7 @@ public function __construct() $this->ui = $DIC->ui(); ilYuiUtil::initConnection(); - $this->main_tpl->addJavaScript("./Services/Block/js/ilblockcallback.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/Block/js/ilblockcallback.js"); $this->setLimit((int) $this->user->getPref("hits_per_page")); @@ -383,7 +383,7 @@ public function getHTML(): string } } - $this->tpl = new ilTemplate("tpl.block.html", true, true, "Services/Block"); + $this->tpl = new ilTemplate("tpl.block.html", true, true, "components/ILIAS/Block"); // $this->handleConfigStatus(); diff --git a/components/ILIAS/Block/classes/class.ilColumnGUI.php b/components/ILIAS/Block/classes/class.ilColumnGUI.php index 36a7ea2fca6d..25b6cccdb4c8 100644 --- a/components/ILIAS/Block/classes/class.ilColumnGUI.php +++ b/components/ILIAS/Block/classes/class.ilColumnGUI.php @@ -71,15 +71,15 @@ class ilColumnGUI // protected static array $locations = array( - "ilNewsForContextBlockGUI" => "Services/News/", - "ilCalendarBlockGUI" => "Services/Calendar/", - "ilPDCalendarBlockGUI" => "Services/Calendar/", - "ilPDTasksBlockGUI" => "Services/Tasks/", - "ilPDMailBlockGUI" => "Services/Mail/", - "ilSelectedItemsBlockGUI" => "Services/Dashboard/Block/", - "ilPDNewsBlockGUI" => "Services/News/", + "ilNewsForContextBlockGUI" => "components/ILIAS/News/", + "ilCalendarBlockGUI" => "components/ILIAS/Calendar/", + "ilPDCalendarBlockGUI" => "components/ILIAS/Calendar/", + "ilPDTasksBlockGUI" => "components/ILIAS/Tasks/", + "ilPDMailBlockGUI" => "components/ILIAS/Mail/", + "ilSelectedItemsBlockGUI" => "components/ILIAS/Dashboard/Block/", + "ilPDNewsBlockGUI" => "components/ILIAS/News/", 'ilPollBlockGUI' => 'components/ILIAS/Poll/', - 'ilClassificationBlockGUI' => 'Services/Classification/', + 'ilClassificationBlockGUI' => 'components/ILIAS/Classification/', "ilPDStudyProgrammeSimpleListGUI" => "components/ILIAS/StudyProgramme/", "ilPDStudyProgrammeExpandableListGUI" => "components/ILIAS/StudyProgramme/", ); @@ -396,7 +396,7 @@ public function getHTML(): string $ilCtrl->setParameter($this, "col_side", $this->getSide()); - $this->tpl = new ilTemplate("tpl.column.html", true, true, "Services/Block"); + $this->tpl = new ilTemplate("tpl.column.html", true, true, "components/ILIAS/Block"); $this->determineBlocks(); $this->showBlocks(); return $this->tpl->get(); diff --git a/components/ILIAS/Block/test/ilServicesBlockSuite.php b/components/ILIAS/Block/test/ilServicesBlockSuite.php index f27e4e1cdd2f..9e29834ceb10 100644 --- a/components/ILIAS/Block/test/ilServicesBlockSuite.php +++ b/components/ILIAS/Block/test/ilServicesBlockSuite.php @@ -31,7 +31,7 @@ public static function suite(): ilServicesBlockSuite { $suite = new self(); - require_once("./Services/Block/test/BlockSessionRepositoryTest.php"); + require_once("./components/ILIAS/Block/test/BlockSessionRepositoryTest.php"); $suite->addTestSuite("BlockSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/Blog/Export/BlogHtmlExport.php b/components/ILIAS/Blog/Export/BlogHtmlExport.php index 33e5a04b6ccc..c4927f6ae8b8 100644 --- a/components/ILIAS/Blog/Export/BlogHtmlExport.php +++ b/components/ILIAS/Blog/Export/BlogHtmlExport.php @@ -35,7 +35,7 @@ class BlogHtmlExport protected string $sub_dir; protected string $target_dir; protected \ILIAS\GlobalScreen\Services $global_screen; - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; protected \ilCOPageHTMLExport $co_page_html_export; protected \ilLanguage $lng; protected \ilTabsGUI $tabs; @@ -64,7 +64,7 @@ public function __construct( $this->target_dir = $exp_dir . "/" . $sub_dir; $this->global_screen = $DIC->globalScreen(); - $this->export_util = new \ILIAS\Services\Export\HTML\Util($exp_dir, $sub_dir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($exp_dir, $sub_dir); $this->co_page_html_export = new \ilCOPageHTMLExport($this->target_dir); $this->tabs = $DIC->tabs(); $this->lng = $DIC->language(); diff --git a/components/ILIAS/Blog/Export/class.ilBlogDataSet.php b/components/ILIAS/Blog/Export/class.ilBlogDataSet.php index bc2a87d74f4e..5fc9c42f1d3a 100644 --- a/components/ILIAS/Blog/Export/class.ilBlogDataSet.php +++ b/components/ILIAS/Blog/Export/class.ilBlogDataSet.php @@ -284,7 +284,7 @@ public function importRecord( case "blog": // container copy - if ($new_id = $a_mapping->getMapping("Services/Container", "objs", $a_rec["Id"])) { + if ($new_id = $a_mapping->getMapping("components/ILIAS/Container", "objs", $a_rec["Id"])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjBlog(); @@ -378,7 +378,7 @@ public function importRecord( $newObj->updateKeywords($keywords); } - $a_mapping->addMapping("Services/COPage", "pg", "blp:" . $a_rec["Id"], "blp:" . $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/COPage", "pg", "blp:" . $a_rec["Id"], "blp:" . $newObj->getId()); } break; } diff --git a/components/ILIAS/Blog/Export/class.ilBlogExporter.php b/components/ILIAS/Blog/Export/class.ilBlogExporter.php index 9abd442156f6..5ffafb9eb100 100644 --- a/components/ILIAS/Blog/Export/class.ilBlogExporter.php +++ b/components/ILIAS/Blog/Export/class.ilBlogExporter.php @@ -55,7 +55,7 @@ public function getXmlExportTailDependencies( } if (count($pg_ids)) { $res[] = array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids ); @@ -71,7 +71,7 @@ public function getXmlExportTailDependencies( } if (count($style_ids)) { $res[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "sty", "ids" => $style_ids ); @@ -79,7 +79,7 @@ public function getXmlExportTailDependencies( // service settings $res[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ); diff --git a/components/ILIAS/Blog/Export/class.ilBlogImporter.php b/components/ILIAS/Blog/Export/class.ilBlogImporter.php index 22cd4c8dfe3b..4d97775ac09d 100644 --- a/components/ILIAS/Blog/Export/class.ilBlogImporter.php +++ b/components/ILIAS/Blog/Export/class.ilBlogImporter.php @@ -38,7 +38,7 @@ public function init(): void ->contentStyle() ->domain(); - $cop_config = $this->getImport()->getConfig("Services/COPage"); + $cop_config = $this->getImport()->getConfig("components/ILIAS/COPage"); $cop_config->setUpdateIfExists(true); } @@ -61,14 +61,14 @@ public function importXmlRepresentation( public function finalProcessing( ilImportMapping $a_mapping ): void { - $blp_map = $a_mapping->getMappingsOfEntity("Services/COPage", "pg"); + $blp_map = $a_mapping->getMappingsOfEntity("components/ILIAS/COPage", "pg"); foreach ($blp_map as $blp_id) { $blp_id = (int) substr($blp_id, 4); $blog_id = ilBlogPosting::lookupBlogId($blp_id); ilBlogPosting::_writeParentId("blp", $blp_id, (int) $blog_id); } - $sty_map = $a_mapping->getMappingsOfEntity("Services/Style", "sty"); + $sty_map = $a_mapping->getMappingsOfEntity("components/ILIAS/Style", "sty"); foreach ($sty_map as $old_sty_id => $new_sty_id) { if (is_array(ilBlogDataSet::$style_map[$old_sty_id])) { foreach (ilBlogDataSet::$style_map[$old_sty_id] as $blog_id) { diff --git a/components/ILIAS/COPage/Editor/Server/class.UIWrapper.php b/components/ILIAS/COPage/Editor/Server/class.UIWrapper.php index 4c7811a98039..36a87ba12dfd 100644 --- a/components/ILIAS/COPage/Editor/Server/class.UIWrapper.php +++ b/components/ILIAS/COPage/Editor/Server/class.UIWrapper.php @@ -130,7 +130,7 @@ public function getRenderedButtonGroups(array $groups): string $ui = $this->ui; $r = $ui->renderer(); - $tpl = new \ilTemplate("tpl.editor_button_group.html", true, true, "Services/COPage"); + $tpl = new \ilTemplate("tpl.editor_button_group.html", true, true, "components/ILIAS/COPage"); foreach ($groups as $buttons) { foreach ($buttons as $action => $lng_key) { @@ -151,7 +151,7 @@ public function getRenderedFormFooter(array $buttons): string $ui = $this->ui; $r = $ui->renderer(); - $tpl = new \ilTemplate("tpl.form_footer.html", true, true, "Services/COPage"); + $tpl = new \ilTemplate("tpl.form_footer.html", true, true, "components/ILIAS/COPage"); $html = ""; foreach ($buttons as $b) { diff --git a/components/ILIAS/COPage/Editor/UI/Init.php b/components/ILIAS/COPage/Editor/UI/Init.php index 3df6ee5b0a43..889af1daded0 100644 --- a/components/ILIAS/COPage/Editor/UI/Init.php +++ b/components/ILIAS/COPage/Editor/UI/Init.php @@ -62,7 +62,7 @@ public function initUI( } \ilYuiUtil::initConnection(); - $main_tpl->addJavaScript("./Services/UIComponent/Explorer/js/ilExplorer.js"); + $main_tpl->addJavaScript("./components/ILIAS/UIComponent/Explorer/js/ilExplorer.js"); // ensure that form.js is loaded which is needed for file input (js that shows file names) $dummy = new \ilPropertyFormGUI(); @@ -104,7 +104,7 @@ public function getInitHtml( EOT; $module_tag = << + EOT; return $init_span . $module_tag; } diff --git a/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php b/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php index 21d3d89e3956..c2b412cb90ee 100644 --- a/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php +++ b/components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php @@ -140,7 +140,7 @@ public function listLayouts(): void ); } - $oa_tpl = new ilTemplate("tpl.stys_pglayout.html", true, true, "Services/COPage/Layout"); + $oa_tpl = new ilTemplate("tpl.stys_pglayout.html", true, true, "components/ILIAS/COPage/Layout"); $pglayout_table = new ilPageLayoutTableGUI($this, "listLayouts"); $oa_tpl->setVariable("PGLAYOUT_TABLE", $pglayout_table->getHTML()); @@ -360,7 +360,7 @@ public function exportLayout(): void "pgtp", $this->admin_request->getObjId(), "4.2.0", - "Services/COPage", + "components/ILIAS/COPage", "Title", $tmpdir ); diff --git a/components/ILIAS/COPage/Layout/classes/class.ilPageLayout.php b/components/ILIAS/COPage/Layout/classes/class.ilPageLayout.php index cc3b3af20e38..28b2bdba11a4 100644 --- a/components/ILIAS/COPage/Layout/classes/class.ilPageLayout.php +++ b/components/ILIAS/COPage/Layout/classes/class.ilPageLayout.php @@ -225,7 +225,7 @@ public function getPreview(): string private function getXSLPath(): string { - return "./Services/COPage/Layout/xml/layout2html.xsl"; + return "./components/ILIAS/COPage/Layout/xml/layout2html.xsl"; } private function generatePreview(): string @@ -346,7 +346,7 @@ public static function import( $a_filepath, $a_filename, "pgtp", - "Services/COPage" + "components/ILIAS/COPage" ); } diff --git a/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutTableGUI.php b/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutTableGUI.php index 2fcb9ce0bfbe..37d43d4e8ab6 100644 --- a/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutTableGUI.php +++ b/components/ILIAS/COPage/Layout/classes/class.ilPageLayoutTableGUI.php @@ -67,7 +67,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.stys_pglayout_table_row.html", - "Services/COPage/Layout" + "components/ILIAS/COPage/Layout" ); $this->setTitle($lng->txt("page_layouts")); } diff --git a/components/ILIAS/COPage/PC/FileList/class.ilPCFileListTableGUI.php b/components/ILIAS/COPage/PC/FileList/class.ilPCFileListTableGUI.php index 311cf11feac5..293174ca9ff3 100644 --- a/components/ILIAS/COPage/PC/FileList/class.ilPCFileListTableGUI.php +++ b/components/ILIAS/COPage/PC/FileList/class.ilPCFileListTableGUI.php @@ -52,7 +52,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.file_list_row.html", - "Services/COPage" + "components/ILIAS/COPage" ); $this->file_list = $a_file_list; diff --git a/components/ILIAS/COPage/PC/Grid/class.ilPCGridCellTableGUI.php b/components/ILIAS/COPage/PC/Grid/class.ilPCGridCellTableGUI.php index 6178218edd95..c477313a1379 100644 --- a/components/ILIAS/COPage/PC/Grid/class.ilPCGridCellTableGUI.php +++ b/components/ILIAS/COPage/PC/Grid/class.ilPCGridCellTableGUI.php @@ -50,7 +50,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.grid_cell_row.html", - "Services/COPage" + "components/ILIAS/COPage" ); $this->grid = $a_grid; diff --git a/components/ILIAS/COPage/PC/InteractiveImage/IIMEditorInit.php b/components/ILIAS/COPage/PC/InteractiveImage/IIMEditorInit.php index 7b2c92e8f254..f56bffc5fb04 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/IIMEditorInit.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/IIMEditorInit.php @@ -80,7 +80,7 @@ public function getInitHtml(): string EOT; $module_tag = << + EOT; return $init_span . $module_tag; } diff --git a/components/ILIAS/COPage/PC/InteractiveImage/InteractiveImageQueryActionHandler.php b/components/ILIAS/COPage/PC/InteractiveImage/InteractiveImageQueryActionHandler.php index 32108aca873e..cc913b36800c 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/InteractiveImageQueryActionHandler.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/InteractiveImageQueryActionHandler.php @@ -138,7 +138,7 @@ protected function getLore(): string public function getMainHead(): string { $lng = $this->lng; - $tpl = new \ilTemplate("tpl.main_head.html", true, true, "Services/COPage/PC/InteractiveImage"); + $tpl = new \ilTemplate("tpl.main_head.html", true, true, "components/ILIAS/COPage/PC/InteractiveImage"); $tpl->setVariable("TITLE", $lng->txt("cont_iim_edit")); $tpl->setVariable("HEAD_TRIGGER", $lng->txt("cont_iim_trigger")); $tpl->setVariable( @@ -189,7 +189,7 @@ public function getMainSlate(): string { $lng = $this->lng; - $tpl = new \ilTemplate("tpl.main_slate.html", true, true, "Services/COPage/PC/InteractiveImage"); + $tpl = new \ilTemplate("tpl.main_slate.html", true, true, "components/ILIAS/COPage/PC/InteractiveImage"); $tpl->setVariable("HEAD_SETTINGS", $lng->txt("settings")); $tpl->setVariable("HEAD_OVERVIEW", $lng->txt("cont_iim_overview")); diff --git a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMOverlaysTableGUI.php b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMOverlaysTableGUI.php index 5f8e1e1e7a8d..69fa0b8ed468 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMOverlaysTableGUI.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMOverlaysTableGUI.php @@ -51,7 +51,7 @@ public function __construct( $this->addColumn($this->lng->txt("filename")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.iim_overlays_row.html", "Services/COPage"); + $this->setRowTemplate("tpl.iim_overlays_row.html", "components/ILIAS/COPage"); $this->addMultiCommand("confirmDeleteOverlays", $lng->txt("delete")); } diff --git a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMPopupTableGUI.php b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMPopupTableGUI.php index bf3b7971513c..8b14953fbf25 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMPopupTableGUI.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMPopupTableGUI.php @@ -44,7 +44,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.iim_popup_content_row.html", - "Services/COPage" + "components/ILIAS/COPage" ); $this->content_obj = $a_content_obj; diff --git a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php index 45e66d51ad57..6120daeb26ab 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php @@ -34,8 +34,8 @@ public function __construct( iljQueryUtil::initjQueryUI(); parent::__construct($a_content_obj, $a_page, $request); - $this->main_tpl->addJavaScript("./Services/COPage/js/ilCOPagePres.js"); - $this->main_tpl->addJavaScript("./Services/COPage/js/ilCOPagePCInteractiveImage.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePCInteractiveImage.js"); ilAccordionGUI::addJavaScript(); ilAccordionGUI::addCss(); diff --git a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerTableGUI.php b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerTableGUI.php index 29f98a021cb4..c5ad72d27aee 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerTableGUI.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerTableGUI.php @@ -68,7 +68,7 @@ public function __construct( $this->pop_options[$p["nr"]] = $p["title"]; } parent::__construct($a_parent_obj, $a_parent_cmd, $a_pc_media_object->getMediaObject()); - $this->setRowTemplate("tpl.iim_trigger_row.html", "Services/COPage"); + $this->setRowTemplate("tpl.iim_trigger_row.html", "components/ILIAS/COPage"); } public function initColumns(): void diff --git a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCInteractiveImage.php b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCInteractiveImage.php index 2b786e678d82..146812026890 100644 --- a/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCInteractiveImage.php +++ b/components/ILIAS/COPage/PC/InteractiveImage/class.ilPCInteractiveImage.php @@ -774,7 +774,7 @@ public function modifyPageContentPostXsl( } } return $a_output . -''; +''; } public function getPopupDummy(): string @@ -802,7 +802,7 @@ public function getBackgroundImage(): string $xml .= $mob->getXML(IL_MODE_ALIAS); $xml .= $mob->getXML(IL_MODE_OUTPUT); $xml .= ""; - $xsl = file_get_contents("./Services/COPage/xsl/page.xsl"); + $xsl = file_get_contents("./components/ILIAS/COPage/xsl/page.xsl"); //echo htmlentities($xml); exit; $args = array( '/_xml' => $xml, '/_xsl' => $xsl ); $xh = xslt_create(); diff --git a/components/ILIAS/COPage/PC/Question/class.ilPCQuestion.php b/components/ILIAS/COPage/PC/Question/class.ilPCQuestion.php index d355a80e113a..c5e5c51e9e21 100644 --- a/components/ILIAS/COPage/PC/Question/class.ilPCQuestion.php +++ b/components/ILIAS/COPage/PC/Question/class.ilPCQuestion.php @@ -284,7 +284,7 @@ public function getJavascriptFiles(string $a_mode): array if (!$this->getPage()->getPageConfig()->getEnableSelfAssessmentScorm() && $a_mode != ilPageObjectGUI::PREVIEW && $a_mode != "offline") { - $js_files[] = "./Services/COPage/js/ilCOPageQuestionHandler.js"; + $js_files[] = "./components/ILIAS/COPage/js/ilCOPageQuestionHandler.js"; } return $js_files; diff --git a/components/ILIAS/COPage/PC/Resources/class.ilPCResourcesGUI.php b/components/ILIAS/COPage/PC/Resources/class.ilPCResourcesGUI.php index 6ea3db34bf0c..8129bc159809 100644 --- a/components/ILIAS/COPage/PC/Resources/class.ilPCResourcesGUI.php +++ b/components/ILIAS/COPage/PC/Resources/class.ilPCResourcesGUI.php @@ -381,7 +381,7 @@ public static function insertResourcesIntoPageContent( foreach ($block_sequence->getBlocks() as $block) { // render block - $tpl = new ilTemplate("tpl.resource_block.html", true, true, "Services/COPage"); + $tpl = new ilTemplate("tpl.resource_block.html", true, true, "components/ILIAS/COPage"); $cnt = 0; $max = 5; if (!($block->getBlock() instanceof \ILIAS\Container\Content\ObjectivesBlock) && diff --git a/components/ILIAS/COPage/PC/Table/class.ilPCDataTableEditorGUI.php b/components/ILIAS/COPage/PC/Table/class.ilPCDataTableEditorGUI.php index 579627a2751f..8a4b4f895940 100644 --- a/components/ILIAS/COPage/PC/Table/class.ilPCDataTableEditorGUI.php +++ b/components/ILIAS/COPage/PC/Table/class.ilPCDataTableEditorGUI.php @@ -149,7 +149,7 @@ protected function getTopActions(UIWrapper $ui_wrapper, ilPageObjectGUI $page_gu $lng = $this->lng; $lng->loadLanguageModule("content"); - $tpl = new \ilTemplate("tpl.table_top_actions.html", true, true, "Services/COPage/Editor"); + $tpl = new \ilTemplate("tpl.table_top_actions.html", true, true, "components/ILIAS/COPage/Editor"); $quit_button = $ui_wrapper->getRenderedButton( $lng->txt("cont_finish_table_editing"), diff --git a/components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php b/components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php index 11440daa9f06..dca03688329c 100644 --- a/components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php +++ b/components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php @@ -698,7 +698,7 @@ public function editCellWidth(): void $ilTabs->setSubTabActive("cont_width"); $ilTabs->setTabActive("cont_table_cell_properties"); - $ctpl = new ilTemplate("tpl.table_cell_properties.html", true, true, "Services/COPage"); + $ctpl = new ilTemplate("tpl.table_cell_properties.html", true, true, "components/ILIAS/COPage"); $ctpl->setVariable("BTN_NAME", "setWidths"); $ctpl->setVariable("BTN_TEXT", $lng->txt("cont_save_widths")); $ctpl->setVariable("FORMACTION", $ilCtrl->getFormAction($this)); @@ -721,7 +721,7 @@ public function editCellSpan(): void $ilTabs->setSubTabActive("cont_span"); $ilTabs->setTabActive("cont_table_cell_properties"); - $ctpl = new ilTemplate("tpl.table_cell_properties.html", true, true, "Services/COPage"); + $ctpl = new ilTemplate("tpl.table_cell_properties.html", true, true, "components/ILIAS/COPage"); $ctpl->setVariable("BTN_NAME", "setSpans"); $ctpl->setVariable("BTN_TEXT", $lng->txt("cont_save_spans")); $ctpl->setVariable("FORMACTION", $ilCtrl->getFormAction($this)); @@ -1033,7 +1033,7 @@ public function editData(): void $this->displayValidationError(); $this->initEditor(); - $this->tpl->addJavaScript("./Services/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); + $this->tpl->addJavaScript("./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); $this->tpl->setContent($this->getEditDataTable(true)); } @@ -1044,7 +1044,7 @@ public function getEditDataTable(bool $initial = false): string /** @var ilPCTable $pc_tab */ $pc_tab = $this->content_obj; - $dtpl = new ilTemplate("tpl.tabledata2.html", true, true, "Services/COPage"); + $dtpl = new ilTemplate("tpl.tabledata2.html", true, true, "components/ILIAS/COPage"); $dtpl->setVariable("FORMACTION", $this->ctrl->getFormAction($this, "tableAction")); $dtpl->setVariable("HIERID", $this->hier_id); $dtpl->setVariable("PCID", $this->pc_id); diff --git a/components/ILIAS/COPage/PC/Tabs/class.ilPCTabsTableGUI.php b/components/ILIAS/COPage/PC/Tabs/class.ilPCTabsTableGUI.php index 49923ec0b19a..c6aca5571cf5 100644 --- a/components/ILIAS/COPage/PC/Tabs/class.ilPCTabsTableGUI.php +++ b/components/ILIAS/COPage/PC/Tabs/class.ilPCTabsTableGUI.php @@ -47,7 +47,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.tabs_row.html", - "Services/COPage" + "components/ILIAS/COPage" ); $this->tabs = $a_tabs; diff --git a/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php b/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php index 8d1821de5bd9..12951d41aa1b 100644 --- a/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php +++ b/components/ILIAS/COPage/Page/class.PageQueryActionHandler.php @@ -128,7 +128,7 @@ protected function getConfig(): \stdClass $config->content_css = \ilObjStyleSheet::getContentStylePath($this->page_gui->getStyleId()) . ", " . \ilUtil::getStyleSheetLocation() . ", " . - "./Services/COPage/css/tiny_extra.css"; + "./components/ILIAS/COPage/css/tiny_extra.css"; $config->text_formats = \ilPCParagraphGUI::_getTextCharacteristics($this->page_gui->getStyleId()); $config->text_block_formats = []; foreach (["text_block", "heading1", "heading2", "heading3"] as $type) { @@ -178,7 +178,7 @@ protected function getPageEditHelp(): string { $lng = $this->lng; $lng->loadLanguageModule("content"); - $tpl = new \ilTemplate("tpl.page_edit_help.html", true, true, "Services/COPage/Editor"); + $tpl = new \ilTemplate("tpl.page_edit_help.html", true, true, "components/ILIAS/COPage/Editor"); $tpl->setCurrentBlock("help"); $tpl->setVariable("TXT_ADD_EL", $lng->txt("cont_add_elements")); $tpl->setVariable("PLUS", $this->gui->symbol()->glyph("add")->render()); @@ -198,7 +198,7 @@ protected function getMultiEditHelp(): string { $lng = $this->lng; $lng->loadLanguageModule("content"); - $tpl = new \ilTemplate("tpl.page_edit_help.html", true, true, "Services/COPage/Editor"); + $tpl = new \ilTemplate("tpl.page_edit_help.html", true, true, "components/ILIAS/COPage/Editor"); $tpl->setCurrentBlock("multi-help"); $tpl->setVariable("TXT_SEL", $lng->txt("cont_click_multi_select")); $tpl->parseCurrentBlock(); @@ -212,7 +212,7 @@ protected function getTopActions(): string $ctrl = $this->ctrl; $lng = $this->lng; $lng->loadLanguageModule("content"); - $tpl = new \ilTemplate("tpl.top_actions.html", true, true, "Services/COPage/Editor"); + $tpl = new \ilTemplate("tpl.top_actions.html", true, true, "components/ILIAS/COPage/Editor"); $dd = $this->getActionsDropDown(); $tpl->setVariable("DROPDOWN", $ui->renderer()->renderAsync($dd)); @@ -488,7 +488,7 @@ protected function getFormatSelection(): string { $lng = $this->lng; $ui = $this->ui; - $tpl = new \ilTemplate("tpl.format_selection.html", true, true, "Services/COPage/Editor"); + $tpl = new \ilTemplate("tpl.format_selection.html", true, true, "components/ILIAS/COPage/Editor"); $tpl->setVariable("TXT_PAR", $lng->txt("cont_choose_characteristic_text")); $tpl->setVariable("TXT_SECTION", $lng->txt("cont_choose_characteristic_section")); $tpl->setVariable("TXT_MEDIA", $lng->txt("cont_media")); diff --git a/components/ILIAS/COPage/ROADMAP.md b/components/ILIAS/COPage/ROADMAP.md index e921aea539ad..129babcbe636 100644 --- a/components/ILIAS/COPage/ROADMAP.md +++ b/components/ILIAS/COPage/ROADMAP.md @@ -105,7 +105,7 @@ Note this is an older entry. Should be done with integration of the question ser - ./Modules/Scorm2004/scripts/questions/question_handling.js - Modules/TestQuestionPool/js/ilAssMultipleChoice.js - Modules/TestQuestionPool/js/ilMatchingQuestion.js - - (./Services/COPage/js/ilCOPageQuestionHandler.js) + - (./components/ILIAS/COPage/js/ilCOPageQuestionHandler.js) - ilPCQuestion::getJSTextInitCode loads - ilias.question.txt... strings - ilPCQuestion::getQuestionJsOfPage diff --git a/components/ILIAS/COPage/Resources/ResourcesCollector.php b/components/ILIAS/COPage/Resources/ResourcesCollector.php index 380104e78601..e31540653620 100644 --- a/components/ILIAS/COPage/Resources/ResourcesCollector.php +++ b/components/ILIAS/COPage/Resources/ResourcesCollector.php @@ -64,10 +64,10 @@ protected function init(\ilPageObject $pg): void if ($this->output_mode == \ilPageObjectGUI::OFFLINE) { $this->js_files[] = \iljQueryUtil::getLocaljQueryPath(); $this->js_files[] = \iljQueryUtil::getLocaljQueryUIPath(); - $this->js_files[] = './Services/JavaScript/js/Basic.js'; + $this->js_files[] = './components/ILIAS/JavaScript/js/Basic.js'; } - $this->js_files[] = "./Services/COPage/js/ilCOPagePres.js"; + $this->js_files[] = "./components/ILIAS/COPage/js/ilCOPagePres.js"; // for all page components... $defs = $this->pc_definition->getPCDefinitions(); diff --git a/components/ILIAS/COPage/classes/Setup/class.ilCOPageDBUpdateSteps.php b/components/ILIAS/COPage/classes/Setup/class.ilCOPageDBUpdateSteps.php index 985e740a39b4..82113464c1cf 100644 --- a/components/ILIAS/COPage/classes/Setup/class.ilCOPageDBUpdateSteps.php +++ b/components/ILIAS/COPage/classes/Setup/class.ilCOPageDBUpdateSteps.php @@ -275,4 +275,15 @@ public function step_13(): void $this->db->manipulate($query); } } + + public function step_14(): void + { + if ($this->db->tableExists("copg_pc_def")) { + $query = "UPDATE copg_pc_def SET " . PHP_EOL + . " component = REPLACE(component, 'Services', 'components/ILIAS') " . PHP_EOL + . " WHERE component LIKE ('Services/%')"; + + $this->db->manipulate($query); + } + } } diff --git a/components/ILIAS/COPage/classes/class.ilCOPageDataSet.php b/components/ILIAS/COPage/classes/class.ilCOPageDataSet.php index 02f76562b0e3..59b669594fc9 100644 --- a/components/ILIAS/COPage/classes/class.ilCOPageDataSet.php +++ b/components/ILIAS/COPage/classes/class.ilCOPageDataSet.php @@ -113,13 +113,13 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI $this->current_obj = $pt; $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pgtp", $a_rec["Id"], $pt->getId() ); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "stys:" . $a_rec["Id"], "stys:" . $pt->getId() diff --git a/components/ILIAS/COPage/classes/class.ilCOPageExporter.php b/components/ILIAS/COPage/classes/class.ilCOPageExporter.php index 3994d16b3e30..6701cbee8908 100644 --- a/components/ILIAS/COPage/classes/class.ilCOPageExporter.php +++ b/components/ILIAS/COPage/classes/class.ilCOPageExporter.php @@ -54,7 +54,7 @@ public function init(): void $this->ds = new ilCOPageDataSet(); $this->ds->setExportDirectories($this->dir_relative, $this->dir_absolute); $this->ds->setDSPrefix("ds"); - $this->config = $this->getExport()->getConfig("Services/COPage"); + $this->config = $this->getExport()->getConfig("components/ILIAS/COPage"); if ($this->config->getMasterLanguageOnly()) { $this->ds->setMasterLanguageOnly(true); } @@ -112,7 +112,7 @@ public function getXmlExportHeadDependencies( return array( array( - "component" => "Services/MediaObjects", + "component" => "components/ILIAS/MediaObjects", "entity" => "mob", "ids" => $mob_ids), array( @@ -138,7 +138,7 @@ public function getXmlExportTailDependencies( return array( array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids) ); diff --git a/components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php b/components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php index 84cde6acafff..f6bf8ffdffda 100644 --- a/components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php +++ b/components/ILIAS/COPage/classes/class.ilCOPageHTMLExport.php @@ -76,7 +76,7 @@ public function __construct( $this->content_style_dir = $a_exp_dir . "/content_style"; $this->content_style_img_dir = $a_exp_dir . "/content_style/images"; - $this->services_dir = $a_exp_dir . "/Services"; + $this->services_dir = $a_exp_dir . "/components/ILIAS"; $this->media_service_dir = $this->services_dir . "/MediaObjects"; $this->flv_dir = $a_exp_dir . "/" . ilPlayerUtil::getFlashVideoPlayerDirectory(); $this->mp3_dir = $this->media_service_dir . "/flash_mp3_player"; @@ -131,8 +131,8 @@ public function exportStyles(): void ilObjStyleSheet::getBasicImageDir(), $this->exp_dir . "/" . ilObjStyleSheet::getBasicImageDir() ); - ilFileUtils::makeDirParents($this->exp_dir . "/Services/COPage/css"); - copy("Services/COPage/css/content.css", $this->exp_dir . "/Services/COPage/css/content.css"); + ilFileUtils::makeDirParents($this->exp_dir . "/components/ILIAS/COPage/css"); + copy("components/ILIAS/COPage/css/content.css", $this->exp_dir . "/components/ILIAS/COPage/css/content.css"); } else { $style = new ilObjStyleSheet($this->getContentStyleId()); $style->copyImagesToDir($this->exp_dir . "/" . $style->getImagesDirectory()); @@ -458,7 +458,7 @@ protected function initResourceTemplate( string $template_file ): ilGlobalTemplateInterface { $this->global_screen->layout()->meta()->reset(); - $tpl = new ilGlobalTemplate($template_file, true, true, "Services/COPage"); + $tpl = new ilGlobalTemplate($template_file, true, true, "components/ILIAS/COPage"); $this->getPreparedMainTemplate($tpl); $tpl->addCss(\ilUtil::getStyleSheetLocation()); $tpl->addCss(ilObjStyleSheet::getContentStylePath($this->getContentStyleId())); diff --git a/components/ILIAS/COPage/classes/class.ilCOPageImporter.php b/components/ILIAS/COPage/classes/class.ilCOPageImporter.php index e96428ea6bb5..61a7a2e0185b 100644 --- a/components/ILIAS/COPage/classes/class.ilCOPageImporter.php +++ b/components/ILIAS/COPage/classes/class.ilCOPageImporter.php @@ -36,7 +36,7 @@ public function init(): void $this->ds = new ilCOPageDataSet(); $this->ds->setDSPrefix("ds"); - $this->config = $this->getImport()->getConfig("Services/COPage"); + $this->config = $this->getImport()->getConfig("components/ILIAS/COPage"); $this->log = ilLoggerFactory::getLogger('copg'); @@ -71,7 +71,7 @@ public function importXmlRepresentation( } if ($a_entity == "pg") { - $pg_id = $a_mapping->getMapping("Services/COPage", "pg", $a_id); + $pg_id = $a_mapping->getMapping("components/ILIAS/COPage", "pg", $a_id); $this->log->debug("mapping id: " . $pg_id); @@ -126,7 +126,7 @@ public function importXmlRepresentation( if ($lstr == "") { $lstr = "-"; } - $a_mapping->addMapping("Services/COPage", "pgl", $a_id . ":" . $lstr, $pg_id . ":" . $lstr); + $a_mapping->addMapping("components/ILIAS/COPage", "pgl", $a_id . ":" . $lstr, $pg_id . ":" . $lstr); } } } @@ -138,11 +138,11 @@ public function finalProcessing( ilImportMapping $a_mapping ): void { $this->log->debug("start"); - $pages = $a_mapping->getMappingsOfEntity("Services/COPage", "pgl"); - $media_objects = $a_mapping->getMappingsOfEntity("Services/MediaObjects", "mob"); + $pages = $a_mapping->getMappingsOfEntity("components/ILIAS/COPage", "pgl"); + $media_objects = $a_mapping->getMappingsOfEntity("components/ILIAS/MediaObjects", "mob"); $file_objects = $a_mapping->getMappingsOfEntity("components/ILIAS/File", "file"); - $ref_mapping = $a_mapping->getMappingsOfEntity('Services/Container', 'refs'); + $ref_mapping = $a_mapping->getMappingsOfEntity('components/ILIAS/Container', 'refs'); //if (count($media_objects) > 0 || count($file_objects) > 0) //{ diff --git a/components/ILIAS/COPage/classes/class.ilCopySelfAssQuestionTableGUI.php b/components/ILIAS/COPage/classes/class.ilCopySelfAssQuestionTableGUI.php index 82f7ad08aea1..657601b17e79 100644 --- a/components/ILIAS/COPage/classes/class.ilCopySelfAssQuestionTableGUI.php +++ b/components/ILIAS/COPage/classes/class.ilCopySelfAssQuestionTableGUI.php @@ -55,7 +55,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions"), '', ''); - $this->setRowTemplate("tpl.copy_sa_quest_row.html", "Services/COPage"); + $this->setRowTemplate("tpl.copy_sa_quest_row.html", "components/ILIAS/COPage"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); $this->setDefaultOrderField("title"); diff --git a/components/ILIAS/COPage/classes/class.ilPageComponentPluginImporter.php b/components/ILIAS/COPage/classes/class.ilPageComponentPluginImporter.php index e9f91b3e14e6..8c188dc9c73b 100644 --- a/components/ILIAS/COPage/classes/class.ilPageComponentPluginImporter.php +++ b/components/ILIAS/COPage/classes/class.ilPageComponentPluginImporter.php @@ -90,7 +90,7 @@ public static function getPCMapping(string $a_id, ilImportMapping $a_mapping): s { $parts = explode(':', $a_id); $old_page_id = $parts[0] . ':' . $parts[1]; - $new_page_id = $a_mapping->getMapping("Services/COPage", 'pg', $old_page_id); + $new_page_id = $a_mapping->getMapping("components/ILIAS/COPage", 'pg', $old_page_id); return $new_page_id . ':' . $parts[2] . ':' . $parts[3]; } diff --git a/components/ILIAS/COPage/classes/class.ilPageEditorGUI.php b/components/ILIAS/COPage/classes/class.ilPageEditorGUI.php index d0dc42e9880a..36ea10291ed7 100644 --- a/components/ILIAS/COPage/classes/class.ilPageEditorGUI.php +++ b/components/ILIAS/COPage/classes/class.ilPageEditorGUI.php @@ -827,7 +827,7 @@ public function showSnippetInfo(): void $ilAccess = $this->access; $ilCtrl = $this->ctrl; - $stpl = new ilTemplate("tpl.snippet_info.html", true, true, "Services/COPage"); + $stpl = new ilTemplate("tpl.snippet_info.html", true, true, "components/ILIAS/COPage"); $mep_pools = ilMediaPoolItem::getPoolForItemId( $this->request->getString("ci_id") diff --git a/components/ILIAS/COPage/classes/class.ilPageHistoryTableGUI.php b/components/ILIAS/COPage/classes/class.ilPageHistoryTableGUI.php index dc0e0017e466..3a2eda8cc222 100644 --- a/components/ILIAS/COPage/classes/class.ilPageHistoryTableGUI.php +++ b/components/ILIAS/COPage/classes/class.ilPageHistoryTableGUI.php @@ -49,7 +49,7 @@ public function __construct( $this->addColumn($lng->txt("user"), "", "33%"); $this->addColumn($lng->txt("action"), "", "33%"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.page_history_row.html", "Services/COPage"); + $this->setRowTemplate("tpl.page_history_row.html", "components/ILIAS/COPage"); $this->setDefaultOrderField("sortkey"); $this->setDefaultOrderDirection("desc"); $this->addMultiCommand("compareVersion", $lng->txt("cont_page_compare")); diff --git a/components/ILIAS/COPage/classes/class.ilPageMultiLangGUI.php b/components/ILIAS/COPage/classes/class.ilPageMultiLangGUI.php index d92ab9e445d7..a00af2480bc9 100644 --- a/components/ILIAS/COPage/classes/class.ilPageMultiLangGUI.php +++ b/components/ILIAS/COPage/classes/class.ilPageMultiLangGUI.php @@ -84,7 +84,7 @@ public function getMultiLangInfo( $lng->loadLanguageModule("meta"); - $tpl = new ilTemplate("tpl.page_multi_lang_info.html", true, true, "Services/COPage"); + $tpl = new ilTemplate("tpl.page_multi_lang_info.html", true, true, "components/ILIAS/COPage"); $tpl->setVariable("TXT_MASTER_LANG", $lng->txt("obj_master_lang")); $tpl->setVariable("VAL_ML", $lng->txt("meta_l_" . $this->ot->getMasterLanguage())); $cl = ($a_page_lang == "-") diff --git a/components/ILIAS/COPage/classes/class.ilPageMultiLangTableGUI.php b/components/ILIAS/COPage/classes/class.ilPageMultiLangTableGUI.php index e21e5403ef8b..ecbc3a3d689e 100644 --- a/components/ILIAS/COPage/classes/class.ilPageMultiLangTableGUI.php +++ b/components/ILIAS/COPage/classes/class.ilPageMultiLangTableGUI.php @@ -44,7 +44,7 @@ public function __construct( $this->addColumn($this->lng->txt("cont_language")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.page_ml_row.html", "Services/COPage"); + $this->setRowTemplate("tpl.page_ml_row.html", "components/ILIAS/COPage"); //if (count($this->getData()) > 1) //{ diff --git a/components/ILIAS/COPage/classes/class.ilPageObjectGUI.php b/components/ILIAS/COPage/classes/class.ilPageObjectGUI.php index e1c87df19235..c35857e70596 100644 --- a/components/ILIAS/COPage/classes/class.ilPageObjectGUI.php +++ b/components/ILIAS/COPage/classes/class.ilPageObjectGUI.php @@ -1076,7 +1076,7 @@ public function showPage(): string // $this->initSelfAssessmentRendering(); ilObjMediaObjectGUI::includePresentationJS($main_tpl); - $main_tpl->addJavaScript("./Services/COPage/js/ilCOPagePres.js"); + $main_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js"); // needed for overlays in iim ilOverlayGUI::initJavascript(); @@ -1094,7 +1094,7 @@ public function showPage(): string $this->log->debug("ilPageObjectGUI, showPage() in edit mode."); - $tpl = new ilTemplate("tpl.page_edit_wysiwyg.html", true, true, "Services/COPage"); + $tpl = new ilTemplate("tpl.page_edit_wysiwyg.html", true, true, "components/ILIAS/COPage"); // to do: status dependent class $tpl->setVariable("CLASS_PAGE_TD", "ilc_Page"); @@ -1141,7 +1141,7 @@ public function showPage(): string } else { // presentation or preview here - $tpl = new ilTemplate("tpl.page.html", true, true, "Services/COPage"); + $tpl = new ilTemplate("tpl.page.html", true, true, "components/ILIAS/COPage"); if ($this->getEnabledPageFocus()) { $tpl->touchBlock("page_focus"); } @@ -1943,7 +1943,7 @@ public static function getTinyMenu( $menu["cont_more_functions"][] = ["text" => $lng->txt("cont_anchor"), "action" => "selection.anchor", "data" => []]; } - $btpl = new ilTemplate("tpl.tiny_menu.html", true, true, "Services/COPage"); + $btpl = new ilTemplate("tpl.tiny_menu.html", true, true, "components/ILIAS/COPage"); foreach ($menu as $section_title => $section) { foreach ($section as $item) { @@ -2204,7 +2204,7 @@ public function insertPageToc(string $a_output): string "tpl.page_toc.html", true, true, - "Services/COPage" + "components/ILIAS/COPage" ); $tpl->setVariable("PAGE_TOC", $listing->autoNumbers(true)->render()); $tpl->setVariable("TXT_PAGE_TOC", $this->lng->txt("cont_page_toc")); @@ -2359,7 +2359,7 @@ protected function initEditing(): void $this->lng->toJS("cont_ed_delete_item"); // workaroun: we need this js for the new editor version, e.g. for new section form to work // @todo: solve this in a smarter way - $this->tpl->addJavaScript("./Services/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); + $this->tpl->addJavaScript("./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); \ilCalendarUtil::initDateTimePicker(); ilModalGUI::initJS(); } @@ -2442,7 +2442,7 @@ public function getHTML(): string */ public function showMediaFullscreen(int $a_style_id = 0): void { - $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "Services/COPage"); + $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "components/ILIAS/COPage"); $this->tpl->setCurrentBlock("ContentStyle"); $this->tpl->setVariable("LOCATION_CONTENT_STYLESHEET", 0); $this->tpl->parseCurrentBlock(); @@ -2521,7 +2521,7 @@ public function history(): string $this->setBackToEditTabs(); - $this->tpl->addJavaScript("./Services/COPage/js/page_history.js"); + $this->tpl->addJavaScript("./components/ILIAS/COPage/js/page_history.js"); $table_gui = new ilPageHistoryTableGUI($this, "history"); $table_gui->setId("hist_table"); @@ -2678,7 +2678,7 @@ public function compareVersion(): string return ""; } - $tpl = new ilTemplate("tpl.page_compare.html", true, true, "Services/COPage"); + $tpl = new ilTemplate("tpl.page_compare.html", true, true, "components/ILIAS/COPage"); $pg = $this->obj; $l_page = ilPageObjectFactory::getInstance($pg->getParentType(), $pg->getId(), $this->request->getInt("left")); @@ -2741,7 +2741,7 @@ public function editActivation(): void { $this->setBackToEditTabs(); - $atpl = new ilTemplate("tpl.page_activation.php", true, true, "Services/COPage"); + $atpl = new ilTemplate("tpl.page_activation.php", true, true, "components/ILIAS/COPage"); $this->initActivationForm(); $this->getActivationFormValues(); $atpl->setVariable("FORM", $this->form->getHTML()); diff --git a/components/ILIAS/COPage/classes/class.ilQuestionExporter.php b/components/ILIAS/COPage/classes/class.ilQuestionExporter.php index ab7ab2ca97b5..e7d2924cabbf 100644 --- a/components/ILIAS/COPage/classes/class.ilQuestionExporter.php +++ b/components/ILIAS/COPage/classes/class.ilQuestionExporter.php @@ -67,7 +67,7 @@ public function __construct($a_preview_mode = false) $this->preview_mode = $a_preview_mode; - $this->tpl = new ilTemplate("tpl.question_export.html", true, true, "Services/COPage"); + $this->tpl = new ilTemplate("tpl.question_export.html", true, true, "components/ILIAS/COPage"); // fix for bug 5386, alex 29.10.2009 if (!$a_preview_mode) { diff --git a/components/ILIAS/COPage/test/PCInteractiveImageTest.php b/components/ILIAS/COPage/test/PCInteractiveImageTest.php index ab311dd927ec..0c2079ae3624 100644 --- a/components/ILIAS/COPage/test/PCInteractiveImageTest.php +++ b/components/ILIAS/COPage/test/PCInteractiveImageTest.php @@ -18,7 +18,7 @@ use PHPUnit\Framework\TestCase; -require_once("./Services/MediaObjects/ImageMap/class.ilMapArea.php"); +require_once("./components/ILIAS/MediaObjects/ImageMap/class.ilMapArea.php"); /** * @author Alexander Killing diff --git a/components/ILIAS/COPage/test/PCMediaObjectTest.php b/components/ILIAS/COPage/test/PCMediaObjectTest.php index d60c0b984a5b..e2e305fd331f 100644 --- a/components/ILIAS/COPage/test/PCMediaObjectTest.php +++ b/components/ILIAS/COPage/test/PCMediaObjectTest.php @@ -18,7 +18,7 @@ use PHPUnit\Framework\TestCase; -require_once("./Services/MediaObjects/ImageMap/class.ilMapArea.php"); +require_once("./components/ILIAS/MediaObjects/ImageMap/class.ilMapArea.php"); /** * @author Alexander Killing diff --git a/components/ILIAS/COPage/test/class.ilUnitTestPCDefinition.php b/components/ILIAS/COPage/test/class.ilUnitTestPCDefinition.php index 3c85b0c1b2d9..c70b22654325 100644 --- a/components/ILIAS/COPage/test/class.ilUnitTestPCDefinition.php +++ b/components/ILIAS/COPage/test/class.ilUnitTestPCDefinition.php @@ -31,7 +31,7 @@ public function getRecords(): array "int_links" => 1, "style_classes" => 1, "xsl" => 0, - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "def_enabled" => 1, "top_item" => 1, "order_nr" => 10 diff --git a/components/ILIAS/COPage/test/ilServicesCOPageSuite.php b/components/ILIAS/COPage/test/ilServicesCOPageSuite.php index 213a24757fad..26e486f4eb9f 100644 --- a/components/ILIAS/COPage/test/ilServicesCOPageSuite.php +++ b/components/ILIAS/COPage/test/ilServicesCOPageSuite.php @@ -31,115 +31,115 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/COPage/test/COPageTestBase.php"); + require_once("./components/ILIAS/COPage/test/COPageTestBase.php"); - require_once("./Services/COPage/test/EditorEditSessionRepositoryTest.php"); + require_once("./components/ILIAS/COPage/test/EditorEditSessionRepositoryTest.php"); $suite->addTestSuite("EditorEditSessionRepositoryTest"); - require_once("./Services/COPage/test/PCMapEditorSessionRepositoryTest.php"); + require_once("./components/ILIAS/COPage/test/PCMapEditorSessionRepositoryTest.php"); $suite->addTestSuite("PCMapEditorSessionRepositoryTest"); - require_once("./Services/COPage/test/PCParagraphTest.php"); + require_once("./components/ILIAS/COPage/test/PCParagraphTest.php"); $suite->addTestSuite("PCParagraphTest"); - require_once("./Services/COPage/test/PCSectionTest.php"); + require_once("./components/ILIAS/COPage/test/PCSectionTest.php"); $suite->addTestSuite("PCSectionTest"); - require_once("./Services/COPage/test/class.ilUnitTestPageConfig.php"); - require_once("./Services/COPage/test/PageObjectTest.php"); - require_once("./Services/COPage/test/class.ilUnitTestPageObject.php"); - require_once("./Services/COPage/test/class.ilUnitTestPageManager.php"); - require_once("./Services/COPage/test/class.ilUnitTestPCDefinition.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"); + require_once("./components/ILIAS/COPage/test/class.ilUnitTestPageManager.php"); + require_once("./components/ILIAS/COPage/test/class.ilUnitTestPCDefinition.php"); $suite->addTestSuite("PageObjectTest"); - require_once("./Services/COPage/test/PCBlogTest.php"); + require_once("./components/ILIAS/COPage/test/PCBlogTest.php"); $suite->addTestSuite("PCBlogTest"); - require_once("./Services/COPage/test/PCContentIncludeTest.php"); + require_once("./components/ILIAS/COPage/test/PCContentIncludeTest.php"); $suite->addTestSuite("PCContentIncludeTest"); - require_once("./Services/COPage/test/PCDataTableTest.php"); + require_once("./components/ILIAS/COPage/test/PCDataTableTest.php"); $suite->addTestSuite("PCDataTableTest"); - require_once("./Services/COPage/test/PCTableDataTest.php"); + require_once("./components/ILIAS/COPage/test/PCTableDataTest.php"); $suite->addTestSuite("PCTableDataTest"); - require_once("./Services/COPage/test/PCContentTemplateTest.php"); + require_once("./components/ILIAS/COPage/test/PCContentTemplateTest.php"); $suite->addTestSuite("PCContentTemplateTest"); - require_once("./Services/COPage/test/PCFileListTest.php"); + require_once("./components/ILIAS/COPage/test/PCFileListTest.php"); $suite->addTestSuite("PCFileListTest"); - require_once("./Services/COPage/test/PCGridTest.php"); + require_once("./components/ILIAS/COPage/test/PCGridTest.php"); $suite->addTestSuite("PCGridTest"); - require_once("./Services/COPage/test/PCInteractiveImageTest.php"); + require_once("./components/ILIAS/COPage/test/PCInteractiveImageTest.php"); $suite->addTestSuite("PCInteractiveImageTest"); - require_once("./Services/COPage/test/PCListTest.php"); + require_once("./components/ILIAS/COPage/test/PCListTest.php"); $suite->addTestSuite("PCListTest"); - require_once("./Services/COPage/test/PCLoginPageElementTest.php"); + require_once("./components/ILIAS/COPage/test/PCLoginPageElementTest.php"); $suite->addTestSuite("PCLoginPageElementTest"); - require_once("./Services/COPage/test/PCMapTest.php"); + require_once("./components/ILIAS/COPage/test/PCMapTest.php"); $suite->addTestSuite("PCMapTest"); - require_once("./Services/COPage/test/PCMediaObjectTest.php"); + require_once("./components/ILIAS/COPage/test/PCMediaObjectTest.php"); $suite->addTestSuite("PCMediaObjectTest"); - require_once("./Services/COPage/test/PCPlaceholderTest.php"); + require_once("./components/ILIAS/COPage/test/PCPlaceholderTest.php"); $suite->addTestSuite("PCPlaceHolderTest"); - require_once("./Services/COPage/test/PCPluggedTest.php"); + require_once("./components/ILIAS/COPage/test/PCPluggedTest.php"); $suite->addTestSuite("PCPluggedTest"); - require_once("./Services/COPage/test/PCProfileTest.php"); + require_once("./components/ILIAS/COPage/test/PCProfileTest.php"); $suite->addTestSuite("PCProfileTest"); - require_once("./Services/COPage/test/PCQuestionTest.php"); + require_once("./components/ILIAS/COPage/test/PCQuestionTest.php"); $suite->addTestSuite("PCQuestionTest"); - require_once("./Services/COPage/test/PCResourcesTest.php"); + require_once("./components/ILIAS/COPage/test/PCResourcesTest.php"); $suite->addTestSuite("PCResourcesTest"); - require_once("./Services/COPage/test/PCSkillsTest.php"); + require_once("./components/ILIAS/COPage/test/PCSkillsTest.php"); $suite->addTestSuite("PCSkillsTest"); - require_once("./Services/COPage/test/PCSourceCodeTest.php"); + require_once("./components/ILIAS/COPage/test/PCSourceCodeTest.php"); $suite->addTestSuite("PCSourceCodeTest"); - require_once("./Services/COPage/test/PCTabsTest.php"); + require_once("./components/ILIAS/COPage/test/PCTabsTest.php"); $suite->addTestSuite("PCTabsTest"); - require_once("./Services/COPage/test/PCVerificationTest.php"); + require_once("./components/ILIAS/COPage/test/PCVerificationTest.php"); $suite->addTestSuite("PCVerificationTest"); - require_once("./Services/COPage/test/ID/ContentIdManagerTest.php"); + require_once("./components/ILIAS/COPage/test/ID/ContentIdManagerTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\ID\ContentIdManagerTest::class); - require_once("./Services/COPage/test/Compare/PageCompareTest.php"); + require_once("./components/ILIAS/COPage/test/Compare/PageCompareTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\Compare\PageCompareTest::class); - require_once("./Services/COPage/test/Page/PageContentManagerTest.php"); + require_once("./components/ILIAS/COPage/test/Page/PageContentManagerTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\Page\PageContentManagerTest::class); - require_once("./Services/COPage/test/PC/PCFactoryTest.php"); + require_once("./components/ILIAS/COPage/test/PC/PCFactoryTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\PC\PCFactoryTest::class); - require_once("./Services/COPage/test/PC/PCDefinitionTest.php"); + require_once("./components/ILIAS/COPage/test/PC/PCDefinitionTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\PC\PCDefinitionTest::class); - require_once("./Services/COPage/test/Link/LinkManagerTest.php"); + require_once("./components/ILIAS/COPage/test/Link/LinkManagerTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\Link\LinkManagerTest::class); - require_once("./Services/COPage/test/PC/FileList/FileListManagerTest.php"); + require_once("./components/ILIAS/COPage/test/PC/FileList/FileListManagerTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\PC\FileList\FileListManagerTest::class); - require_once("./Services/COPage/test/Layout/PageLayoutTest.php"); + require_once("./components/ILIAS/COPage/test/Layout/PageLayoutTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\Layout\PageLayoutTest::class); - require_once("./Services/COPage/test/Html/TransformUtilTest.php"); + require_once("./components/ILIAS/COPage/test/Html/TransformUtilTest.php"); $suite->addTestSuite(\ILIAS\COPage\Test\Html\TransformUtilTest::class); return $suite; diff --git a/components/ILIAS/COPage/xsl/XslManager.php b/components/ILIAS/COPage/xsl/XslManager.php index 75917fb2739f..c209a318ce5e 100644 --- a/components/ILIAS/COPage/xsl/XslManager.php +++ b/components/ILIAS/COPage/xsl/XslManager.php @@ -34,7 +34,7 @@ public function process( array $params ): string { $xslt = new \XSLTProcessor(); - $xsl = file_get_contents("./Services/COPage/xsl/page.xsl"); + $xsl = file_get_contents("./components/ILIAS/COPage/xsl/page.xsl"); $xslt_domdoc = new \DomDocument(); $xslt_domdoc->loadXML($xsl); $xslt->importStylesheet($xslt_domdoc); diff --git a/components/ILIAS/Cache/classes/class.ilCache.php b/components/ILIAS/Cache_/classes/class.ilCache.php similarity index 100% rename from components/ILIAS/Cache/classes/class.ilCache.php rename to components/ILIAS/Cache_/classes/class.ilCache.php diff --git a/components/ILIAS/Cache/classes/class.ilExampleCache.php b/components/ILIAS/Cache_/classes/class.ilExampleCache.php similarity index 100% rename from components/ILIAS/Cache/classes/class.ilExampleCache.php rename to components/ILIAS/Cache_/classes/class.ilExampleCache.php diff --git a/components/ILIAS/Cache/maintenance.json b/components/ILIAS/Cache_/maintenance.json similarity index 90% rename from components/ILIAS/Cache/maintenance.json rename to components/ILIAS/Cache_/maintenance.json index 7d29192c085f..a0c6d1c63646 100644 --- a/components/ILIAS/Cache/maintenance.json +++ b/components/ILIAS/Cache_/maintenance.json @@ -10,7 +10,7 @@ ], "tester": "", "testcase_writer": "", - "path": "Services/Cache", + "path": "components/ILIAS/Cache_", "belong_to_component": "None", "used_in_components": [ "News", diff --git a/components/ILIAS/Cache/test/ilCacheTest.php b/components/ILIAS/Cache_/test/ilCacheTest.php similarity index 100% rename from components/ILIAS/Cache/test/ilCacheTest.php rename to components/ILIAS/Cache_/test/ilCacheTest.php diff --git a/components/ILIAS/Cache/test/ilServicesCacheSuite.php b/components/ILIAS/Cache_/test/ilServicesCacheSuite.php similarity index 92% rename from components/ILIAS/Cache/test/ilServicesCacheSuite.php rename to components/ILIAS/Cache_/test/ilServicesCacheSuite.php index 3e0a57762e1a..2f5426b98686 100644 --- a/components/ILIAS/Cache/test/ilServicesCacheSuite.php +++ b/components/ILIAS/Cache_/test/ilServicesCacheSuite.php @@ -29,7 +29,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Cache/test/ilCacheTest.php"); + require_once("./components/ILIAS/Cache_/test/ilCacheTest.php"); $suite->addTestSuite("ilCacheTest"); return $suite; diff --git a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourBookingTableGUI.php b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourBookingTableGUI.php index e3b04a6dd859..ca666aa0d71b 100644 --- a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourBookingTableGUI.php +++ b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourBookingTableGUI.php @@ -51,7 +51,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_u */ protected function initTable(): void { - $this->setRowTemplate('tpl.ch_booking_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.ch_booking_row.html', 'components/ILIAS/Calendar'); $this->setTitle($this->lng->txt('cal_ch_bookings_tbl')); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject(), $this->getParentCmd())); diff --git a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourGroupTableGUI.php b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourGroupTableGUI.php index d2c1e7728f2d..7795db5fb6b8 100644 --- a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourGroupTableGUI.php +++ b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHourGroupTableGUI.php @@ -37,7 +37,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_u */ protected function initTable(): void { - $this->setRowTemplate('tpl.ch_group_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.ch_group_row.html', 'components/ILIAS/Calendar'); $this->setTitle($this->lng->txt('cal_ch_grps')); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject(), $this->getParentCmd())); diff --git a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHoursTableGUI.php b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHoursTableGUI.php index e09bbd7f8023..f860902c1ffc 100644 --- a/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHoursTableGUI.php +++ b/components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHoursTableGUI.php @@ -59,7 +59,7 @@ public function __construct(object $a_gui, string $a_cmd, int $a_user_id) $this->addColumn($this->lng->txt('cal_ch_target_object'), 'target'); $this->addColumn(''); - $this->setRowTemplate('tpl.ch_upcoming_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.ch_upcoming_row.html', 'components/ILIAS/Calendar'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject(), $this->getParentCmd())); $this->setTitle($this->lng->txt('cal_ch_ch')); diff --git a/components/ILIAS/Calendar/classes/Export/class.ilCalendarExport.php b/components/ILIAS/Calendar/classes/Export/class.ilCalendarExport.php index 6d665d819f8b..d4c1acba0aaa 100644 --- a/components/ILIAS/Calendar/classes/Export/class.ilCalendarExport.php +++ b/components/ILIAS/Calendar/classes/Export/class.ilCalendarExport.php @@ -298,7 +298,7 @@ protected function createVEVENT(ilCalendarEntry $app): ilICalWriter protected function createRecurrences(ilCalendarEntry $app): ilICalWriter { $str_writer = new ilICalWriter(); - include_once './Services/Calendar/classes/class.ilCalendarRecurrences.php'; + include_once './components/ILIAS/Calendar/classes/class.ilCalendarRecurrences.php'; foreach (ilCalendarRecurrences::_getRecurrences($app->getEntryId()) as $rec) { foreach (ilCalendarRecurrenceExclusions::getExclusionDates($app->getEntryId()) as $excl) { $str_writer->addLine($excl->toICal()); @@ -326,7 +326,7 @@ protected function buildAppointmentUrl(ilCalendarEntry $entry): ilICalWriter $str_writer->addLine('URL;VALUE=URI:' . ILIAS_HTTP_PATH); } else { $refs = ilObject::_getAllReferences($cat->getObjId()); - include_once './Services/Link/classes/class.ilLink.php'; + include_once './components/ILIAS/Link/classes/class.ilLink.php'; $str_writer->addLine('URL;VALUE=URI:' . ilLink::_getLink(current($refs))); } return $str_writer; diff --git a/components/ILIAS/Calendar/classes/Form/class.ilRecurrenceInputGUI.php b/components/ILIAS/Calendar/classes/Form/class.ilRecurrenceInputGUI.php index f7963537cdc2..c775aabfadb3 100644 --- a/components/ILIAS/Calendar/classes/Form/class.ilRecurrenceInputGUI.php +++ b/components/ILIAS/Calendar/classes/Form/class.ilRecurrenceInputGUI.php @@ -47,7 +47,7 @@ public function __construct(string $a_title, string $a_postvar) { global $DIC; - $DIC->ui()->mainTemplate()->addJavaScript("./Services/Calendar/js/recurrence_input.js"); + $DIC->ui()->mainTemplate()->addJavaScript("./components/ILIAS/Calendar/js/recurrence_input.js"); $this->user = $DIC->user(); $this->user_settings = ilCalendarUserSettings::_getInstanceByUserId($this->user->getId()); $this->recurrence = new ilCalendarRecurrence(); @@ -267,7 +267,7 @@ public function getEnabledSubForms(): array */ public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate('tpl.recurrence_input.html', true, true, 'Services/Calendar'); + $tpl = new ilTemplate('tpl.recurrence_input.html', true, true, 'components/ILIAS/Calendar'); $options = array('NONE' => $this->lng->txt('cal_no_recurrence')); if (in_array(ilCalendarRecurrence::FREQ_DAILY, $this->getEnabledSubForms())) { diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarAppEventListener.php b/components/ILIAS/Calendar/classes/class.ilCalendarAppEventListener.php index 519ab25462cb..c579f5574ef9 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarAppEventListener.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarAppEventListener.php @@ -35,7 +35,7 @@ class ilCalendarAppEventListener implements ilAppEventListener /** * Handle events like create, update, delete * @access public - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) * * @static @@ -77,7 +77,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ } break; - case 'Services/Booking': + case 'components/ILIAS/Booking': switch ($a_event) { case 'create': case 'delete': diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php index 56d059f37ac8..16db0fa717b8 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php @@ -310,7 +310,7 @@ protected function initForm(string $a_mode, bool $a_edit_single_app = false): il } } - $this->tpl->addJavaScript('./Services/Calendar/js/toggle_notification.js'); + $this->tpl->addJavaScript('./components/ILIAS/Calendar/js/toggle_notification.js'); $not = new ilCheckboxInputGUI($this->lng->txt('cal_cg_notification'), 'not'); $not->setInfo($this->lng->txt('cal_notification_info')); $not->setValue('1'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPanelGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPanelGUI.php index 1b4f9abefc7a..87eb8858780a 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPanelGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPanelGUI.php @@ -77,7 +77,7 @@ public function getHTML($a_app): string self::$counter++; - $this->tpl = new ilTemplate('tpl.appointment_panel.html', true, true, 'Services/Calendar'); + $this->tpl = new ilTemplate('tpl.appointment_panel.html', true, true, 'components/ILIAS/Calendar'); // Panel variables $this->tpl->setVariable('PANEL_NUM', self::$counter); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php index 0722ed7c45b9..02eebd1dced0 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php @@ -146,7 +146,7 @@ public function getHTML(): string public function getModalHTML(): string { - $tpl = new ilTemplate('tpl.appointment_presentation.html', true, true, 'Services/Calendar'); + $tpl = new ilTemplate('tpl.appointment_presentation.html', true, true, 'components/ILIAS/Calendar'); $info_screen = $this->info_screen; $info_screen->setFormAction($this->ctrl->getFormAction($this)); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentsTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentsTableGUI.php index 3aa4de26920a..15835f142eca 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentsTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarAppointmentsTableGUI.php @@ -61,7 +61,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_c } $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_appointment_row.html", "Services/Calendar"); + $this->setRowTemplate("tpl.show_appointment_row.html", "components/ILIAS/Calendar"); $this->setShowRowsSelector(true); $this->enable('sort'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarBlockGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarBlockGUI.php index 9ad581ffb48f..5f72e62b55c8 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarBlockGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarBlockGUI.php @@ -271,7 +271,7 @@ public function executeCommand(): string public function fillDataSection(): void { if ($this->display_mode != "mmon") { - $this->setRowTemplate("tpl.pd_event_list.html", "Services/Calendar"); + $this->setRowTemplate("tpl.pd_event_list.html", "components/ILIAS/Calendar"); ilBlockGUI::fillDataSection(); } else { @@ -279,7 +279,7 @@ public function fillDataSection(): void "tpl.calendar_block.html", true, true, - "Services/Calendar" + "components/ILIAS/Calendar" ); $this->addMiniMonth($tpl, true); @@ -865,7 +865,7 @@ protected function getLegacyContent(): string "tpl.calendar_block.html", true, true, - "Services/Calendar" + "components/ILIAS/Calendar" ); $this->addMiniMonth($tpl); @@ -874,7 +874,7 @@ protected function getLegacyContent(): string 'tpl.cal_block_panel.html', true, true, - 'Services/Calendar' + 'components/ILIAS/Calendar' ); $this->addConsultationHourButtons($panel_tpl); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php index aaf5d2f5413e..9a2676ff6218 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php @@ -175,7 +175,7 @@ protected function add(ilPropertyFormGUI $form = null): void $this->tabs->clearTargets(); $this->tabs->setBackTarget($this->lng->txt("cal_back_to_list"), $this->ctrl->getLinkTarget($this, 'cancel')); - $ed_tpl = new ilTemplate('tpl.edit_category.html', true, true, 'Services/Calendar'); + $ed_tpl = new ilTemplate('tpl.edit_category.html', true, true, 'components/ILIAS/Calendar'); if (!$form instanceof ilPropertyFormGUI) { $form = $this->initFormCategory('create'); @@ -986,7 +986,7 @@ protected function appendCalendarSelection(): string { $this->lng->loadLanguageModule('pd'); - $tpl = new ilTemplate('tpl.calendar_selection.html', true, true, 'Services/Calendar'); + $tpl = new ilTemplate('tpl.calendar_selection.html', true, true, 'components/ILIAS/Calendar'); switch (ilCalendarUserSettings::_getInstance()->getCalendarSelectionType()) { case ilCalendarUserSettings::CAL_SELECTION_MEMBERSHIP: $tpl->setVariable('HTEXT', $this->lng->txt('dash_memberships')); @@ -1109,7 +1109,7 @@ protected function isImportable(): bool protected function addReferenceLinks($a_obj_id): string { - $tpl = new ilTemplate('tpl.cal_reference_links.html', true, true, 'Services/Calendar'); + $tpl = new ilTemplate('tpl.cal_reference_links.html', true, true, 'components/ILIAS/Calendar'); foreach (ilObject::_getAllReferences($a_obj_id) as $ref_id => $ref_id) { $parent_ref_id = $this->tree->getParentId($ref_id); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarChangedAppointmentsTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarChangedAppointmentsTableGUI.php index 1d8dd9b53d9e..ad26f4330e3b 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarChangedAppointmentsTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarChangedAppointmentsTableGUI.php @@ -52,7 +52,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd) $this->addColumn($this->lng->txt('last_update'), 'last_update', "15%"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_changed_appointment_row.html", "Services/Calendar"); + $this->setRowTemplate("tpl.show_changed_appointment_row.html", "components/ILIAS/Calendar"); $this->setShowRowsSelector(true); $this->enable('sort'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarDataSet.php b/components/ILIAS/Calendar/classes/class.ilCalendarDataSet.php index 40c86f2588f8..169a73f7c0ec 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarDataSet.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarDataSet.php @@ -208,7 +208,7 @@ public function importRecord( // please note: we currently only support private user calendars to // be imported if (($a_rec["Type"] ?? 0) == 1) { - $usr_id = (int) $a_mapping->getMapping("Services/User", "usr", $a_rec["ObjId"]); + $usr_id = (int) $a_mapping->getMapping("components/ILIAS/User", "usr", $a_rec["ObjId"]); if ($usr_id > 0 && ilObject::_lookupType($usr_id) == "usr") { $category = new ilCalendarCategory(0); $category->setTitle((string) $a_rec["Title"]); @@ -217,7 +217,7 @@ public function importRecord( $category->setObjId((int) $usr_id); $category->add(); $a_mapping->addMapping( - "Services/Calendar", + "components/ILIAS/Calendar", "calendar", $a_rec["CatId"], (string) $category->getCategoryID() @@ -249,7 +249,7 @@ public function importRecord( $entry->enableNotification((bool) ($a_rec["Notification"] ?? false)); $entry->save(); $a_mapping->addMapping( - "Services/Calendar", + "components/ILIAS/Calendar", "cal_entry", $a_rec["Id"], (string) $entry->getEntryId() @@ -258,8 +258,8 @@ public function importRecord( break; case "cal_assignment": - $cat_id = (int) $a_mapping->getMapping("Services/Calendar", "calendar", $a_rec["CatId"]); - $entry_id = (int) $a_mapping->getMapping("Services/Calendar", "cal_entry", $a_rec["EntryId"]); + $cat_id = (int) $a_mapping->getMapping("components/ILIAS/Calendar", "calendar", $a_rec["CatId"]); + $entry_id = (int) $a_mapping->getMapping("components/ILIAS/Calendar", "cal_entry", $a_rec["EntryId"]); if ($cat_id > 0 && $entry_id > 0) { $ass = new ilCalendarCategoryAssignments($entry_id); $ass->addAssignment($cat_id); @@ -267,7 +267,7 @@ public function importRecord( break; case "recurrence_rule": - $entry_id = $a_mapping->getMapping("Services/Calendar", "cal_entry", $a_rec["EntryId"]); + $entry_id = $a_mapping->getMapping("components/ILIAS/Calendar", "cal_entry", $a_rec["EntryId"]); if ($entry_id > 0) { $rec = new ilCalendarRecurrence(); $rec->setEntryId((int) $entry_id); @@ -287,7 +287,7 @@ public function importRecord( $rec->setWeekstart((string) ($a_rec["Weekstart"] ?? '')); $rec->save(); $a_mapping->addMapping( - "Services/Calendar", + "components/ILIAS/Calendar", "recurrence_rule", $a_rec["RuleId"], (string) $rec->getRecurrenceId() diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php index 1cd1f25228f9..f958b179da9d 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php @@ -95,7 +95,7 @@ protected function show(): void } $evening_aggr = $this->user_settings->getDayEnd() * 60; - $this->tpl = new ilTemplate('tpl.day_view.html', true, true, 'Services/Calendar'); + $this->tpl = new ilTemplate('tpl.day_view.html', true, true, 'components/ILIAS/Calendar'); ilYuiUtil::initDragDrop(); @@ -234,7 +234,7 @@ protected function show(): void protected function showFulldayAppointment(array $a_app): void { - $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'Services/Calendar'); + $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'components/ILIAS/Calendar'); $event_tpl->setCurrentBlock('fullday_app'); @@ -274,7 +274,7 @@ protected function showFulldayAppointment(array $a_app): void protected function showAppointment(array $a_app): void { - $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'Services/Calendar'); + $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'components/ILIAS/Calendar'); $event_tpl->setCurrentBlock('app'); $this->tpl->setVariable('APP_ROWSPAN', $a_app['rowspan']); $time = ''; diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarHeaderNavigationGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarHeaderNavigationGUI.php index e0165d782597..6909cd333dad 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarHeaderNavigationGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarHeaderNavigationGUI.php @@ -64,7 +64,7 @@ public function __construct(object $cmdClass, ilDate $seed, string $a_increment, public function getHTML(): string { $today = new ilDateTime(time(), IL_CAL_UNIX, $this->user->getTimeZone()); - $tpl = new ilTemplate("tpl.navigation_header.html", true, true, "Services/Calendar"); + $tpl = new ilTemplate("tpl.navigation_header.html", true, true, "components/ILIAS/Calendar"); // previous button $contains_today = false; diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarInboxGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarInboxGUI.php index 8012e29e903a..9da0d3326e1b 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarInboxGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarInboxGUI.php @@ -88,7 +88,7 @@ public function executeCommand(): void protected function inbox(): void { - $this->tpl = new ilTemplate('tpl.inbox.html', true, true, 'Services/Calendar'); + $this->tpl = new ilTemplate('tpl.inbox.html', true, true, 'components/ILIAS/Calendar'); // agenda list $cal_list = new ilCalendarAgendaListGUI($this->seed); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarInboxSharedTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarInboxSharedTableGUI.php index ff823a134098..f4085c7be7c6 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarInboxSharedTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarInboxSharedTableGUI.php @@ -44,7 +44,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) parent::__construct($a_parent_obj, $a_parent_cmd); - $this->setRowTemplate('tpl.calendar_inbox_shared_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.calendar_inbox_shared_row.html', 'components/ILIAS/Calendar'); $this->addColumn('', 'cal_ids', '1px'); $this->addColumn($this->lng->txt('name'), 'title', '50%'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarManageTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarManageTableGUI.php index 3c02bb8a073d..0d24e644c285 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarManageTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarManageTableGUI.php @@ -53,7 +53,7 @@ public function __construct(object $a_parent_obj) $this->addColumn($this->lng->txt('title'), 'title', '79%'); $this->addColumn('', '', '20%'); - $this->setRowTemplate("tpl.manage_row.html", "Services/Calendar"); + $this->setRowTemplate("tpl.manage_row.html", "components/ILIAS/Calendar"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, "manage")); $this->enable('select_all'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php index 49f38eddd636..68917b535ac0 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php @@ -95,7 +95,7 @@ public function addScheduleFilter(ilCalendarScheduleFilter $a_filter): void public function show(): void { - $this->tpl = new ilTemplate('tpl.month_view.html', true, true, 'Services/Calendar'); + $this->tpl = new ilTemplate('tpl.month_view.html', true, true, 'components/ILIAS/Calendar'); ilYuiUtil::initDragDrop(); @@ -226,7 +226,7 @@ protected function showEvents(ilCalendarSchedule $scheduler, ilDate $date): int $this->ctrl->clearParametersByClass('ilcalendarappointmentgui'); $this->ctrl->setParameterByClass('ilcalendarappointmentgui', 'app_id', $item['event']->getEntryId()); - $event_tpl = new ilTemplate('tpl.month_event_view.html', true, true, 'Services/Calendar'); + $event_tpl = new ilTemplate('tpl.month_event_view.html', true, true, 'components/ILIAS/Calendar'); if (!$item['event']->isFullDay()) { switch ($this->user_settings->getTimeFormat()) { diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php index 43157c378c13..e442c26f3584 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php @@ -505,7 +505,7 @@ protected function forwardToClass(string $a_class): ?ilCalendarViewGUI protected function showSideBlocks(): void { - $tpl = new ilTemplate('tpl.cal_side_block.html', true, true, 'Services/Calendar'); + $tpl = new ilTemplate('tpl.cal_side_block.html', true, true, 'components/ILIAS/Calendar'); if ($this->getRepositoryMode()) { $side_cal = new ilCalendarBlockGUI(); } else { diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarRecurrenceTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarRecurrenceTableGUI.php index 2e7d33a7874a..59ad9dc3677c 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarRecurrenceTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarRecurrenceTableGUI.php @@ -28,7 +28,7 @@ public function init(): void $this->setFormName('appointments'); $this->addColumn('', 'f', "1"); $this->addColumn($this->lng->txt('title')); - $this->setRowTemplate("tpl.show_recurrence_row.html", 'Services/Calendar'); + $this->setRowTemplate("tpl.show_recurrence_row.html", 'components/ILIAS/Calendar'); $this->setSelectAllCheckbox('recurrence_ids'); $this->addMultiCommand( diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarRemoteAccessHandler.php b/components/ILIAS/Calendar/classes/class.ilCalendarRemoteAccessHandler.php index df33f44a9b16..2fb8202c9b18 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarRemoteAccessHandler.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarRemoteAccessHandler.php @@ -129,13 +129,13 @@ protected function initLimitEnabled() protected function initIlias() { - include_once './Services/Context/classes/class.ilContext.php'; + include_once './components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_ICAL); - include_once './Services/Authentication/classes/class.ilAuthFactory.php'; + include_once './components/ILIAS/Authentication/classes/class.ilAuthFactory.php'; ilAuthFactory::setContext(ilAuthFactory::CONTEXT_CALENDAR_TOKEN); - include_once './Services/Init/classes/class.ilInitialisation.php'; + include_once './components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); global $DIC; diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarSelectionBlockGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarSelectionBlockGUI.php index 200a7919aca0..ca317e919c8c 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarSelectionBlockGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarSelectionBlockGUI.php @@ -304,7 +304,7 @@ protected function buildPath($a_ref_id): string protected function getLegacyContent(): string { - $tpl = new ilTemplate("tpl.cal_selection_block_content.html", true, true, "Services/Calendar"); + $tpl = new ilTemplate("tpl.cal_selection_block_content.html", true, true, "components/ILIAS/Calendar"); foreach ($this->calendar_groups as $type => $txt) { foreach ($this->calendars[$type] as $c) { diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarSharedListTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarSharedListTableGUI.php index be744125d218..3ad786a70e07 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarSharedListTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarSharedListTableGUI.php @@ -30,7 +30,7 @@ public function __construct(object $parent_obj, string $parent_cmd) { parent::__construct($parent_obj, $parent_cmd); - $this->setRowTemplate('tpl.calendar_shared_list_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.calendar_shared_list_row.html', 'components/ILIAS/Calendar'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); $this->addColumn('', 'id', '1px'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarSharedRoleListTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarSharedRoleListTableGUI.php index 17832aa769f1..6e77c6372aea 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarSharedRoleListTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarSharedRoleListTableGUI.php @@ -40,7 +40,7 @@ public function __construct(object $parent_obj, string $parent_cmd) parent::__construct($parent_obj, $parent_cmd); - $this->setRowTemplate('tpl.calendar_shared_role_list_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.calendar_shared_role_list_row.html', 'components/ILIAS/Calendar'); $this->addColumn('', 'id', '1px'); $this->addColumn($this->lng->txt('objs_role'), 'title', '75%'); $this->addColumn($this->lng->txt('assigned_members'), 'num', '25%'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarSharedUserListTableGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarSharedUserListTableGUI.php index e5eb021ab7fa..d4a3b834b352 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarSharedUserListTableGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarSharedUserListTableGUI.php @@ -36,7 +36,7 @@ public function __construct(object $parent_obj, string $parent_cmd) { parent::__construct($parent_obj, $parent_cmd); - $this->setRowTemplate('tpl.calendar_shared_user_list_row.html', 'Services/Calendar'); + $this->setRowTemplate('tpl.calendar_shared_user_list_row.html', 'components/ILIAS/Calendar'); $this->addColumn('', 'id', '1px'); $this->addColumn($this->lng->txt('name'), 'last_firstname', '60%'); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarSubscriptionGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarSubscriptionGUI.php index 2a64c958c431..5d41d4a780da 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarSubscriptionGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarSubscriptionGUI.php @@ -94,7 +94,7 @@ protected function getModalForSubscription(): void 'tpl.subscription_dialog.html', true, true, - 'Services/Calendar' + 'components/ILIAS/Calendar' ); $tpl->setVariable('TXT_SUBSCRIPTION_INFO', $this->lng->txt('cal_subscription_info')); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarUtil.php b/components/ILIAS/Calendar/classes/class.ilCalendarUtil.php index af0ec3ad6f5f..5e662fe50eef 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarUtil.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarUtil.php @@ -199,7 +199,7 @@ public static function initJSCalendar(): void "CALENDAR_LANG_JAVASCRIPT", "calendar_javascript", "tpl.calendar.html", - "Services/Calendar" + "components/ILIAS/Calendar" ); $tpl->setCurrentBlock("calendar_javascript"); $tpl->setVariable("FULL_SUNDAY", $lng->txt("l_su")); @@ -261,8 +261,8 @@ public static function initJSCalendar(): void $tpl->setVariable("TIME", $lng->txt("time")); $tpl->parseCurrentBlock(); $tpl->setCurrentBlock("CalendarJS"); - $tpl->setVariable("LOCATION_JAVASCRIPT_CALENDAR", "./Services/Calendar/js/calendar.js"); - $tpl->setVariable("LOCATION_JAVASCRIPT_CALENDAR_SETUP", "./Services/Calendar/js/calendar-setup.js"); + $tpl->setVariable("LOCATION_JAVASCRIPT_CALENDAR", "./components/ILIAS/Calendar/js/calendar.js"); + $tpl->setVariable("LOCATION_JAVASCRIPT_CALENDAR_SETUP", "./components/ILIAS/Calendar/js/calendar-setup.js"); $tpl->parseCurrentBlock(); self::$init_done = "done"; @@ -275,7 +275,7 @@ public static function getZoneInfoFile($a_tz): string } $timezone_filename = str_replace('/', '_', $a_tz); $timezone_filename .= '.ics'; - return './Services/Calendar/zoneinfo/' . $timezone_filename; + return './components/ILIAS/Calendar/zoneinfo/' . $timezone_filename; } /** @@ -512,7 +512,7 @@ public static function initDateTimePicker(): void // unminified version does not work with jQuery 3.0 // https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1684 $tpl->addJavaScript("./node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"); - $tpl->addJavaScript("Services/Form/js/Form.js"); // see ilPropertyFormGUI + $tpl->addJavaScript("components/ILIAS/Form/js/Form.js"); // see ilPropertyFormGUI self::$init_datetimepicker = true; } } diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarViewGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarViewGUI.php index ff23efaef0da..61e1ffbb1833 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarViewGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarViewGUI.php @@ -95,7 +95,7 @@ public function initialize(int $a_calendar_presentation_type): void if ($this->presentation_type == self::CAL_PRESENTATION_DAY || $this->presentation_type == self::CAL_PRESENTATION_WEEK) { iljQueryUtil::initjQuery($this->main_tpl); - $this->main_tpl->addJavaScript('./Services/Calendar/js/calendar_appointment.js'); + $this->main_tpl->addJavaScript('./components/ILIAS/Calendar/js/calendar_appointment.js'); } $this->http = $DIC->http(); $this->refinery = $DIC->refinery(); diff --git a/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php b/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php index a60a172b4ca0..d1a27c8fe108 100644 --- a/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php @@ -94,7 +94,7 @@ public function show(): void $morning_aggr = $this->getMorningAggr(); $evening_aggr = $this->user_settings->getDayEnd() * 60; - $this->tpl = new ilTemplate('tpl.week_view.html', true, true, 'Services/Calendar'); + $this->tpl = new ilTemplate('tpl.week_view.html', true, true, 'components/ILIAS/Calendar'); ilYuiUtil::initDragDrop(); @@ -170,7 +170,7 @@ public function show(): void protected function showFulldayAppointment(array $a_app): void { - $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'Services/Calendar'); + $event_tpl = new ilTemplate('tpl.day_event_view.html', true, true, 'components/ILIAS/Calendar'); $event_tpl->setCurrentBlock('fullday_app'); $title = $this->getAppointmentShyButton($a_app['event'], (string) $a_app['dstart'], ""); @@ -207,7 +207,7 @@ protected function showFulldayAppointment(array $a_app): void protected function showAppointment(array $a_app): void { $time = ''; - $event_tpl = new ilTemplate('tpl.week_event_view.html', true, true, 'Services/Calendar'); + $event_tpl = new ilTemplate('tpl.week_event_view.html', true, true, 'components/ILIAS/Calendar'); $ilUser = $this->user; diff --git a/components/ILIAS/Calendar/classes/class.ilMiniCalendarGUI.php b/components/ILIAS/Calendar/classes/class.ilMiniCalendarGUI.php index 933ac43b7c38..3d283376f060 100644 --- a/components/ILIAS/Calendar/classes/class.ilMiniCalendarGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilMiniCalendarGUI.php @@ -74,14 +74,14 @@ public function getHTML(): string "tpl.calendar_block_frame.html", true, true, - "Services/Calendar" + "components/ILIAS/Calendar" ); $tpl = new ilTemplate( "tpl.calendar_block.html", true, true, - "Services/Calendar" + "components/ILIAS/Calendar" ); $this->addMiniMonth($tpl); diff --git a/components/ILIAS/Calendar/classes/class.ilObjCalendarSettingsGUI.php b/components/ILIAS/Calendar/classes/class.ilObjCalendarSettingsGUI.php index 19bbed829496..df4741a9d606 100644 --- a/components/ILIAS/Calendar/classes/class.ilObjCalendarSettingsGUI.php +++ b/components/ILIAS/Calendar/classes/class.ilObjCalendarSettingsGUI.php @@ -101,7 +101,7 @@ public function settings(?ilPropertyFormGUI $form = null): void if (!$form instanceof ilPropertyFormGUI) { $form = $this->initFormSettings(); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.settings.html', 'Services/Calendar'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.settings.html', 'components/ILIAS/Calendar'); $this->tpl->setVariable('CAL_SETTINGS', $form->getHTML()); } diff --git a/components/ILIAS/Calendar/classes/iCal/class.ilICalParser.php b/components/ILIAS/Calendar/classes/iCal/class.ilICalParser.php index 2c48b30047e8..941bb60bc7ce 100644 --- a/components/ILIAS/Calendar/classes/iCal/class.ilICalParser.php +++ b/components/ILIAS/Calendar/classes/iCal/class.ilICalParser.php @@ -21,7 +21,7 @@ /** * @author Stefan Meyer - * @ingroup Services/Calendar + * @ingroup components/ILIAS/Calendar */ class ilICalParser { diff --git a/components/ILIAS/Calendar/test/ilServicesCalendarSuite.php b/components/ILIAS/Calendar/test/ilServicesCalendarSuite.php index f38ab0642c9b..a3630149a1a6 100644 --- a/components/ILIAS/Calendar/test/ilServicesCalendarSuite.php +++ b/components/ILIAS/Calendar/test/ilServicesCalendarSuite.php @@ -16,7 +16,7 @@ class ilServicesCalendarSuite extends TestSuite public static function suite(): self { $suite = new ilServicesCalendarSuite(); - include_once './Services/Calendar/test/class.ilCalendarRecurrenceCalculationTest.php'; + include_once './components/ILIAS/Calendar/test/class.ilCalendarRecurrenceCalculationTest.php'; $suite->addTestSuite(ilCalendarRecurrenceCalculationTest::class); return $suite; } diff --git a/components/ILIAS/Calendar/zoneinfo/zoneinfo_generator.php b/components/ILIAS/Calendar/zoneinfo/zoneinfo_generator.php index b7bd306aa9bf..ac70a25c2164 100644 --- a/components/ILIAS/Calendar/zoneinfo/zoneinfo_generator.php +++ b/components/ILIAS/Calendar/zoneinfo/zoneinfo_generator.php @@ -20,8 +20,8 @@ exec(TZ_CONVERT . ' -o Services/Calendar/zoneinfo/' . $name_underscore . '.tmp' . ' ' . $name); - $reader = fopen('Services/Calendar/zoneinfo/' . $name_underscore . '.tmp', 'r'); - $writer = fopen('Services/Calendar/zoneinfo/' . $name_underscore . '.ics', 'w'); + $reader = fopen('components/ILIAS/Calendar/zoneinfo/' . $name_underscore . '.tmp', 'r'); + $writer = fopen('components/ILIAS/Calendar/zoneinfo/' . $name_underscore . '.ics', 'w'); $counter = 0; while ($line = fgets($reader)) { @@ -40,7 +40,7 @@ fclose($reader); fclose($writer); - unlink('Services/Calendar/zoneinfo/' . $name_underscore . '.tmp'); + unlink('components/ILIAS/Calendar/zoneinfo/' . $name_underscore . '.tmp'); #echo $name_underscore.'
'; } diff --git a/components/ILIAS/Category/Export/class.ilCategoryExporter.php b/components/ILIAS/Category/Export/class.ilCategoryExporter.php index ea5f645ffa9e..8d098082f8b7 100644 --- a/components/ILIAS/Category/Export/class.ilCategoryExporter.php +++ b/components/ILIAS/Category/Export/class.ilCategoryExporter.php @@ -37,7 +37,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ // always trigger container because of co-page(s) return [ [ - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ] @@ -57,7 +57,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ return [ [ - "component" => "Services/Taxonomy", + "component" => "components/ILIAS/Taxonomy", "entity" => "tax", "ids" => $tax_ids ] diff --git a/components/ILIAS/Category/Export/class.ilCategoryImporter.php b/components/ILIAS/Category/Export/class.ilCategoryImporter.php index ca5f5ac5528c..d651fb2ba144 100644 --- a/components/ILIAS/Category/Export/class.ilCategoryImporter.php +++ b/components/ILIAS/Category/Export/class.ilCategoryImporter.php @@ -41,12 +41,12 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $refs = ilObject::_getAllReferences((int) $new_id); $this->category = ilObjectFactory::getInstanceByRefId(end($refs), false); } // Mapping for containers without subitems - elseif ($new_id = $a_mapping->getMapping('Services/Container', 'refs', '0')) { + elseif ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'refs', '0')) { $this->category = ilObjectFactory::getInstanceByRefId((int) $new_id, false); } elseif (!$this->category instanceof ilObjCategory) { $this->category = new ilObjCategory(); @@ -63,14 +63,14 @@ public function importXmlRepresentation( $GLOBALS['ilLog']->write(__METHOD__ . ': Parsing failed with message, "' . $e->getMessage() . '".'); } - foreach ($a_mapping->getMappingsOfEntity('Services/Container', 'objs') as $old => $new) { + foreach ($a_mapping->getMappingsOfEntity('components/ILIAS/Container', 'objs') as $old => $new) { $type = ilObject::_lookupType((int) $new); // see ilGlossaryImporter::importXmlRepresentation() // see ilTaxonomyDataSet::importRecord() $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item", $type . ":obj:" . $old, $new @@ -78,7 +78,7 @@ public function importXmlRepresentation( // this is since 4.3 does not export these ids but 4.4 tax node assignment needs it $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item_obj_id", $type . ":obj:" . $old, $new @@ -93,7 +93,7 @@ public function finalProcessing( foreach ($maps as $old => $new) { if ($old !== "new_id" && (int) $old > 0) { // get all new taxonomys of this object - $new_tax_ids = $a_mapping->getMapping("Services/Taxonomy", "tax_usage_of_obj", (string) $old); + $new_tax_ids = $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_usage_of_obj", (string) $old); $tax_ids = explode(":", (string) $new_tax_ids); foreach ($tax_ids as $tid) { ilObjTaxonomy::saveUsage((int) $tid, (int) $new); diff --git a/components/ILIAS/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php b/components/ILIAS/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php index e8b4ba39bde1..8013e8ca126b 100644 --- a/components/ILIAS/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php +++ b/components/ILIAS/CategoryReference/classes/class.ilObjCategoryReferenceListGUI.php @@ -103,7 +103,7 @@ public function initItem( $this->reference_ref_id = $ref_id; $this->reference_obj_id = $obj_id; - include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); + include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); $target_obj_id = ilContainerReference::_lookupTargetId($obj_id); $target_ref_ids = ilObject::_getAllReferences($target_obj_id); diff --git a/components/ILIAS/Certificate/README.md b/components/ILIAS/Certificate/README.md index 7a537e964716..cd8b70befd1d 100644 --- a/components/ILIAS/Certificate/README.md +++ b/components/ILIAS/Certificate/README.md @@ -187,7 +187,7 @@ The method MUST create a HTML string that can be displayed in the settings GUI. Templates SHOULD be used to create the HTML string. A default template can be used which is located in -`./Services/Certificates/default/tpl.default_description.html` +`./components/ILIAS/Certificates/default/tpl.default_description.html` ### Placeholder Values diff --git a/components/ILIAS/Certificate/classes/File/Template/XLS/class.ilCertificateXlsFileLoader.php b/components/ILIAS/Certificate/classes/File/Template/XLS/class.ilCertificateXlsFileLoader.php index 413ac2d7d4d5..75419e38ba79 100644 --- a/components/ILIAS/Certificate/classes/File/Template/XLS/class.ilCertificateXlsFileLoader.php +++ b/components/ILIAS/Certificate/classes/File/Template/XLS/class.ilCertificateXlsFileLoader.php @@ -25,6 +25,6 @@ class ilCertificateXlsFileLoader */ public function getXlsCertificateContent() { - return file_get_contents("./Services/Certificate/xml/xhtml2fo.xsl"); + return file_get_contents("./components/ILIAS/Certificate/xml/xhtml2fo.xsl"); } } diff --git a/components/ILIAS/Certificate/classes/Form/class.ilFormFieldParser.php b/components/ILIAS/Certificate/classes/Form/class.ilFormFieldParser.php index 9ecb5cca1f25..182b63e09811 100644 --- a/components/ILIAS/Certificate/classes/Form/class.ilFormFieldParser.php +++ b/components/ILIAS/Certificate/classes/Form/class.ilFormFieldParser.php @@ -91,7 +91,7 @@ public function fetchDefaultFormFields(string $content): array } } - $xsl = file_get_contents("./Services/Certificate/xml/fo2xhtml.xsl"); + $xsl = file_get_contents("./components/ILIAS/Certificate/xml/fo2xhtml.xsl"); if ($content !== '' && (is_string($xsl) && $xsl !== '')) { $args = [ '/_xml' => $content, diff --git a/components/ILIAS/Certificate/classes/Helper/ilCertificateDateHelper.php b/components/ILIAS/Certificate/classes/Helper/ilCertificateDateHelper.php index d3684da0b0ba..15e3d9d55f27 100644 --- a/components/ILIAS/Certificate/classes/Helper/ilCertificateDateHelper.php +++ b/components/ILIAS/Certificate/classes/Helper/ilCertificateDateHelper.php @@ -29,7 +29,7 @@ class ilCertificateDateHelper public function formatDate($date, ?int $dateFormat = null): string { if (null === $dateFormat) { - require_once 'Services/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE + require_once 'components/ILIAS/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE $dateFormat = IL_CAL_DATETIME; } @@ -50,7 +50,7 @@ public function formatDate($date, ?int $dateFormat = null): string public function formatDateTime($dateTime, ?int $dateFormat = null): string { if (null === $dateFormat) { - require_once 'Services/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE + require_once 'components/ILIAS/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE $dateFormat = IL_CAL_DATETIME; } diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilCoursePlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilCoursePlaceholderDescription.php index 59509971b745..93454da8e4c4 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilCoursePlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilCoursePlaceholderDescription.php @@ -72,7 +72,7 @@ public function __construct( public function createPlaceholderHtmlDescription(?ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable("PLACEHOLDER_INTRODUCTION", $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilDefaultPlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilDefaultPlaceholderDescription.php index 72a1d2ba512a..bb7e3af86f09 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilDefaultPlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilDefaultPlaceholderDescription.php @@ -69,7 +69,7 @@ public function __construct( public function createPlaceholderHtmlDescription(?ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable('PLACEHOLDER_INTRODUCTION', $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php index fb2b3c119ee1..929008e32a1b 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilExercisePlaceholderDescription.php @@ -75,7 +75,7 @@ public function __construct( public function createPlaceholderHtmlDescription(?ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable('PLACEHOLDER_INTRODUCTION', $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilObjectCustomUserFieldsPlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilObjectCustomUserFieldsPlaceholderDescription.php index f46f5cc8ddef..2722cf57b678 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilObjectCustomUserFieldsPlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilObjectCustomUserFieldsPlaceholderDescription.php @@ -58,7 +58,7 @@ public function createPlaceholderHtmlDescription(): string 'tpl.common_desc.html', true, true, - 'Services/Certificate' + 'components/ILIAS/Certificate' ); foreach ($this->getPlaceholderDescriptions() as $key => $field) { diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilScormPlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilScormPlaceholderDescription.php index ea92229111f9..9595d8c92239 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilScormPlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilScormPlaceholderDescription.php @@ -78,7 +78,7 @@ public function __construct( public function createPlaceholderHtmlDescription(ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.scorm_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.scorm_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setCurrentBlock('items'); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilStudyProgrammePlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilStudyProgrammePlaceholderDescription.php index 6a059d19882d..8b86f7c109d5 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilStudyProgrammePlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilStudyProgrammePlaceholderDescription.php @@ -61,7 +61,7 @@ public function __construct( public function createPlaceholderHtmlDescription(?ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable("PLACEHOLDER_INTRODUCTION", $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php index 59c74d197d32..e566319a199b 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilTestPlaceholderDescription.php @@ -86,7 +86,7 @@ public function __construct( public function createPlaceholderHtmlDescription(?ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable('PLACEHOLDER_INTRODUCTION', $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilUserDefinedFieldsPlaceholderDescription.php b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilUserDefinedFieldsPlaceholderDescription.php index 4183bc96225c..19d098f6402e 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilUserDefinedFieldsPlaceholderDescription.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Description/class.ilUserDefinedFieldsPlaceholderDescription.php @@ -62,7 +62,7 @@ public function createPlaceholderHtmlDescription(): string 'tpl.common_desc.html', true, true, - 'Services/Certificate' + 'components/ILIAS/Certificate' ); foreach ($this->getPlaceholderDescriptions() as $key => $field) { diff --git a/components/ILIAS/Certificate/classes/Placeholder/Values/class.ilDefaultPlaceholderValues.php b/components/ILIAS/Certificate/classes/Placeholder/Values/class.ilDefaultPlaceholderValues.php index 6ba1e50b1ec8..8ee26b09a6d3 100644 --- a/components/ILIAS/Certificate/classes/Placeholder/Values/class.ilDefaultPlaceholderValues.php +++ b/components/ILIAS/Certificate/classes/Placeholder/Values/class.ilDefaultPlaceholderValues.php @@ -18,7 +18,7 @@ declare(strict_types=1); -require_once 'Services/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE +require_once 'components/ILIAS/Calendar/classes/class.ilDateTime.php'; // Required because of global contant IL_CAL_DATE /** * Collection of basic placeholder values that can be used diff --git a/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php b/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php index b09c1c3b70b5..afd6dc7abad4 100644 --- a/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php +++ b/components/ILIAS/Certificate/classes/class.ilCertificateAppEventListener.php @@ -76,7 +76,7 @@ public function withParameters(array $parameters): self protected function isLearningAchievementEvent(): bool { return ( - $this->component === 'Services/Tracking' && + $this->component === 'components/ILIAS/Tracking' && $this->event === 'updateStatus' ); } @@ -84,7 +84,7 @@ protected function isLearningAchievementEvent(): bool protected function isUserDeletedEvent(): bool { return ( - $this->component === 'Services/User' && + $this->component === 'components/ILIAS/User' && $this->event === 'deleteUser' ); } diff --git a/components/ILIAS/Certificate/classes/class.ilCertificateCron.php b/components/ILIAS/Certificate/classes/class.ilCertificateCron.php index c1c354c74b61..495f022a0b24 100644 --- a/components/ILIAS/Certificate/classes/class.ilCertificateCron.php +++ b/components/ILIAS/Certificate/classes/class.ilCertificateCron.php @@ -299,7 +299,7 @@ public function processEntry(int $entryCounter, ilCertificateQueueEntry $entry, } $this->dic->event()->raise( - 'Services/Certificate', + 'components/ILIAS/Certificate', 'certificateIssued', ['certificate' => $persistedUserCertificate] ); diff --git a/components/ILIAS/Certificate/classes/class.ilCertificateGUI.php b/components/ILIAS/Certificate/classes/class.ilCertificateGUI.php index 836483e8868b..1aaa2293d459 100644 --- a/components/ILIAS/Certificate/classes/class.ilCertificateGUI.php +++ b/components/ILIAS/Certificate/classes/class.ilCertificateGUI.php @@ -32,7 +32,7 @@ * GUI class to create PDF certificates * @author Helmut Schottmüller * @version $Id$ - * @ingroup Services + * @ingroup components/ILIAS * @ilCtrl_Calls ilCertificateGUI: ilPropertyFormGUI */ class ilCertificateGUI diff --git a/components/ILIAS/Certificate/test/UserCertificateAPITest.php b/components/ILIAS/Certificate/test/UserCertificateAPITest.php index be9a3f536aa9..3ddf4763c424 100644 --- a/components/ILIAS/Certificate/test/UserCertificateAPITest.php +++ b/components/ILIAS/Certificate/test/UserCertificateAPITest.php @@ -30,7 +30,7 @@ public function testUserDataCall(): void $repository = $this->getMockBuilder(UserDataRepository::class) ->disableOriginalConstructor() ->getMock(); - $logger = new \ILIAS\Services\Logging\NullLogger(); + $logger = new \ILIAS\components\Logging\NullLogger(); $database = $this->createMock(ilDBInterface::class); $userData = new \ILIAS\Certificate\API\Data\UserCertificateDto( diff --git a/components/ILIAS/Chart/classes/class.ilChart.php b/components/ILIAS/Chart/classes/class.ilChart.php index 6c0b5d60bef2..598fe7c77855 100644 --- a/components/ILIAS/Chart/classes/class.ilChart.php +++ b/components/ILIAS/Chart/classes/class.ilChart.php @@ -195,16 +195,16 @@ protected function initJS(): void iljQueryUtil::initjQuery(); - $tpl->addJavaScript("Services/Chart/js/flot/excanvas.min.js"); - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.min.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/excanvas.min.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.min.js"); if ($this->auto_resize) { // #13108 - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.resize.min.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.resize.min.js"); } if ($this->stacked) { - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.stack.min.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.stack.min.js"); } $this->addCustomJS(); @@ -235,7 +235,7 @@ public function getHTML(): string $this->initJS(); - $chart = new ilTemplate("tpl.grid.html", true, true, "Services/Chart"); + $chart = new ilTemplate("tpl.grid.html", true, true, "components/ILIAS/Chart"); $chart->setVariable("ID", $this->id); if ($this->width) { diff --git a/components/ILIAS/Chart/classes/class.ilChartPie.php b/components/ILIAS/Chart/classes/class.ilChartPie.php index a517fc23fe38..06a9740fabac 100644 --- a/components/ILIAS/Chart/classes/class.ilChartPie.php +++ b/components/ILIAS/Chart/classes/class.ilChartPie.php @@ -33,7 +33,7 @@ protected function addCustomJS(): void { $tpl = $this->tpl; - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.pie.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.pie.js"); } public function parseGlobalOptions(stdClass $a_options): void diff --git a/components/ILIAS/Chart/classes/class.ilChartSpider.php b/components/ILIAS/Chart/classes/class.ilChartSpider.php index f78100d6cab2..71e8c82a5e17 100644 --- a/components/ILIAS/Chart/classes/class.ilChartSpider.php +++ b/components/ILIAS/Chart/classes/class.ilChartSpider.php @@ -73,8 +73,8 @@ protected function addCustomJS(): void { $tpl = $this->tpl; - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.highlighter.js"); - $tpl->addJavaScript("Services/Chart/js/flot/jquery.flot.spider.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.highlighter.js"); + $tpl->addJavaScript("components/ILIAS/Chart/js/flot/jquery.flot.spider.js"); } public function parseGlobalOptions(stdClass $a_options): void diff --git a/components/ILIAS/Chart/test/ilServicesChartSuite.php b/components/ILIAS/Chart/test/ilServicesChartSuite.php index a309fa2a2b18..a8549d7918ef 100644 --- a/components/ILIAS/Chart/test/ilServicesChartSuite.php +++ b/components/ILIAS/Chart/test/ilServicesChartSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Chart/test/ChartDataLinesTest.php"); + require_once("./components/ILIAS/Chart/test/ChartDataLinesTest.php"); $suite->addTestSuite("ChartDataLinesTest"); return $suite; diff --git a/components/ILIAS/Chatroom/classes/class.ilChatroomExporter.php b/components/ILIAS/Chatroom/classes/class.ilChatroomExporter.php index 5d944bf75e8f..c93bdacc7282 100644 --- a/components/ILIAS/Chatroom/classes/class.ilChatroomExporter.php +++ b/components/ILIAS/Chatroom/classes/class.ilChatroomExporter.php @@ -49,7 +49,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ('chtr' === $a_entity) { $deps[] = [ - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'entity' => 'common', 'ids' => $a_ids ]; diff --git a/components/ILIAS/Chatroom/classes/class.ilChatroomImporter.php b/components/ILIAS/Chatroom/classes/class.ilChatroomImporter.php index 040baed25259..57d5d0cbcad9 100644 --- a/components/ILIAS/Chatroom/classes/class.ilChatroomImporter.php +++ b/components/ILIAS/Chatroom/classes/class.ilChatroomImporter.php @@ -25,7 +25,7 @@ class ilChatroomImporter extends ilXmlImporter { public function importXmlRepresentation(string $a_entity, string $a_id, string $a_xml, ilImportMapping $a_mapping): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $newObj = new ilObjChatroom(); diff --git a/components/ILIAS/Chatroom/classes/gui/class.ilChatroomViewGUI.php b/components/ILIAS/Chatroom/classes/gui/class.ilChatroomViewGUI.php index 5bc536d1bf31..3ddd2c740848 100644 --- a/components/ILIAS/Chatroom/classes/gui/class.ilChatroomViewGUI.php +++ b/components/ILIAS/Chatroom/classes/gui/class.ilChatroomViewGUI.php @@ -81,7 +81,7 @@ private function setupTemplate(): void $this->mainTpl->addJavaScript('components/ILIAS/Chatroom/js/chat.js'); $this->mainTpl->addJavaScript('components/ILIAS/Chatroom/js/iliaschat.jquery.js'); $this->mainTpl->addJavaScript('node_modules/jquery-outside-events/jquery.ba-outside-events.js'); - $this->mainTpl->addJavaScript('./Services/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js'); + $this->mainTpl->addJavaScript('./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js'); $this->mainTpl->addCss('components/ILIAS/Chatroom/templates/default/style.css'); diff --git a/components/ILIAS/CmiXapi/classes/Certificate/class.ilCmiXapiPlaceholderDescription.php b/components/ILIAS/CmiXapi/classes/Certificate/class.ilCmiXapiPlaceholderDescription.php index 1ad04944d34e..78e878008bdc 100644 --- a/components/ILIAS/CmiXapi/classes/Certificate/class.ilCmiXapiPlaceholderDescription.php +++ b/components/ILIAS/CmiXapi/classes/Certificate/class.ilCmiXapiPlaceholderDescription.php @@ -82,7 +82,7 @@ public function getPlaceholderDescriptions(): array public function createPlaceholderHtmlDescription(ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable('PLACEHOLDER_INTRODUCTION', $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/CmiXapi/classes/XapiProxy/DataService.php b/components/ILIAS/CmiXapi/classes/XapiProxy/DataService.php index 8306c6c4f865..caa706f46fb0 100644 --- a/components/ILIAS/CmiXapi/classes/XapiProxy/DataService.php +++ b/components/ILIAS/CmiXapi/classes/XapiProxy/DataService.php @@ -36,7 +36,7 @@ public static function initIlias(string $client_id): void // define('IL_COOKIE_EXPIRE', 0); // define('IL_COOKIE_PATH', '/'); // define('IL_COOKIE_DOMAIN', ''); - require_once("Services/Init/classes/class.ilInitialisation.php"); + require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); \ilContext::init(\ilContext::CONTEXT_SCORM); \ilInitialisation::initILIAS(); // Remember original values @@ -49,7 +49,7 @@ public static function initIlias(string $client_id): void // $_SERVER['REQUEST_URI'] = ''; // $_SERVER['PHP_SELF'] = '/index.php'; // $_SERVER['HTTP_HOST'] = self::getIniHost(); - // require_once "./Services/Utilities/classes/class.ilUtil.php"; + // require_once "./components/ILIAS/Utilities/classes/class.ilUtil.php"; // //ilInitialisation::initIliasIniFile(); // ilInitialisation::initClientIniFile(); // ilInitialisation::initDatabase(); @@ -86,7 +86,7 @@ public static function initGlobal($a_name, $a_class, $a_source_file = null): voi public static function initDatabase(): void { if (!isset($GLOBALS['ilDB'])) { - parent::initGlobal("ilBench", "ilBenchmark", "./Services/Utilities/classes/class.ilBenchmark.php"); + parent::initGlobal("ilBench", "ilBenchmark", "./components/ILIAS/Utilities/classes/class.ilBenchmark.php"); parent::initDatabase(); } } @@ -122,7 +122,7 @@ public static function initLog(): void { if (!isset($GLOBALS['ilLog'])) { parent::initLog(); - parent::initGlobal("ilAppEventHandler", "ilAppEventHandler", "./Services/EventHandling/classes/class.ilAppEventHandler.php"); + parent::initGlobal("ilAppEventHandler", "ilAppEventHandler", "./components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php"); } } } diff --git a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiAppEventListener.php b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiAppEventListener.php index 8f8d11254bfa..574823533a25 100644 --- a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiAppEventListener.php +++ b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiAppEventListener.php @@ -33,12 +33,12 @@ class ilCmiXapiAppEventListener public static function handleEvent(string $component, string $event, array $parameter): void { switch ($component) { - case "Services/User": + case "components/ILIAS/User": if ($event == "deleteUser") { self::onServiceUserDeleteUser($parameter); } break; - case "Services/Object": + case "components/ILIAS/Object": switch ($event) { case "delete": case "toTrash": diff --git a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDataSet.php b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDataSet.php index aa128f1bd1f5..da11c1b26681 100644 --- a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDataSet.php +++ b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiDataSet.php @@ -414,7 +414,7 @@ public function importRecord( switch ($a_entity) { case "cmix": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $newObj = new ilObjCmiXapi(); diff --git a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiImporter.php b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiImporter.php index 1d7fab1830e5..299b36339ef5 100644 --- a/components/ILIAS/CmiXapi/classes/class.ilCmiXapiImporter.php +++ b/components/ILIAS/CmiXapi/classes/class.ilCmiXapiImporter.php @@ -80,7 +80,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ $this->_import_objId = $a_id; $this->_mapping = $a_mapping; - if ($this->_newId = $a_mapping->getMapping('Services/Container', 'objs', (string) $this->_import_objId)) { + if ($this->_newId = $a_mapping->getMapping('components/ILIAS/Container', 'objs', (string) $this->_import_objId)) { // container content $this->prepareContainerObject(); $this->getImportDirectoryContainer(); @@ -123,7 +123,7 @@ private function prepareSingleObject(): self */ private function prepareContainerObject(): void { - $this->_newId = $this->_mapping->getMapping('Services/Container', 'objs', (string) $this->_import_objId); + $this->_newId = $this->_mapping->getMapping('components/ILIAS/Container', 'objs', (string) $this->_import_objId); if (!is_null($this->_newId) && $this->_newId != "") { // container content $this->_cmixObj = ilObjectFactory::getInstanceByObjId((int) $this->_newId, false); diff --git a/components/ILIAS/CmiXapi/xapiproxy.php b/components/ILIAS/CmiXapi/xapiproxy.php index 121772476053..8d25ed3aeb59 100644 --- a/components/ILIAS/CmiXapi/xapiproxy.php +++ b/components/ILIAS/CmiXapi/xapiproxy.php @@ -73,7 +73,7 @@ } else { chdir("../../../"); } -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); //instead of DataService \ilContext::init(\ilContext::CONTEXT_SCORM); \ilInitialisation::initILIAS(); diff --git a/components/ILIAS/Component/artifacts/component_data.php b/components/ILIAS/Component/artifacts/component_data.php index 4a6aeae95606..9aacc2dd2197 100644 --- a/components/ILIAS/Component/artifacts/component_data.php +++ b/components/ILIAS/Component/artifacts/component_data.php @@ -473,7 +473,7 @@ ), 'exp' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Export', 2 => array ( @@ -481,23 +481,15 @@ ), 'init' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Init', 2 => array ( ), ), - 'bgtk' => - array ( - 0 => 'Services', - 1 => 'BackgroundTasks', - 2 => - array ( - ), - ), 'dash' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Dashboard', 2 => array ( @@ -505,7 +497,7 @@ ), 'styl' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Style', 2 => array ( @@ -513,7 +505,7 @@ ), 'ac' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'AccessControl', 2 => array ( @@ -521,7 +513,7 @@ ), 'adms' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Administration', 2 => array ( @@ -529,7 +521,7 @@ ), 'link' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Link', 2 => array ( @@ -537,7 +529,7 @@ ), 'wsrv' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'WebServices', 2 => array ( @@ -550,7 +542,7 @@ ), 'cntr' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'ContainerReference', 2 => array ( @@ -558,7 +550,7 @@ ), 'mme' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'MainMenu', 2 => array ( @@ -566,7 +558,7 @@ ), 'task' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Tasks', 2 => array ( @@ -574,7 +566,7 @@ ), 'ps' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'PrivacySecurity', 2 => array ( @@ -582,7 +574,7 @@ ), 'rnd' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Randomization', 2 => array ( @@ -590,7 +582,7 @@ ), 'skll' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Skill', 2 => array ( @@ -598,7 +590,7 @@ ), 'awrn' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Awareness', 2 => array ( @@ -606,7 +598,7 @@ ), 'rep' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Repository', 2 => array ( @@ -619,7 +611,7 @@ ), 'db' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Database', 2 => array ( @@ -627,7 +619,7 @@ ), 'badge' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Badge', 2 => array ( @@ -635,7 +627,7 @@ ), 'ltis' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'LTI', 2 => array ( @@ -643,7 +635,7 @@ ), 'noti' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Notification', 2 => array ( @@ -651,7 +643,7 @@ ), 'sysc' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'SystemCheck', 2 => array ( @@ -659,7 +651,7 @@ ), 'shiba' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'AuthShibboleth', 2 => array ( @@ -672,7 +664,7 @@ ), 'mob' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'MediaObjects', 2 => array ( @@ -680,7 +672,7 @@ ), 'user' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'User', 2 => array ( @@ -698,7 +690,7 @@ ), 'note' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Notes', 2 => array ( @@ -706,15 +698,23 @@ ), 'comp' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Component', 2 => array ( ), ), + 'irss' => + array ( + 0 => 'components/ILIAS', + 1 => 'ResourceStorage_', + 2 => + array ( + ), + ), 'impr' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Imprint', 2 => array ( @@ -722,7 +722,7 @@ ), 'tos' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'TermsOfService', 2 => array ( @@ -730,7 +730,7 @@ ), 'evnt' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'EventHandling', 2 => array ( @@ -743,7 +743,7 @@ ), 'wopi' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'WOPI', 2 => array ( @@ -751,7 +751,7 @@ ), 'tax' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Taxonomy', 2 => array ( @@ -759,7 +759,7 @@ ), 'lhist' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'LearningHistory', 2 => array ( @@ -767,7 +767,7 @@ ), 'mail' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Mail', 2 => array ( @@ -775,7 +775,7 @@ ), 'help' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Help', 2 => array ( @@ -783,7 +783,7 @@ ), 'saml' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Saml', 2 => array ( @@ -791,7 +791,7 @@ ), 'osch' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'OnScreenChat', 2 => array ( @@ -799,7 +799,7 @@ ), 'data_pro' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'DataProtection', 2 => array ( @@ -807,7 +807,7 @@ ), 'adn' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'AdministrativeNotification', 2 => array ( @@ -815,7 +815,7 @@ ), 'otpl' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'DidacticTemplate', 2 => array ( @@ -823,7 +823,7 @@ ), 'cert' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Certificate', 2 => array ( @@ -831,7 +831,7 @@ ), 'cron' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Cron', 2 => array ( @@ -844,7 +844,7 @@ ), 'mmbr' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Membership', 2 => array ( @@ -852,7 +852,7 @@ ), 'ldap' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'LDAP', 2 => array ( @@ -863,25 +863,25 @@ ), ), ), - 'meta' => + 'lang' => array ( - 0 => 'Services', - 1 => 'MetaData', + 0 => 'components/ILIAS', + 1 => 'Language_', 2 => array ( ), ), - 'lang' => + 'meta' => array ( - 0 => 'Services', - 1 => 'Language', + 0 => 'components/ILIAS', + 1 => 'MetaData', 2 => array ( ), ), 'copg' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'COPage', 2 => array ( @@ -894,7 +894,7 @@ ), 'fils' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'FileServices', 2 => array ( @@ -902,7 +902,7 @@ ), 'nota' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Notifications', 2 => array ( @@ -910,7 +910,7 @@ ), 'news' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'News', 2 => array ( @@ -918,7 +918,7 @@ ), 'auth' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Authentication', 2 => array ( @@ -931,23 +931,15 @@ ), 'contact' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Contact', 2 => array ( ), ), - 'irss' => - array ( - 0 => 'Services', - 1 => 'ResourceStorage', - 2 => - array ( - ), - ), 'cal' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Calendar', 2 => array ( @@ -965,7 +957,7 @@ ), 'ldoc' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'LegalDocuments', 2 => array ( @@ -973,7 +965,7 @@ ), 'ds' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'DataSet', 2 => array ( @@ -981,7 +973,7 @@ ), 'cont' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Container', 2 => array ( @@ -989,7 +981,7 @@ ), 'ui' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'UIComponent', 2 => array ( @@ -1002,7 +994,7 @@ ), 'amet' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'AdvancedMetaData', 2 => array ( @@ -1015,7 +1007,7 @@ ), 'pdfg' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'PDFGeneration', 2 => array ( @@ -1028,7 +1020,7 @@ ), 'tree' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Tree', 2 => array ( @@ -1036,7 +1028,7 @@ ), 'table' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Table', 2 => array ( @@ -1044,7 +1036,7 @@ ), 'oidc' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'OpenIdConnect', 2 => array ( @@ -1052,7 +1044,7 @@ ), 'filesys' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'FileSystem', 2 => array ( @@ -1060,7 +1052,7 @@ ), 'trac' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Tracking', 2 => array ( @@ -1068,7 +1060,7 @@ ), 'pwsp' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'PersonalWorkspace', 2 => array ( @@ -1076,7 +1068,7 @@ ), 'acc' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Accessibility', 2 => array ( @@ -1084,7 +1076,7 @@ ), 'obj' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Object', 2 => array ( @@ -1092,7 +1084,7 @@ ), 'accrdn' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Accordion', 2 => array ( @@ -1100,7 +1092,7 @@ ), 'adve' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'AdvancedEditing', 2 => array ( @@ -1108,7 +1100,7 @@ ), 'wbdv' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'WebDAV', 2 => array ( @@ -1116,7 +1108,7 @@ ), 'wfe' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'WorkflowEngine', 2 => array ( @@ -1129,7 +1121,7 @@ ), 'src' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Search', 2 => array ( @@ -1137,7 +1129,7 @@ ), 'tag' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Tagging', 2 => array ( @@ -1145,15 +1137,23 @@ ), 'log' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'Logging', 2 => array ( ), ), + 'bgtk' => + array ( + 0 => 'components/ILIAS', + 1 => 'BackgroundTasks_', + 2 => + array ( + ), + ), 'msta' => array ( - 0 => 'Services', + 0 => 'components/ILIAS', 1 => 'MyStaff', 2 => array ( diff --git a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettings.php b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettings.php index 0dd8ed8eba50..7776f72a3955 100644 --- a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettings.php +++ b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettings.php @@ -16,7 +16,7 @@ ******************************************************************** */ -require_once "./Services/Object/classes/class.ilObject.php"; +require_once "./components/ILIAS/Object/classes/class.ilObject.php"; /** * Settings for components (modules, services, plugins). diff --git a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsAccess.php b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsAccess.php index c834f0e011e8..d3626859b1d9 100644 --- a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsAccess.php +++ b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsAccess.php @@ -16,7 +16,7 @@ ******************************************************************** */ -include_once("./Services/Object/classes/class.ilObjectAccess.php"); +include_once("./components/ILIAS/Object/classes/class.ilObjectAccess.php"); /** * Class ilObjComponentSettingsAccess diff --git a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsGUI.php b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsGUI.php index 1f90f60dc3f7..72961392cc60 100644 --- a/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsGUI.php +++ b/components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsGUI.php @@ -333,7 +333,7 @@ public function getAdminTabs(): void if ( $this->request_wrapper->has(self::P_CTYPE) && - $this->request_wrapper->retrieve(self::P_CTYPE, $this->refinery->kindlyTo()->string()) === "Services" + $this->request_wrapper->retrieve(self::P_CTYPE, $this->refinery->kindlyTo()->string()) === "components/ILIAS" ) { $this->tabs_gui->activateTab("services"); } diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php b/components/ILIAS/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php index bd34345364d9..12e8052d7433 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentActivatePluginsObjective.php @@ -20,7 +20,7 @@ use ILIAS\Setup; use ILIAS\DI; -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; class ilComponentActivatePluginsObjective implements Setup\Objective { @@ -176,7 +176,7 @@ public function __construct() } if (!defined("ILIAS_WEB_DIR")) { - define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/"); + define('ILIAS_WEB_DIR', dirname(__DIR__, 5) . "/data/"); } return $DIC; diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentBuildPluginInfoObjective.php b/components/ILIAS/Component/classes/Setup/class.ilComponentBuildPluginInfoObjective.php index 98cd6569c035..f580e75594cd 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentBuildPluginInfoObjective.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentBuildPluginInfoObjective.php @@ -33,7 +33,7 @@ public function getArtifactPath(): string public function build(): Setup\Artifact { $data = []; - foreach (["components/ILIAS", "Services"] as $type) { + foreach (["components/ILIAS"] as $type) { $components = $this->scanDir(static::BASE_PATH . $type); foreach ($components as $component) { if ($this->isDotFile($component) diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentDefinitionsStoredObjective.php b/components/ILIAS/Component/classes/Setup/class.ilComponentDefinitionsStoredObjective.php index c580f142165d..88638d83065d 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentDefinitionsStoredObjective.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentDefinitionsStoredObjective.php @@ -135,7 +135,7 @@ public function write(): void define("ILIAS_LOG_ENABLED", false); } if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } $reader = new \ilComponentDefinitionReader( diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentInfoDefinitionProcessor.php b/components/ILIAS/Component/classes/Setup/class.ilComponentInfoDefinitionProcessor.php index 3a1227979398..2a5c2fb27374 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentInfoDefinitionProcessor.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentInfoDefinitionProcessor.php @@ -56,7 +56,7 @@ public function beginTag(string $name, array $attributes): void if ($name === "module") { $type = "components/ILIAS"; } elseif ($name === "service") { - $type = "Services"; + $type = "components/ILIAS"; } elseif ($name === "pluginslot") { $type = null; } else { diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentInstallPluginObjective.php b/components/ILIAS/Component/classes/Setup/class.ilComponentInstallPluginObjective.php index ec28ebe7cc5b..de13d8b5e9ad 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentInstallPluginObjective.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentInstallPluginObjective.php @@ -21,7 +21,7 @@ use ILIAS\Setup; use ILIAS\DI; use ILIAS\Setup\Objective\ClientIdReadObjective; -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; class ilComponentInstallPluginObjective implements Setup\Objective { @@ -184,7 +184,7 @@ public function __construct() } if (!defined("ILIAS_WEB_DIR")) { - define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/"); + define('ILIAS_WEB_DIR', dirname(__DIR__, 5) . "/data/"); } return $DIC; diff --git a/components/ILIAS/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php b/components/ILIAS/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php index 129164acd86e..fa29417a44ba 100644 --- a/components/ILIAS/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php +++ b/components/ILIAS/Component/classes/Setup/class.ilComponentUpdatePluginObjective.php @@ -21,7 +21,7 @@ use ILIAS\Setup; use ILIAS\DI; use ILIAS\Setup\Objective\ClientIdReadObjective; -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; class ilComponentUpdatePluginObjective implements Setup\Objective { @@ -196,7 +196,7 @@ public function __construct() }; if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } if (!defined('SYSTEM_ROLE_ID')) { @@ -208,7 +208,7 @@ public function __construct() } if (!defined("ILIAS_WEB_DIR")) { - define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/"); + define('ILIAS_WEB_DIR', dirname(__DIR__, 5) . "/data/"); } return [$ORIG_DIC, $ORIG_ilDB]; diff --git a/components/ILIAS/Component/classes/class.ilArtifactComponentRepository.php b/components/ILIAS/Component/classes/class.ilArtifactComponentRepository.php index be4e1a208b4b..984c158970c3 100644 --- a/components/ILIAS/Component/classes/class.ilArtifactComponentRepository.php +++ b/components/ILIAS/Component/classes/class.ilArtifactComponentRepository.php @@ -25,8 +25,8 @@ */ class ilArtifactComponentRepository implements ilComponentRepositoryWrite { - public const COMPONENT_DATA_PATH = "Services/Component/artifacts/component_data.php"; - public const PLUGIN_DATA_PATH = "Services/Component/artifacts/plugin_data.php"; + public const COMPONENT_DATA_PATH = "components/ILIAS/Component/artifacts/component_data.php"; + public const PLUGIN_DATA_PATH = "components/ILIAS/Component/artifacts/plugin_data.php"; protected Data\Factory $data_factory; protected ilPluginStateDB $plugin_state_db; @@ -53,8 +53,7 @@ protected function buildDatabase(): void $plugin_data = $this->readPluginData(); $this->components = []; $this->component_id_by_type_and_name = [ - "components/ILIAS" => [], - "Services" => [] + "components/ILIAS" => [] ]; $this->pluginslot_by_id = []; $plugins_per_slot = []; diff --git a/components/ILIAS/Component/classes/class.ilComponentDefinitionReader.php b/components/ILIAS/Component/classes/class.ilComponentDefinitionReader.php index 5e121aab2423..809341f23b86 100644 --- a/components/ILIAS/Component/classes/class.ilComponentDefinitionReader.php +++ b/components/ILIAS/Component/classes/class.ilComponentDefinitionReader.php @@ -116,7 +116,7 @@ protected function getComponents(): \Iterator foreach ($this->getComponentInfo("components/ILIAS", "module.xml") as $i) { yield $i; } - foreach ($this->getComponentInfo("Services", "service.xml") as $i) { + foreach ($this->getComponentInfo("components/ILIAS", "service.xml") as $i) { yield $i; } } @@ -126,7 +126,7 @@ protected function getComponents(): \Iterator */ protected function getComponentInfo(string $type, string $name): \Iterator { - $dir = __DIR__ . "/../../../" . $type; + $dir = __DIR__ . "/../../../../" . $type; foreach ($this->getComponentPaths($dir, $name) as $c) { yield [ $type, diff --git a/components/ILIAS/Component/classes/class.ilComponentInfo.php b/components/ILIAS/Component/classes/class.ilComponentInfo.php index 984b6f993412..927a22077da7 100644 --- a/components/ILIAS/Component/classes/class.ilComponentInfo.php +++ b/components/ILIAS/Component/classes/class.ilComponentInfo.php @@ -24,9 +24,9 @@ class ilComponentInfo { // TODO: to be replaced with an enum for PHP 8.1... - public const TYPES = ["components/ILIAS", "Services"]; + public const TYPES = ["components/ILIAS"]; public const TYPE_MODULES = "components/ILIAS"; - public const TYPE_SERVICES = "Services"; + public const TYPE_SERVICES = "components/ILIAS"; protected string $id; protected string $type; diff --git a/components/ILIAS/Component/classes/class.ilPluginLP.php b/components/ILIAS/Component/classes/class.ilPluginLP.php index 5bd7799a4cce..5bcb8e44cc89 100644 --- a/components/ILIAS/Component/classes/class.ilPluginLP.php +++ b/components/ILIAS/Component/classes/class.ilPluginLP.php @@ -16,7 +16,7 @@ ******************************************************************** */ -include_once "Services/Object/classes/class.ilObjectLP.php"; +include_once "components/ILIAS/Object/classes/class.ilObjectLP.php"; /** * Plugin to lp connector diff --git a/components/ILIAS/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php b/components/ILIAS/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php index ffb5622ad930..2e0ca42970a1 100644 --- a/components/ILIAS/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php +++ b/components/ILIAS/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php @@ -85,7 +85,7 @@ public function testScanningTopLevel(): void { $this->builder->build(); - $expected = ["components/ILIAS", "Services"]; + $expected = ["components/ILIAS"]; sort($expected); sort($this->scanned); $this->assertEquals($expected, $this->scanned); @@ -95,17 +95,17 @@ public function testScanningComplete(): void { $this->dirs = [ "components/ILIAS" => ["Module1", "Module2"], - "Services" => ["Service1"], + "components/ILIAS" => ["Service1"], "components/ILIAS/Module1" => ["Slot1", "Slot2"], "components/ILIAS/Module2" => [], - "Services/Service1" => ["Slot3",".DS_Store"] // .DS_Store should be skipped + "components/ILIAS/Service1" => ["Slot3",".DS_Store"] // .DS_Store should be skipped ]; $this->builder->build(); - $expected = ["components/ILIAS", "Services", "components/ILIAS/Module1", "components/ILIAS/Module2", - "Services/Service1", "components/ILIAS/Module1/Slot1", "components/ILIAS/Module1/Slot2", - "Services/Service1/Slot3"]; + $expected = ["components/ILIAS", "components/ILIAS", "components/ILIAS/Module1", "components/ILIAS/Module2", + "components/ILIAS/Service1", "components/ILIAS/Module1/Slot1", "components/ILIAS/Module1/Slot2", + "components/ILIAS/Service1/Slot3"]; sort($expected); sort($this->scanned); $this->assertEquals($expected, $this->scanned); @@ -115,11 +115,11 @@ public function testPluginsAdded(): void { $this->dirs = [ "components/ILIAS" => ["Module1"], - "Services" => ["Service1"], + "components/ILIAS" => ["Service1"], "components/ILIAS/Module1" => ["Slot1"], - "Services/Service1" => ["Slot2"], + "components/ILIAS/Service1" => ["Slot2"], "components/ILIAS/Module1/Slot1" => ["Plugin1", "Plugin2"], - "Services/Service1/Slot2" => ["Plugin3"] + "components/ILIAS/Service1/Slot2" => ["Plugin3"] ]; $this->builder->build(); @@ -127,7 +127,7 @@ public function testPluginsAdded(): void $expected = [ "components/ILIAS/Module1/Slot1/Plugin1", "components/ILIAS/Module1/Slot1/Plugin2", - "Services/Service1/Slot2/Plugin3" + "components/ILIAS/Service1/Slot2/Plugin3" ]; sort($expected); sort($this->added); diff --git a/components/ILIAS/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php b/components/ILIAS/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php index 91ac461895f5..5737c5919265 100644 --- a/components/ILIAS/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php +++ b/components/ILIAS/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php @@ -48,7 +48,7 @@ public function testBeginTag(): void $name2 = "NAME2"; $id2 = "ID2"; - $type2 = "Services"; + $type2 = "components/ILIAS"; $name3 = "NAME3"; $id3 = "ID3"; $name4 = "NAME4"; @@ -90,7 +90,7 @@ public function testTagComponentTypeMismatch(): void { $this->expectException(\InvalidArgumentException::class); - $type = "Services"; + $type = "components/ILIAS"; $name = "NAME"; $id = "ID"; @@ -102,7 +102,7 @@ public function testMissingId(): void { $this->expectException(\InvalidArgumentException::class); - $type = "Services"; + $type = "components/ILIAS"; $name = "NAME"; $this->processor->beginComponent($name, $type); diff --git a/components/ILIAS/Component/test/ilArtifactComponentRepositoryTest.php b/components/ILIAS/Component/test/ilArtifactComponentRepositoryTest.php index 7c7da41bae84..c8982a9f3d53 100644 --- a/components/ILIAS/Component/test/ilArtifactComponentRepositoryTest.php +++ b/components/ILIAS/Component/test/ilArtifactComponentRepositoryTest.php @@ -28,10 +28,10 @@ class ilArtifactComponentRepositoryTest extends TestCase ]], "mod2" => ["components/ILIAS", "Module2", [ ]], - "ser1" => ["Services", "Service1", [ + "ser1" => ["components/ILIAS", "Service1", [ ["slt3", "Slot3"] ]], - "ser2" => ["Services", "Service2", [ + "ser2" => ["components/ILIAS", "Service2", [ ["slt4", "Slot4"] ]] ]; @@ -52,7 +52,7 @@ class ilArtifactComponentRepositoryTest extends TestCase null ], "plg2" => [ - "Services", + "components/ILIAS", "Service2", "Slot4", "Plugin2", @@ -177,7 +177,7 @@ public function _buildDatabase(): void $slots3 = []; $this->ser1 = new ilComponentInfo( "ser1", - "Services", + "components/ILIAS", "Service1", $slots3 ); @@ -194,7 +194,7 @@ public function _buildDatabase(): void $slots4 = []; $this->ser2 = new ilComponentInfo( "ser2", - "Services", + "components/ILIAS", "Service2", $slots4 ); @@ -230,12 +230,12 @@ public function testHasComponent(): void { $this->assertTrue($this->db->hasComponent("components/ILIAS", "Module1")); $this->assertTrue($this->db->hasComponent("components/ILIAS", "Module2")); - $this->assertTrue($this->db->hasComponent("Services", "Service1")); - $this->assertTrue($this->db->hasComponent("Services", "Service2")); + $this->assertTrue($this->db->hasComponent("components/ILIAS", "Service1")); + $this->assertTrue($this->db->hasComponent("components/ILIAS", "Service2")); $this->assertFalse($this->db->hasComponent("components/ILIAS", "Module3")); $this->assertFalse($this->db->hasComponent("components/ILIAS", "Module4")); - $this->assertFalse($this->db->hasComponent("Services", "Service3")); - $this->assertFalse($this->db->hasComponent("Services", "Service4")); + $this->assertFalse($this->db->hasComponent("components/ILIAS", "Service3")); + $this->assertFalse($this->db->hasComponent("components/ILIAS", "Service4")); } public function testHasComponentThrowsOnUnknownType(): void @@ -285,8 +285,8 @@ public function testGetComponentByTypeAndName(): void { $this->assertEquals($this->mod1, $this->db->getComponentByTypeAndName("components/ILIAS", "Module1")); $this->assertEquals($this->mod2, $this->db->getComponentByTypeAndName("components/ILIAS", "Module2")); - $this->assertEquals($this->ser1, $this->db->getComponentByTypeAndName("Services", "Service1")); - $this->assertEquals($this->ser2, $this->db->getComponentByTypeAndName("Services", "Service2")); + $this->assertEquals($this->ser1, $this->db->getComponentByTypeAndName("components/ILIAS", "Service1")); + $this->assertEquals($this->ser2, $this->db->getComponentByTypeAndName("components/ILIAS", "Service2")); } public function testGetComponentByTypeAndNameThrowsOnUnknownComponent1(): void diff --git a/components/ILIAS/Component/test/ilComponentDefinitionReaderTest.php b/components/ILIAS/Component/test/ilComponentDefinitionReaderTest.php index 1746c90d5410..75d67a10966c 100644 --- a/components/ILIAS/Component/test/ilComponentDefinitionReaderTest.php +++ b/components/ILIAS/Component/test/ilComponentDefinitionReaderTest.php @@ -33,7 +33,7 @@ class ilComponentDefinitionReaderTest extends TestCase public static array $components = [ ["components/ILIAS", "A_Module", "/path/to/module.xml"], - ["Services", "A_Service", "/other/path/to/service.xml"] + ["components/ILIAS", "A_Service", "/other/path/to/service.xml"] ]; protected function setUp(): void @@ -101,7 +101,7 @@ public function _getComponents(): array $this->assertIsArray($components); $this->assertContains(["components/ILIAS", "Course", realpath(__DIR__ . "/../../../components/ILIAS/Course/module.xml")], $components); - $this->assertContains(["Services", "Component", realpath(__DIR__ . "/../../../Services/Component/service.xml")], $components); + $this->assertContains(["components/ILIAS", "Component", realpath(__DIR__ . "/../../../Services/Component/service.xml")], $components); } public function testReadComponentDefinitions(): void diff --git a/components/ILIAS/Component/test/ilServicesComponentSuite.php b/components/ILIAS/Component/test/ilServicesComponentSuite.php index 7016a6d991f0..05fed815ea63 100644 --- a/components/ILIAS/Component/test/ilServicesComponentSuite.php +++ b/components/ILIAS/Component/test/ilServicesComponentSuite.php @@ -24,31 +24,31 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Component/test/ilComponentDefinitionReaderTest.php"); + require_once("./components/ILIAS/Component/test/ilComponentDefinitionReaderTest.php"); $suite->addTestSuite(ilComponentDefinitionReaderTest::class); - require_once("./Services/Component/test/ilComponentInfoTest.php"); + require_once("./components/ILIAS/Component/test/ilComponentInfoTest.php"); $suite->addTestSuite(ilComponentInfoTest::class); - require_once("./Services/Component/test/ilPluginSlotInfoTest.php"); + require_once("./components/ILIAS/Component/test/ilPluginSlotInfoTest.php"); $suite->addTestSuite(ilPluginSlotInfoTest::class); - require_once("./Services/Component/test/ilPluginInfoTest.php"); + require_once("./components/ILIAS/Component/test/ilPluginInfoTest.php"); $suite->addTestSuite(ilPluginInfoTest::class); - require_once("./Services/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php"); + require_once("./components/ILIAS/Component/test/Setup/ilComponentDefinitionInfoProcessorTest.php"); $suite->addTestSuite(ilComponentDefinitionInfoProcessorTest::class); - require_once("./Services/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php"); + require_once("./components/ILIAS/Component/test/Setup/ilComponentBuildPluginInfoObjectiveTest.php"); $suite->addTestSuite(ilComponentBuildPluginInfoObjectiveTest::class); - require_once("./Services/Component/test/ilArtifactComponentRepositoryTest.php"); + require_once("./components/ILIAS/Component/test/ilArtifactComponentRepositoryTest.php"); $suite->addTestSuite(ilArtifactComponentRepositoryTest::class); - require_once("./Services/Component/test/ilPluginStateDBOverIlDBInterfaceTest.php"); + require_once("./components/ILIAS/Component/test/ilPluginStateDBOverIlDBInterfaceTest.php"); $suite->addTestSuite(ilPluginStateDBOverIlDBInterfaceTest::class); - require_once("./Services/Component/test/Settings/ilPluginsOverviewTableTest.php"); + require_once("./components/ILIAS/Component/test/Settings/ilPluginsOverviewTableTest.php"); $suite->addTestSuite(ilPluginsOverviewTableTest::class); return $suite; diff --git a/components/ILIAS/Conditions/classes/class.ilConditionHandlerGUI.php b/components/ILIAS/Conditions/classes/class.ilConditionHandlerGUI.php index b41c232f750d..eb83e29d6392 100644 --- a/components/ILIAS/Conditions/classes/class.ilConditionHandlerGUI.php +++ b/components/ILIAS/Conditions/classes/class.ilConditionHandlerGUI.php @@ -290,7 +290,7 @@ protected function listConditions(): void } $this->toolbar->addButton($this->lng->txt('add_condition'), $this->ctrl->getLinkTarget($this, 'selector')); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.list_conditions.html', 'Services/AccessControl'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.list_conditions.html', 'components/ILIAS/AccessControl'); $optional_conditions = ilConditionHandler::getPersistedOptionalConditionsOfTarget( $this->getTargetRefId(), diff --git a/components/ILIAS/Conditions/classes/class.ilConditionHandlerTableGUI.php b/components/ILIAS/Conditions/classes/class.ilConditionHandlerTableGUI.php index 7e4b840e53b3..591c1a9532d7 100644 --- a/components/ILIAS/Conditions/classes/class.ilConditionHandlerTableGUI.php +++ b/components/ILIAS/Conditions/classes/class.ilConditionHandlerTableGUI.php @@ -125,7 +125,7 @@ protected function initTable(): void { $this->lng->loadLanguageModule('rbac'); - $this->setRowTemplate('tpl.condition_handler_row.html', 'Services/Conditions'); + $this->setRowTemplate('tpl.condition_handler_row.html', 'components/ILIAS/Conditions'); $this->setTitle($this->lng->txt('active_preconditions')); $this->addColumn('', '', '1'); $this->addColumn($this->lng->txt('rbac_precondition_source'), 'title', '66%'); diff --git a/components/ILIAS/Conditions/test/ilServicesConditionsSuite.php b/components/ILIAS/Conditions/test/ilServicesConditionsSuite.php index 22208789b08c..ca0e71b81a22 100644 --- a/components/ILIAS/Conditions/test/ilServicesConditionsSuite.php +++ b/components/ILIAS/Conditions/test/ilServicesConditionsSuite.php @@ -27,7 +27,7 @@ public static function suite(): self { $suite = new ilServicesConditionsSuite(); - include_once("./Services/Conditions/test/ilConditionsTest.php"); + include_once("./components/ILIAS/Conditions/test/ilConditionsTest.php"); $suite->addTestSuite(ilConditionsTest::class); return $suite; } diff --git a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddyList.php b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddyList.php index fcb4204337fb..de7c4e92b24c 100644 --- a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddyList.php +++ b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddyList.php @@ -256,7 +256,7 @@ public function link(ilBuddySystemRelation $relation): self $this->getRelations()->set($this->getRelationTargetUserId($relation), $relation); $this->eventHandler->raise( - 'Services/Contact', + 'components/ILIAS/Contact', 'relationLinked', [ 'relation' => $relation @@ -284,7 +284,7 @@ public function unlink(ilBuddySystemRelation $relation): self } $this->eventHandler->raise( - 'Services/Contact', + 'components/ILIAS/Contact', 'relationUnlinked', [ 'relation' => $relation @@ -327,7 +327,7 @@ public function request(ilBuddySystemRelation $relation): self } $this->eventHandler->raise( - 'Services/Contact', + 'components/ILIAS/Contact', 'contactRequested', [ 'usr_id' => $this->getRelationTargetUserId($relation), @@ -365,7 +365,7 @@ public function ignore(ilBuddySystemRelation $relation): self } $this->eventHandler->raise( - 'Services/Contact', + 'components/ILIAS/Contact', 'contactIgnored', [ 'relation' => $relation diff --git a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php index 0302570ef01c..ecd1cbe358b2 100644 --- a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php +++ b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php @@ -67,7 +67,7 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void ) { $DIC->language()->loadLanguageModule('buddysystem'); - $page->addJavaScript('./Services/Contact/BuddySystem/js/buddy_system.js'); + $page->addJavaScript('./components/ILIAS/Contact/BuddySystem/js/buddy_system.js'); $config = new stdClass(); $config->http_post_url = $DIC->ctrl()->getFormActionByClass([ diff --git a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php index 9c10db8ff4ab..36371082a584 100644 --- a/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php +++ b/components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php @@ -77,7 +77,7 @@ public function getHtml(): string 'tpl.buddy_system_link_button.html', true, true, - 'Services/Contact/BuddySystem' + 'components/ILIAS/Contact/BuddySystem' ); $buttonTemplate->setVariable( 'BUTTON_HTML', diff --git a/components/ILIAS/Contact/BuddySystem/classes/states/renderer/class.ilAbstractBuddySystemRelationStateButtonRenderer.php b/components/ILIAS/Contact/BuddySystem/classes/states/renderer/class.ilAbstractBuddySystemRelationStateButtonRenderer.php index da845266866a..32802f0a3344 100644 --- a/components/ILIAS/Contact/BuddySystem/classes/states/renderer/class.ilAbstractBuddySystemRelationStateButtonRenderer.php +++ b/components/ILIAS/Contact/BuddySystem/classes/states/renderer/class.ilAbstractBuddySystemRelationStateButtonRenderer.php @@ -35,7 +35,7 @@ public function __construct(protected int $usrId, protected ilBuddySystemRelatio 'tpl.buddy_system_state_' . ilStr::convertUpperCamelCaseToUnderscoreCase($this->relation->getState()->getName()) . '.html', true, true, - 'Services/Contact/BuddySystem' + 'components/ILIAS/Contact/BuddySystem' ); $this->lng = $lng ?? $DIC['lng']; diff --git a/components/ILIAS/Contact/BuddySystem/classes/tables/class.ilBuddySystemRelationsTableGUI.php b/components/ILIAS/Contact/BuddySystem/classes/tables/class.ilBuddySystemRelationsTableGUI.php index 6cc238f00f46..b5513d6cffe3 100644 --- a/components/ILIAS/Contact/BuddySystem/classes/tables/class.ilBuddySystemRelationsTableGUI.php +++ b/components/ILIAS/Contact/BuddySystem/classes/tables/class.ilBuddySystemRelationsTableGUI.php @@ -75,7 +75,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->addColumn($this->lng->txt('login'), 'login'); $this->addColumn($this->lng->txt('buddy_tbl_state_actions_col_label'), '', '', false, 'ilRight'); - $this->setRowTemplate('tpl.buddy_system_relation_table_row.html', 'Services/Contact/BuddySystem'); + $this->setRowTemplate('tpl.buddy_system_relation_table_row.html', 'components/ILIAS/Contact/BuddySystem'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); $this->setFilterCommand(self::APPLY_FILTER_CMD); @@ -240,7 +240,7 @@ public function render(): string 'tpl.buddy_system_relation_table_listener.html', true, true, - 'Services/Contact/BuddySystem' + 'components/ILIAS/Contact/BuddySystem' ); $listener_tpl->setVariable('TABLE_ID', $this->getId()); $listener_tpl->setVariable('FILTER_ELM_ID', self::STATE_FILTER_ELM_ID); diff --git a/components/ILIAS/Contact/classes/class.ilContactAppEventListener.php b/components/ILIAS/Contact/classes/class.ilContactAppEventListener.php index 5eee9a70efcb..e8ae56b5bd6c 100644 --- a/components/ILIAS/Contact/classes/class.ilContactAppEventListener.php +++ b/components/ILIAS/Contact/classes/class.ilContactAppEventListener.php @@ -31,7 +31,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { global $DIC; - if ('Services/User' === $a_component && 'deleteUser' === $a_event) { + if ('components/ILIAS/User' === $a_component && 'deleteUser' === $a_event) { ilBuddyList::getInstanceByUserId((int) $a_parameter['usr_id'])->destroy(); $user = new ilObjUser(); $user->setId((int) $a_parameter['usr_id']); @@ -40,7 +40,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ $mailingLists->deleteAssignments(); } - if ('Services/Contact' === $a_component && 'contactRequested' === $a_event) { + if ('components/ILIAS/Contact' === $a_component && 'contactRequested' === $a_event) { $notification = new ilBuddySystemNotification($DIC->user(), $DIC->settings()); $notification->setRecipientIds([(int) $a_parameter['usr_id']]); $notification->send(); diff --git a/components/ILIAS/Contact/classes/class.ilMailMemberSearchTableGUI.php b/components/ILIAS/Contact/classes/class.ilMailMemberSearchTableGUI.php index 38231aac103b..3b68897cda9a 100644 --- a/components/ILIAS/Contact/classes/class.ilMailMemberSearchTableGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailMemberSearchTableGUI.php @@ -37,7 +37,7 @@ public function __construct(ilMailMemberSearchGUI $a_parent_obj, string $a_paren $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->ctrl->clearParameters($a_parent_obj); - $this->setRowTemplate('tpl.mail_member_search_row.html', 'Services/Contact'); + $this->setRowTemplate('tpl.mail_member_search_row.html', 'components/ILIAS/Contact'); $this->addColumn('', '', '1%', true); $this->addColumn($this->lng->txt('login'), 'login', '22%'); diff --git a/components/ILIAS/Contact/classes/class.ilMailSearchGUI.php b/components/ILIAS/Contact/classes/class.ilMailSearchGUI.php index f4d7003762c4..c7589e4be394 100644 --- a/components/ILIAS/Contact/classes/class.ilMailSearchGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailSearchGUI.php @@ -259,7 +259,7 @@ public function showResults(): void { $form = $this->initSearchForm(); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_search.html', 'Services/Contact'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_search.html', 'components/ILIAS/Contact'); $this->tpl->setVariable('ACTION', $this->ctrl->getFormAction($this)); $this->tpl->setTitle($this->lng->txt('mail')); $this->tpl->setVariable('SEARCHFORM', $form->getHtml()); @@ -309,7 +309,7 @@ public function showResults(): void $tbl_contacts = new ilMailSearchResultsTableGUI($this, 'showResults', 'contacts'); $tbl_contacts->setTitle($this->lng->txt('mail_addressbook')); - $tbl_contacts->setRowTemplate('tpl.mail_search_addr_row.html', 'Services/Contact'); + $tbl_contacts->setRowTemplate('tpl.mail_search_addr_row.html', 'components/ILIAS/Contact'); $has_mail_addr = false; $result = []; @@ -405,7 +405,7 @@ public function showResults(): void if ($users !== []) { $tbl_users = new ilMailSearchResultsTableGUI($this, 'showResults', 'usr'); $tbl_users->setTitle($this->lng->txt('system') . ': ' . $this->lng->txt('persons')); - $tbl_users->setRowTemplate('tpl.mail_search_users_row.html', 'Services/Contact'); + $tbl_users->setRowTemplate('tpl.mail_search_users_row.html', 'components/ILIAS/Contact'); $result = []; $counter = 0; @@ -489,7 +489,7 @@ public function showResults(): void if ($group_results->getResults()) { $tbl_grp = new ilMailSearchResultsTableGUI($this, 'showResults', 'grp'); $tbl_grp->setTitle($this->lng->txt('system') . ': ' . $this->lng->txt('groups')); - $tbl_grp->setRowTemplate('tpl.mail_search_groups_row.html', 'Services/Contact'); + $tbl_grp->setRowTemplate('tpl.mail_search_groups_row.html', 'components/ILIAS/Contact'); $result = []; $counter = 0; diff --git a/components/ILIAS/Contact/classes/class.ilMailSearchObjectGUI.php b/components/ILIAS/Contact/classes/class.ilMailSearchObjectGUI.php index 70481fdd2d05..f7d4b182984d 100644 --- a/components/ILIAS/Contact/classes/class.ilMailSearchObjectGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailSearchObjectGUI.php @@ -426,7 +426,7 @@ public function showMembers(): void ); $tableData = []; - $searchTpl = new ilTemplate('tpl.mail_search_template.html', true, true, 'Services/Contact'); + $searchTpl = new ilTemplate('tpl.mail_search_template.html', true, true, 'components/ILIAS/Contact'); foreach ($obj_ids as $obj_id) { $members_obj = ilParticipants::getInstanceByObjId($obj_id); $usr_ids = array_map('intval', ilUtil::_sortIds($members_obj->getParticipants(), 'usr_data', 'lastname', 'usr_id')); @@ -485,7 +485,7 @@ public function showMyObjects(): void { $this->tpl->setTitle($this->lng->txt('mail_addressbook')); - $searchTpl = new ilTemplate('tpl.mail_search_template.html', true, true, 'Services/Contact'); + $searchTpl = new ilTemplate('tpl.mail_search_template.html', true, true, 'components/ILIAS/Contact'); $this->lng->loadLanguageModule('crs'); diff --git a/components/ILIAS/Contact/classes/class.ilMailSearchObjectMembershipsTableGUI.php b/components/ILIAS/Contact/classes/class.ilMailSearchObjectMembershipsTableGUI.php index 1e5e8dea255d..ebcb9c1cddb5 100644 --- a/components/ILIAS/Contact/classes/class.ilMailSearchObjectMembershipsTableGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailSearchObjectMembershipsTableGUI.php @@ -119,7 +119,7 @@ public function __construct( $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate('tpl.mail_search_objects_members_row.html', 'Services/Contact'); + $this->setRowTemplate('tpl.mail_search_objects_members_row.html', 'components/ILIAS/Contact'); $this->addColumn('', '', '1%', true); $this->addColumn($this->lng->txt('login'), 'members_login', '22%'); diff --git a/components/ILIAS/Contact/classes/class.ilMailSearchObjectsTableGUI.php b/components/ILIAS/Contact/classes/class.ilMailSearchObjectsTableGUI.php index ac59425b3cd0..8a3f74fc8bc2 100644 --- a/components/ILIAS/Contact/classes/class.ilMailSearchObjectsTableGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailSearchObjectsTableGUI.php @@ -113,7 +113,7 @@ public function __construct($a_parent_obj, string $type = 'crs', string $context $this->ctrl->clearParameters($a_parent_obj); $this->setSelectAllCheckbox($mode["checkbox"] . '[]'); - $this->setRowTemplate('tpl.mail_search_objects_row.html', 'Services/Contact'); + $this->setRowTemplate('tpl.mail_search_objects_row.html', 'components/ILIAS/Contact'); $this->setShowRowsSelector(true); diff --git a/components/ILIAS/Contact/classes/class.ilMailingListsGUI.php b/components/ILIAS/Contact/classes/class.ilMailingListsGUI.php index a74becd61373..bd0efe927d94 100644 --- a/components/ILIAS/Contact/classes/class.ilMailingListsGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailingListsGUI.php @@ -134,7 +134,7 @@ public function confirmDelete(): bool } $this->tpl->setTitle($this->lng->txt('mail_addressbook')); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_list.html', 'Services/Contact'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_list.html', 'components/ILIAS/Contact'); $this->tpl->setVariable('DELETE_CONFIRMATION', $c_gui->getHTML()); $this->tpl->printToStdout(); @@ -225,7 +225,7 @@ public function mailToList(): bool public function showMailingLists(): bool { $this->tpl->setTitle($this->lng->txt('mail_addressbook')); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_list.html', 'Services/Contact'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_list.html', 'components/ILIAS/Contact'); // check if current user may send mails $mail = new ilMail($this->user->getId()); @@ -360,7 +360,7 @@ public function saveForm(): void } $this->tpl->setTitle($this->lng->txt('mail_addressbook')); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_form.html', 'Services/Contact'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_form.html', 'components/ILIAS/Contact'); $this->form_gui->setValuesByPost(); @@ -403,7 +403,7 @@ private function setDefaultValues(): void public function showForm(): void { $this->tpl->setTitle($this->lng->txt('mail_addressbook')); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_form.html', 'Services/Contact'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_form.html', 'components/ILIAS/Contact'); if ($this->mlists->getCurrentMailingList() && $this->mlists->getCurrentMailingList()->getId()) { if (!$this->mlists->isOwner($this->mlists->getCurrentMailingList()->getId(), $this->user->getId())) { @@ -436,7 +436,7 @@ public function showMembersList(): bool 'ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_members.html', - 'Services/Contact' + 'components/ILIAS/Contact' ); $tbl = new ilMailingListsMembersTableGUI($this, 'showMembersList', $this->mlists->getCurrentMailingList()); @@ -538,7 +538,7 @@ public function confirmDeleteMembers(): bool 'ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_members.html', - 'Services/Contact' + 'components/ILIAS/Contact' ); $this->tpl->setVariable('DELETE_CONFIRMATION', $c_gui->getHTML()); @@ -675,7 +675,7 @@ public function showAssignmentForm(?ilPropertyFormGUI $form = null): bool 'ADM_CONTENT', 'adm_content', 'tpl.mail_mailing_lists_members_form.html', - 'Services/Contact' + 'components/ILIAS/Contact' ); if (!($form instanceof ilPropertyFormGUI)) { diff --git a/components/ILIAS/Contact/classes/class.ilMailingListsMembersTableGUI.php b/components/ILIAS/Contact/classes/class.ilMailingListsMembersTableGUI.php index 0e97f1aa3878..41e7f47c5389 100644 --- a/components/ILIAS/Contact/classes/class.ilMailingListsMembersTableGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailingListsMembersTableGUI.php @@ -31,7 +31,7 @@ public function __construct(ilMailingListsGUI $a_parent_obj, string $a_parent_cm $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, 'showMemberForm')); $this->setTitle(sprintf($this->lng->txt('mail_members_of_mailing_list'), $mailing_list->getTitle())); - $this->setRowTemplate('tpl.mail_mailing_lists_membersrow.html', 'Services/Contact'); + $this->setRowTemplate('tpl.mail_mailing_lists_membersrow.html', 'components/ILIAS/Contact'); $this->addCommandButton('showMailingLists', $this->lng->txt('back')); diff --git a/components/ILIAS/Contact/classes/class.ilMailingListsTableGUI.php b/components/ILIAS/Contact/classes/class.ilMailingListsTableGUI.php index df016d7fd01c..e7532ee6ab6d 100644 --- a/components/ILIAS/Contact/classes/class.ilMailingListsTableGUI.php +++ b/components/ILIAS/Contact/classes/class.ilMailingListsTableGUI.php @@ -33,7 +33,7 @@ public function __construct(ilMailingListsGUI $a_parent_obj, string $a_parent_cm $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, 'showForm')); $this->setTitle($this->lng->txt('mail_mailing_lists')); - $this->setRowTemplate('tpl.mail_mailing_lists_listrow.html', 'Services/Contact'); + $this->setRowTemplate('tpl.mail_mailing_lists_listrow.html', 'components/ILIAS/Contact'); $this->setDefaultOrderField('title'); $this->setSelectAllCheckbox('ml_id'); $this->setNoEntriesText($this->lng->txt('mail_search_no')); diff --git a/components/ILIAS/Container/Classification/class.ilClassificationBlockGUI.php b/components/ILIAS/Container/Classification/class.ilClassificationBlockGUI.php index 5e94eab84c58..a197e4dad93a 100644 --- a/components/ILIAS/Container/Classification/class.ilClassificationBlockGUI.php +++ b/components/ILIAS/Container/Classification/class.ilClassificationBlockGUI.php @@ -124,7 +124,7 @@ public function getHTML(): string return ""; } - $tpl->addJavaScript("Services/Container/Classification/js/ilClassification.js"); + $tpl->addJavaScript("components/ILIAS/Container/Classification/js/ilClassification.js"); return parent::getHTML(); } @@ -171,7 +171,7 @@ protected function getLegacyContent(): string $overall_html = ""; if (sizeof($html)) { - $btpl = new ilTemplate("tpl.classification_block.html", true, true, "Services/Container/Classification"); + $btpl = new ilTemplate("tpl.classification_block.html", true, true, "components/ILIAS/Container/Classification"); foreach ($html as $item) { $btpl->setCurrentBlock("provider_chunk_bl"); @@ -231,7 +231,7 @@ protected function filterContainer(): void $has_content = false; - $ltpl = new ilTemplate("tpl.classification_object_list.html", true, true, "Services/Container/Classification"); + $ltpl = new ilTemplate("tpl.classification_object_list.html", true, true, "components/ILIAS/Container/Classification"); if (isset($all_matching_provider_object_ids) && sizeof($all_matching_provider_object_ids)) { $fields = array( diff --git a/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php b/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php index 1ff59b82f0bb..5ee75e1e5d98 100644 --- a/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php +++ b/components/ILIAS/Container/Content/ObjectiveView/class.ObjectiveRenderer.php @@ -668,7 +668,7 @@ public static function renderProgressMeter( ): string { global $DIC; - $tpl = new \ilTemplate("tpl.objective_progressmeter.html", true, true, "Services/Container"); + $tpl = new \ilTemplate("tpl.objective_progressmeter.html", true, true, "components/ILIAS/Container"); $lng = $DIC->language(); $lng->loadLanguageModule('crs'); @@ -899,7 +899,7 @@ protected function buildAccordionTitle( $renderer = $DIC->ui()->renderer(); $ui_factory = $DIC->ui()->factory(); - $tpl = new \ilTemplate("tpl.objective_accordion_title.html", true, true, "Services/Container"); + $tpl = new \ilTemplate("tpl.objective_accordion_title.html", true, true, "components/ILIAS/Container"); if ($a_lo_result) { $tpl->setVariable( @@ -1023,7 +1023,7 @@ protected function buildAccordionTitle( protected function buildAccordionContent(array $a_items): string { - $tpl = new \ilTemplate("tpl.objective_accordion_content.html", true, true, "Services/Container"); + $tpl = new \ilTemplate("tpl.objective_accordion_content.html", true, true, "components/ILIAS/Container"); foreach ($a_items as $item) { $tpl->setCurrentBlock("items_bl"); $tpl->setVariable("ITEM", $item); diff --git a/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php b/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php index 49e3b4b209ad..5b353a07589a 100644 --- a/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php +++ b/components/ILIAS/Container/Content/ObjectiveView/class.ilContainerObjectiveGUI.php @@ -85,7 +85,7 @@ public function getMainContent(): string $ilCtrl = $this->ctrl; $has_results = false; - //$tpl = new ilTemplate("tpl.container_page.html", true, true, "Services/Container"); + //$tpl = new ilTemplate("tpl.container_page.html", true, true, "components/ILIAS/Container"); if ($ilAccess->checkAccess('write', '', $this->getContainerObject()->getRefId())) { // check for results @@ -885,7 +885,7 @@ public static function renderProgressBar( $gui = $DIC->container()->internal()->gui(); - $tpl = new ilTemplate("tpl.objective_progressbar.html", true, true, "Services/Container"); + $tpl = new ilTemplate("tpl.objective_progressbar.html", true, true, "components/ILIAS/Container"); if ($a_perc_result !== null) { $tpl->setCurrentBlock("statusbar_bl"); @@ -971,7 +971,7 @@ public static function renderProgressMeter( ): string { global $DIC; - $tpl = new ilTemplate("tpl.objective_progressmeter.html", true, true, "Services/Container"); + $tpl = new ilTemplate("tpl.objective_progressmeter.html", true, true, "components/ILIAS/Container"); $lng = $DIC->language(); $lng->loadLanguageModule('crs'); @@ -1199,7 +1199,7 @@ protected function buildAccordionTitle( $renderer = $DIC->ui()->renderer(); $ui_factory = $DIC->ui()->factory(); - $tpl = new ilTemplate("tpl.objective_accordion_title.html", true, true, "Services/Container"); + $tpl = new ilTemplate("tpl.objective_accordion_title.html", true, true, "components/ILIAS/Container"); if ($a_lo_result) { $tpl->setVariable( @@ -1323,7 +1323,7 @@ protected function buildAccordionTitle( protected function buildAccordionContent(array $a_items): string { - $tpl = new ilTemplate("tpl.objective_accordion_content.html", true, true, "Services/Container"); + $tpl = new ilTemplate("tpl.objective_accordion_content.html", true, true, "components/ILIAS/Container"); foreach ($a_items as $item) { $tpl->setCurrentBlock("items_bl"); $tpl->setVariable("ITEM", $item); diff --git a/components/ILIAS/Container/Content/SessionsView/class.ilContainerSessionsContentGUI.php b/components/ILIAS/Container/Content/SessionsView/class.ilContainerSessionsContentGUI.php index 85e558be2da7..3d7255ca8070 100644 --- a/components/ILIAS/Container/Content/SessionsView/class.ilContainerSessionsContentGUI.php +++ b/components/ILIAS/Container/Content/SessionsView/class.ilContainerSessionsContentGUI.php @@ -83,7 +83,7 @@ protected function renderSessionLimitLink( 'tpl.container_list_item.html', true, true, - "Services/Container" + "components/ILIAS/Container" ); $tpl->setVariable('DIV_CLASS', 'ilContainerListItemOuter'); $tpl->setCurrentBlock('item_title_linked'); diff --git a/components/ILIAS/Container/Content/class.ilContainerContentGUI.php b/components/ILIAS/Container/Content/class.ilContainerContentGUI.php index c4ceb487d9ba..c7d7f67545fe 100644 --- a/components/ILIAS/Container/Content/class.ilContainerContentGUI.php +++ b/components/ILIAS/Container/Content/class.ilContainerContentGUI.php @@ -89,7 +89,7 @@ public function __construct( $obj = $this->container_gui->getObject(); $this->container_obj = $obj; - $tpl->addJavaScript("./Services/Container/js/Container.js"); + $tpl->addJavaScript("./components/ILIAS/Container/js/Container.js"); $this->log = ilLoggerFactory::getLogger('cont'); @@ -223,7 +223,7 @@ protected function getRightColumnHTML(): string // user interface plugin slot + default rendering $uip = new ilUIHookProcessor( - "Services/Container", + "components/ILIAS/Container", "right_column", ["container_content_gui" => $this] ); @@ -285,7 +285,7 @@ public function getMainContent(): string "tpl.container_page.html", true, true, - "Services/Container" + "components/ILIAS/Container" ); // Show introduction, if repository is empty if (!$this->item_presentation->hasItems() && @@ -784,7 +784,7 @@ public function getIntroduction(): string $lng->loadLanguageModule("rep"); - $tpl = new ilTemplate("tpl.rep_intro.html", true, true, "Services/Repository"); + $tpl = new ilTemplate("tpl.rep_intro.html", true, true, "components/ILIAS/Repository"); $tpl->setVariable("IMG_REP_LARGE", ilObject::_getIcon(0, "big", "root")); $tpl->setVariable("TXT_WELCOME", $lng->txt("rep_intro")); $tpl->setVariable("TXT_INTRO_1", $lng->txt("rep_intro1")); diff --git a/components/ILIAS/Container/Content/class.ilContainerRenderer.php b/components/ILIAS/Container/Content/class.ilContainerRenderer.php index 7ac7dc401d7e..0ddbebc64424 100644 --- a/components/ILIAS/Container/Content/class.ilContainerRenderer.php +++ b/components/ILIAS/Container/Content/class.ilContainerRenderer.php @@ -638,7 +638,7 @@ protected function renderHelperGeneric( protected function initBlockTemplate(): ilTemplate { - return new ilTemplate("tpl.container_list_block.html", true, true, "Services/Container"); + return new ilTemplate("tpl.container_list_block.html", true, true, "components/ILIAS/Container"); } /** diff --git a/components/ILIAS/Container/Export/class.ilContainerExporter.php b/components/ILIAS/Container/Export/class.ilContainerExporter.php index f9abc1141aef..5ad126471a02 100644 --- a/components/ILIAS/Container/Export/class.ilContainerExporter.php +++ b/components/ILIAS/Container/Export/class.ilContainerExporter.php @@ -65,7 +65,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($pg_ids)) { $res[] = [ - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids ]; @@ -83,7 +83,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ } if (count($style_ids)) { $res[] = [ - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "sty", "ids" => $style_ids ]; @@ -91,21 +91,21 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ // service settings $res[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; // skill profiles $res[] = [ - "component" => "Services/Skill", + "component" => "components/ILIAS/Skill", "entity" => "skl_local_prof", "ids" => $a_ids ]; // news settings $res[] = [ - "component" => "Services/News", + "component" => "components/ILIAS/News", "entity" => "news_settings", "ids" => $a_ids ]; diff --git a/components/ILIAS/Container/Export/class.ilContainerImporter.php b/components/ILIAS/Container/Export/class.ilContainerImporter.php index e26f31f60cea..871b134934a4 100644 --- a/components/ILIAS/Container/Export/class.ilContainerImporter.php +++ b/components/ILIAS/Container/Export/class.ilContainerImporter.php @@ -57,14 +57,14 @@ public function finalProcessing(ilImportMapping $a_mapping): void { $this->handleOfflineStatus($this->structure_xml, $a_mapping); // pages - $page_map = $a_mapping->getMappingsOfEntity('Services/COPage', 'pg'); + $page_map = $a_mapping->getMappingsOfEntity('components/ILIAS/COPage', 'pg'); foreach ($page_map as $old_pg_id => $new_pg_id) { $parts = explode(':', $old_pg_id); $pg_type = $parts[0]; $old_obj_id = $parts[1]; $parts = explode(':', $new_pg_id); $new_pg_id = array_pop($parts); - $new_obj_id = $a_mapping->getMapping('Services/Container', 'objs', $old_obj_id); + $new_obj_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $old_obj_id); // see bug #22718, this missed a check for the pg type if ($new_obj_id > 0 && in_array($pg_type, ["crs", "grp", "fold", "cont"], true)) { ilPageObject::_writeParentId($pg_type, (int) $new_pg_id, (int) $new_obj_id); @@ -73,7 +73,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void } // style - $sty_map = $a_mapping->getMappingsOfEntity('Services/Style', 'sty'); + $sty_map = $a_mapping->getMappingsOfEntity('components/ILIAS/Style', 'sty'); foreach ($sty_map as $old_sty_id => $new_sty_id) { if (isset(ilContainerXmlParser::$style_map[$old_sty_id])) { foreach (ilContainerXmlParser::$style_map[$old_sty_id] as $obj_id) { @@ -88,7 +88,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void $new_crs_ref_ids = ilObject::_getAllReferences((int) $new_crs_obj_id); $new_crs_ref_id = end($new_crs_ref_ids); - $skl_local_prof_map = $a_mapping->getMappingsOfEntity('Services/Skill', 'skl_local_prof'); + $skl_local_prof_map = $a_mapping->getMappingsOfEntity('components/ILIAS/Skill', 'skl_local_prof'); foreach ($skl_local_prof_map as $old_prof_id => $new_prof_id) { $this->skill_profile_service->updateProfileRefIdAfterImport((int) $new_prof_id, (int) $new_crs_ref_id); $this->skill_profile_service->addRoleToProfile( @@ -126,7 +126,7 @@ protected function handleOfflineStatus(string $xml, ilImportMapping $mapping): v $this->cont_log->debug('No offline handling for ref_id: ' . $ref_id); continue; } - $new_ref_id = $mapping->getMapping('Services/Container', 'refs', $ref_id); + $new_ref_id = $mapping->getMapping('components/ILIAS/Container', 'refs', $ref_id); $obj = ilObjectFactory::getInstanceByRefId((int) $new_ref_id, false); if (!$obj instanceof ilObject) { $this->cont_log->warning('Cannot create instance for ref_id: ' . $new_ref_id); diff --git a/components/ILIAS/Container/Export/class.ilContainerXmlParser.php b/components/ILIAS/Container/Export/class.ilContainerXmlParser.php index 95bb0222fec8..1b8b4c6170ce 100644 --- a/components/ILIAS/Container/Export/class.ilContainerXmlParser.php +++ b/components/ILIAS/Container/Export/class.ilContainerXmlParser.php @@ -71,7 +71,7 @@ protected function initItem( $type = (string) $item['Type']; - $new_ref = $this->getMapping()->getMapping('Services/Container', 'refs', $ref_id); + $new_ref = $this->getMapping()->getMapping('components/ILIAS/Container', 'refs', $ref_id); if ( !$new_ref && @@ -79,11 +79,11 @@ protected function initItem( ) { // if container without subitems a dummy container has already been created // see ilImportContainer::createDummy() - $new_ref = $this->mapping->getMapping('Services/Container', 'refs', '0'); + $new_ref = $this->mapping->getMapping('components/ILIAS/Container', 'refs', '0'); // see below and ilContainerImporter::finalProcessing() - $this->mapping->addMapping('Services/Container', 'objs', $obj_id, (string) ilObject::_lookupObjId((int) $new_ref)); - $this->mapping->addMapping('Services/Object', 'obj', $obj_id, (string) ilObject::_lookupObjId((int) $new_ref)); + $this->mapping->addMapping('components/ILIAS/Container', 'objs', $obj_id, (string) ilObject::_lookupObjId((int) $new_ref)); + $this->mapping->addMapping('components/ILIAS/Object', 'obj', $obj_id, (string) ilObject::_lookupObjId((int) $new_ref)); } if (!$new_ref) { @@ -103,7 +103,7 @@ protected function initItem( $this->initItem($subitem, $new_ref); } - $new_obj_id = $this->mapping->getMapping('Services/Container', 'objs', $obj_id); + $new_obj_id = $this->mapping->getMapping('components/ILIAS/Container', 'objs', $obj_id); // style if ((int) $item['Style']) { @@ -113,12 +113,12 @@ protected function initItem( // pages if ($ilSetting->get('enable_cat_page_edit', '0')) { if ($item['Page'] == "1") { - $this->mapping->addMapping('Services/COPage', 'pg', 'cont:' . $obj_id, 'cont:' . $new_obj_id); + $this->mapping->addMapping('components/ILIAS/COPage', 'pg', 'cont:' . $obj_id, 'cont:' . $new_obj_id); $this->cont_log->debug("add pg cont mapping, old: " . $obj_id . ", new: " . $new_obj_id . ", Page: -" . $item['Page'] . "-"); } if ($item['StartPage'] == "1") { - $this->mapping->addMapping('Services/COPage', 'pg', 'cstr:' . $obj_id, 'cstr:' . $new_obj_id); + $this->mapping->addMapping('components/ILIAS/COPage', 'pg', 'cstr:' . $obj_id, 'cstr:' . $new_obj_id); } } } @@ -186,14 +186,14 @@ protected function createObject( $objDefinition = $this->obj_definition; // A mapping for this object already exists => create reference - $new_obj_id = $this->getMapping()->getMapping('Services/Container', 'objs', (string) $obj_id); + $new_obj_id = $this->getMapping()->getMapping('components/ILIAS/Container', 'objs', (string) $obj_id); if ($new_obj_id) { $obj = ilObjectFactory::getInstanceByObjId((int) $new_obj_id, false); if ($obj instanceof ilObject) { $obj->createReference(); $obj->putInTree($parent_node); $obj->setPermissions($parent_node); - $this->mapping->addMapping('Services/Container', 'refs', (string) $ref_id, (string) $obj->getRefId()); + $this->mapping->addMapping('components/ILIAS/Container', 'refs', (string) $ref_id, (string) $obj->getRefId()); return $obj->getRefId(); } } @@ -214,9 +214,9 @@ protected function createObject( $new->putInTree($parent_node); $new->setPermissions($parent_node); - $this->mapping->addMapping('Services/Container', 'objs', (string) $obj_id, (string) $new->getId()); - $this->mapping->addMapping('Services/Object', 'obj', (string) $obj_id, (string) $new->getId()); - $this->mapping->addMapping('Services/Container', 'refs', (string) $ref_id, (string) $new->getRefId()); + $this->mapping->addMapping('components/ILIAS/Container', 'objs', (string) $obj_id, (string) $new->getId()); + $this->mapping->addMapping('components/ILIAS/Object', 'obj', (string) $obj_id, (string) $new->getId()); + $this->mapping->addMapping('components/ILIAS/Container', 'refs', (string) $ref_id, (string) $new->getRefId()); return $new->getRefId(); } diff --git a/components/ILIAS/Container/Filter/classes/class.ilContainerFilterTableGUI.php b/components/ILIAS/Container/Filter/classes/class.ilContainerFilterTableGUI.php index 276a1449aa15..e67235630e97 100644 --- a/components/ILIAS/Container/Filter/classes/class.ilContainerFilterTableGUI.php +++ b/components/ILIAS/Container/Filter/classes/class.ilContainerFilterTableGUI.php @@ -48,7 +48,7 @@ public function __construct( $this->addColumn($this->lng->txt("cont_filter_record")); $this->addColumn($this->lng->txt("cont_filter_field")); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.cont_filter_row.html", "Services/Container/Filter"); + $this->setRowTemplate("tpl.cont_filter_row.html", "components/ILIAS/Container/Filter"); } protected function getItems(): array diff --git a/components/ILIAS/Container/Skills/classes/class.ilContProfileTableGUI.php b/components/ILIAS/Container/Skills/classes/class.ilContProfileTableGUI.php index a8e957ebcf1d..181793355c14 100644 --- a/components/ILIAS/Container/Skills/classes/class.ilContProfileTableGUI.php +++ b/components/ILIAS/Container/Skills/classes/class.ilContProfileTableGUI.php @@ -69,7 +69,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions"), "", "1"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.cont_profile_row.html", "Services/Container/Skills"); + $this->setRowTemplate("tpl.cont_profile_row.html", "components/ILIAS/Container/Skills"); $this->setSelectAllCheckbox("id"); if ($this->skmg_settings->getLocalAssignmentOfProfiles()) { diff --git a/components/ILIAS/Container/Skills/classes/class.ilContSkillMemberTableGUI.php b/components/ILIAS/Container/Skills/classes/class.ilContSkillMemberTableGUI.php index 9dc15b66c38f..4266618bfd2a 100644 --- a/components/ILIAS/Container/Skills/classes/class.ilContSkillMemberTableGUI.php +++ b/components/ILIAS/Container/Skills/classes/class.ilContSkillMemberTableGUI.php @@ -65,7 +65,7 @@ public function __construct(ilContSkillAdminGUI $a_parent_obj, string $a_parent_ $this->setSelectAllCheckbox("usr_ids"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.cont_member_skill_row.html", "Services/Container/Skills"); + $this->setRowTemplate("tpl.cont_member_skill_row.html", "components/ILIAS/Container/Skills"); if (ilContainer::_lookupContainerSetting($this->cont_obj->getId(), "cont_skill_publish", '0')) { $this->addMultiCommand("publishAssignments", $this->lng->txt("cont_publish_assignment")); diff --git a/components/ILIAS/Container/Skills/classes/class.ilContSkillTableGUI.php b/components/ILIAS/Container/Skills/classes/class.ilContSkillTableGUI.php index b9b7ef156b10..3d687d42939d 100644 --- a/components/ILIAS/Container/Skills/classes/class.ilContSkillTableGUI.php +++ b/components/ILIAS/Container/Skills/classes/class.ilContSkillTableGUI.php @@ -60,7 +60,7 @@ public function __construct( $this->addColumn($this->lng->txt("cont_skill_profile"), "", "1"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.cont_skill_row.html", "Services/Container/Skills"); + $this->setRowTemplate("tpl.cont_skill_row.html", "components/ILIAS/Container/Skills"); $this->setSelectAllCheckbox("id"); $this->addMultiCommand("confirmRemoveSelectedSkill", $this->lng->txt("remove")); diff --git a/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsContentTableGUI.php b/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsContentTableGUI.php index 86fe12830daf..90e07ee298aa 100644 --- a/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsContentTableGUI.php +++ b/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsContentTableGUI.php @@ -63,7 +63,7 @@ public function __construct( $this->setTitle($this->lng->txt('crs_table_start_objects')); $this->setDescription($this->lng->txt('crs_info_start')); - $this->setRowTemplate("tpl.start_objects_content_row.html", "Services/Container"); + $this->setRowTemplate("tpl.start_objects_content_row.html", "components/ILIAS/Container"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->setDefaultOrderField('nr'); diff --git a/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsTableGUI.php b/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsTableGUI.php index 57d823ae181b..92fe82535e9c 100644 --- a/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsTableGUI.php +++ b/components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsTableGUI.php @@ -70,7 +70,7 @@ public function __construct( } $this->setDefaultOrderDirection('asc'); - $this->setRowTemplate("tpl.start_objects_row.html", "Services/Container"); + $this->setRowTemplate("tpl.start_objects_row.html", "components/ILIAS/Container"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->setSelectAllCheckbox('starter'); diff --git a/components/ILIAS/Container/classes/class.ilContainerAppEventListener.php b/components/ILIAS/Container/classes/class.ilContainerAppEventListener.php index 6e20d1637079..d72d030f4eba 100644 --- a/components/ILIAS/Container/classes/class.ilContainerAppEventListener.php +++ b/components/ILIAS/Container/classes/class.ilContainerAppEventListener.php @@ -34,7 +34,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ $cont_skill_deletion_manager = $DIC->skills()->internalContainer()->manager()->getSkillDeletionManager(); switch ($a_component) { - case "Services/Skill": + case "components/ILIAS/Skill": switch ($a_event) { case "deleteSkill": $cont_skill_deletion_manager->removeContainerSkillsForSkill( diff --git a/components/ILIAS/Container/classes/class.ilContainerGUI.php b/components/ILIAS/Container/classes/class.ilContainerGUI.php index 2ba371051d9c..77db6c6c9c45 100644 --- a/components/ILIAS/Container/classes/class.ilContainerGUI.php +++ b/components/ILIAS/Container/classes/class.ilContainerGUI.php @@ -655,7 +655,7 @@ public function showLinkListObject(): void "tpl.container_link_help.html", true, true, - "Services/Container" + "components/ILIAS/Container" ); $type_ordering = [ diff --git a/components/ILIAS/Container/test/ilServicesContainerSuite.php b/components/ILIAS/Container/test/ilServicesContainerSuite.php index dde9f6342990..2ce688ce70b2 100644 --- a/components/ILIAS/Container/test/ilServicesContainerSuite.php +++ b/components/ILIAS/Container/test/ilServicesContainerSuite.php @@ -32,11 +32,11 @@ public static function suite(): self $suite = new self(); /* - require_once("./Services/Container/test/ContentModeManagerTest.php"); + require_once("./components/ILIAS/Container/test/ContentModeManagerTest.php"); $suite->addTestSuite("ContentModeManagerTest"); */ - require_once("./Services/Container/test/Classification/ClassificationSessionRepositoryTest.php"); + require_once("./components/ILIAS/Container/test/Classification/ClassificationSessionRepositoryTest.php"); $suite->addTestSuite("ClassificationSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAppEventListener.php b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAppEventListener.php index 63e109cbfc4d..db6da1d9cf8f 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAppEventListener.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAppEventListener.php @@ -70,7 +70,7 @@ public static function deleteReferences(int $a_target_id): void $instance->delete(); $ilLog->write(__METHOD__ . ': Deleted reference object of type ' . $instance->getType() . ' with Id ' . $instance->getId()); $ilAppEventHandler->raise( - 'Services/ContainerReference', + 'components/ILIAS/ContainerReference', 'deleteReference', [ 'ref_id' => $ref_id, diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php index c0e5efc905fe..4b14493e4ee1 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php @@ -42,7 +42,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ if (count(ilExportOptions::getInstance()->getSubitemsForExport()) > 1) { return [ [ - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ] diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceGUI.php b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceGUI.php index 89dbaf40747e..9277b7361139 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceGUI.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceGUI.php @@ -84,7 +84,7 @@ public function executeCommand(): void case 'ilpermissiongui': $ilTabs->setTabActive('perm_settings'); - include_once("Services/AccessControl/classes/class.ilPermissionGUI.php"); + include_once("components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php"); $ilCtrl->forwardCommand(new ilPermissionGUI($this)); break; @@ -262,7 +262,7 @@ protected function initForm(int $a_mode = self::MODE_EDIT): ilPropertyFormGUI $ttype->addOption($custom); $form->addItem($ttype); - include_once("./Services/Form/classes/class.ilRepositorySelector2InputGUI.php"); + include_once("./components/ILIAS/Form/classes/class.ilRepositorySelector2InputGUI.php"); $repo = new ilRepositorySelector2InputGUI($this->lng->txt("objref_edit_ref"), "target_id"); //$repo->setParent($this); $repo->setRequired(true); diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php index fbca2bd6c716..d740105b98f0 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php @@ -61,12 +61,12 @@ public function importXmlRepresentation( $objDefinition = $DIC["objDefinition"]; $log = $DIC->logger()->root(); - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $refs = ilObject::_getAllReferences((int) $new_id); $this->initReference(end($refs)); } // Mapping for containers without subitems - elseif ($new_id = $a_mapping->getMapping('Services/Container', 'refs', '0')) { + elseif ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'refs', '0')) { $this->initReference((int) $new_id); } elseif (!$this->getReference() instanceof ilContainerReference) { $this->initReference(); diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php index 801a4f540edb..d0136e438921 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php @@ -109,7 +109,7 @@ protected function parseTargetId(string $attribute_target): int if (!$this->import_mapping instanceof ilImportMapping) { return 0; } - $obj_mapping_id = $this->import_mapping->getMapping('Services/Container', 'objs', $attribute_target); + $obj_mapping_id = $this->import_mapping->getMapping('components/ILIAS/Container', 'objs', $attribute_target); if (!$obj_mapping_id) { $this->logger->debug('Cannot find object mapping for target_id: ' . $attribute_target); return 0; diff --git a/components/ILIAS/ContainerReference/classes/class.ilContainerSelectionExplorer.php b/components/ILIAS/ContainerReference/classes/class.ilContainerSelectionExplorer.php index 144f9a40b86d..adeac3035d3b 100644 --- a/components/ILIAS/ContainerReference/classes/class.ilContainerSelectionExplorer.php +++ b/components/ILIAS/ContainerReference/classes/class.ilContainerSelectionExplorer.php @@ -82,7 +82,7 @@ public function formatHeader(ilTemplate $tpl, $a_obj_id, array $a_option): void { $lng = $this->lng; - $tpl = new ilTemplate("tpl.tree.html", true, true, "Services/UIComponent/Explorer");// TODO PHP8-REVIEW Why is this overwritten? Are you sure this is correct? + $tpl = new ilTemplate("tpl.tree.html", true, true, "components/ILIAS/UIComponent/Explorer");// TODO PHP8-REVIEW Why is this overwritten? Are you sure this is correct? $tpl->setCurrentBlock("text"); $tpl->setVariable("OBJ_TITLE", $lng->txt("repository")); diff --git a/components/ILIAS/ContainerReference/test/ilServicesContainerReferenceSuite.php b/components/ILIAS/ContainerReference/test/ilServicesContainerReferenceSuite.php index ccf0c1dcee2a..05c3ef52934a 100644 --- a/components/ILIAS/ContainerReference/test/ilServicesContainerReferenceSuite.php +++ b/components/ILIAS/ContainerReference/test/ilServicesContainerReferenceSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/ContainerReference/test/ContRefStandardGUIRequestTest.php"); + require_once("./components/ILIAS/ContainerReference/test/ContRefStandardGUIRequestTest.php"); $suite->addTestSuite("ContRefStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/ContentPage/classes/class.ilContentPageDataSet.php b/components/ILIAS/ContentPage/classes/class.ilContentPageDataSet.php index 4420881a8614..4a4dd314da12 100644 --- a/components/ILIAS/ContentPage/classes/class.ilContentPageDataSet.php +++ b/components/ILIAS/ContentPage/classes/class.ilContentPageDataSet.php @@ -103,7 +103,7 @@ public function importRecord( ): void { switch ($a_entity) { case self::OBJ_TYPE: - if ($newObjId = $a_mapping->getMapping('Services/Container', 'objs', (string) $a_rec['id'])) { + if ($newObjId = $a_mapping->getMapping('components/ILIAS/Container', 'objs', (string) $a_rec['id'])) { $newObject = ilObjectFactory::getInstanceByObjId((int) $newObjId, false); } else { $newObject = new ilObjContentPage(); @@ -129,13 +129,13 @@ public function importRecord( (string) $newObject->getId() ); $a_mapping->addMapping( - 'Services/COPage', + 'components/ILIAS/COPage', 'pg', self::OBJ_TYPE . ':' . $a_rec['id'], self::OBJ_TYPE . ':' . $newObject->getId() ); $a_mapping->addMapping( - 'Services/MetaData', + 'components/ILIAS/MetaData', 'md', $a_rec['id'] . ':0:' . self::OBJ_TYPE, $newObject->getId() . ':0:' . self::OBJ_TYPE diff --git a/components/ILIAS/ContentPage/classes/class.ilContentPageExporter.php b/components/ILIAS/ContentPage/classes/class.ilContentPageExporter.php index 8042024eb444..938533308d36 100644 --- a/components/ILIAS/ContentPage/classes/class.ilContentPageExporter.php +++ b/components/ILIAS/ContentPage/classes/class.ilContentPageExporter.php @@ -87,7 +87,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($pageObjectIds) > 0) { $deps[] = [ - 'component' => 'Services/COPage', + 'component' => 'components/ILIAS/COPage', 'entity' => 'pg', 'ids' => $pageObjectIds, ]; @@ -95,7 +95,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($metadataIds) > 0) { $deps[] = [ - 'component' => 'Services/MetaData', + 'component' => 'components/ILIAS/MetaData', 'entity' => 'md', 'ids' => $metadataIds, ]; @@ -103,7 +103,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($styleIds) > 0) { $deps[] = [ - 'component' => 'Services/Style', + 'component' => 'components/ILIAS/Style', 'entity' => 'sty', 'ids' => array_values($styleIds), ]; @@ -111,7 +111,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (self::OBJ_TYPE === $a_entity) { $deps[] = [ - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'entity' => 'common', 'ids' => $a_ids ]; diff --git a/components/ILIAS/ContentPage/classes/class.ilContentPageImporter.php b/components/ILIAS/ContentPage/classes/class.ilContentPageImporter.php index 988949a247ae..b712274a2dd8 100644 --- a/components/ILIAS/ContentPage/classes/class.ilContentPageImporter.php +++ b/components/ILIAS/ContentPage/classes/class.ilContentPageImporter.php @@ -50,7 +50,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void { parent::finalProcessing($a_mapping); - $copaMap = $a_mapping->getMappingsOfEntity('Services/COPage', 'pg'); + $copaMap = $a_mapping->getMappingsOfEntity('components/ILIAS/COPage', 'pg'); foreach ($copaMap as $oldCopaId => $newCopaId) { $newCopaId = (int) substr($newCopaId, strlen(self::OBJ_TYPE) + 1); @@ -69,7 +69,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void $styleMapping = $a_mapping->getMappingsOfEntity('components/ILIAS/ContentPage', 'style'); foreach ($styleMapping as $newCopaId => $oldStyleId) { - $newStyleId = (int) $a_mapping->getMapping('Services/Style', 'sty', $oldStyleId); + $newStyleId = (int) $a_mapping->getMapping('components/ILIAS/Style', 'sty', $oldStyleId); if ($newCopaId > 0 && $newStyleId > 0) { $copa = ilObjectFactory::getInstanceByObjId((int) $newCopaId, false); if (!$copa || !($copa instanceof ilObjContentPage)) { diff --git a/components/ILIAS/Context/classes/class.ilContextSaml.php b/components/ILIAS/Context/classes/class.ilContextSaml.php index ce110408d698..f34d38448205 100644 --- a/components/ILIAS/Context/classes/class.ilContextSaml.php +++ b/components/ILIAS/Context/classes/class.ilContextSaml.php @@ -72,8 +72,8 @@ public static function isSessionMainContext(): bool public static function modifyHttpPath(string $httpPath): string { - if (strpos($httpPath, '/Services/Saml/lib/') !== false && strpos($httpPath, '/metadata.php') === false) { - return substr($httpPath, 0, strpos($httpPath, '/Services/Saml/lib/')); + if (strpos($httpPath, '/components/ILIAS/Saml/lib/') !== false && strpos($httpPath, '/metadata.php') === false) { + return substr($httpPath, 0, strpos($httpPath, '/components/ILIAS/Saml/lib/')); } return $httpPath; diff --git a/components/ILIAS/Context/test/ilContextTest.php b/components/ILIAS/Context/test/ilContextTest.php index 372ad9026c99..2c3d2804a246 100644 --- a/components/ILIAS/Context/test/ilContextTest.php +++ b/components/ILIAS/Context/test/ilContextTest.php @@ -12,7 +12,7 @@ class ilContextTest extends TestCase { protected function setUp(): void { - require_once("Services/Context/test/class.ilContextExtended.php"); + require_once("components/ILIAS/Context/test/class.ilContextExtended.php"); } /** diff --git a/components/ILIAS/Context/test/ilServicesContextSuite.php b/components/ILIAS/Context/test/ilServicesContextSuite.php index f886fd544dfd..c035853739e4 100644 --- a/components/ILIAS/Context/test/ilServicesContextSuite.php +++ b/components/ILIAS/Context/test/ilServicesContextSuite.php @@ -13,7 +13,7 @@ public static function suite(): self { $suite = new ilServicesContextSuite(); - require_once("Services/Context/test/ilContextTest.php"); + require_once("components/ILIAS/Context/test/ilContextTest.php"); $suite->addTestSuite("ilContextTest"); diff --git a/components/ILIAS/CopyWizard/test/ilServicesCopyWizardSuite.php b/components/ILIAS/CopyWizard/test/ilServicesCopyWizardSuite.php index b2a7f59a70b4..47e330223cc1 100644 --- a/components/ILIAS/CopyWizard/test/ilServicesCopyWizardSuite.php +++ b/components/ILIAS/CopyWizard/test/ilServicesCopyWizardSuite.php @@ -12,7 +12,7 @@ public static function suite() { $suite = new ilServicesCopyWizardSuite(); - include_once("./Services/CopyWizard/test/ilCopyWizardOptionsTest.php"); + include_once("./components/ILIAS/CopyWizard/test/ilCopyWizardOptionsTest.php"); $suite->addTestSuite(ilCopyWizardOptionsTest::class); return $suite; } diff --git a/components/ILIAS/Course/classes/Objectives/class.ilCourseObjectiveListGUI.php b/components/ILIAS/Course/classes/Objectives/class.ilCourseObjectiveListGUI.php index a26e1c9b5e90..df16240da714 100644 --- a/components/ILIAS/Course/classes/Objectives/class.ilCourseObjectiveListGUI.php +++ b/components/ILIAS/Course/classes/Objectives/class.ilCourseObjectiveListGUI.php @@ -54,7 +54,7 @@ public function getObjectiveListItemHTML( "tpl.container_list_item.html", true, true, - "Services/Container" + "components/ILIAS/Container" ); $this->initItem($a_ref_id, $a_obj_id, ilObject::_lookupType($a_obj_id), $a_title, $a_description); diff --git a/components/ILIAS/Course/classes/Objectives/class.ilLOXmlParser.php b/components/ILIAS/Course/classes/Objectives/class.ilLOXmlParser.php index 641f64e66354..259a23f4c04f 100644 --- a/components/ILIAS/Course/classes/Objectives/class.ilLOXmlParser.php +++ b/components/ILIAS/Course/classes/Objectives/class.ilLOXmlParser.php @@ -144,7 +144,7 @@ protected function parseObjectives(SimpleXMLElement $root): void (string) $new_objective_id ); $this->getMapping()->addMapping( - 'Services/COPage', + 'components/ILIAS/COPage', 'pg', 'lobj:' . $obj->attributes()->id, 'lobj:' . $new_objective_id @@ -267,14 +267,14 @@ protected function parseTests(SimpleXMLElement $obj, int $a_objective_id): void protected function getMappingInfoForItem(int $a_ref_id): int { - $new_ref_id = $this->getMapping()->getMapping('Services/Container', 'refs', (string) $a_ref_id); + $new_ref_id = $this->getMapping()->getMapping('components/ILIAS/Container', 'refs', (string) $a_ref_id); $this->logger->debug(': Found new ref_id: ' . $new_ref_id . ' for ' . $a_ref_id); return (int) $new_ref_id; } protected function getMappingInfoForItemObject(int $a_obj_id): int { - $new_obj_id = $this->getMapping()->getMapping('Services/Container', 'objs', (string) $a_obj_id); + $new_obj_id = $this->getMapping()->getMapping('components/ILIAS/Container', 'objs', (string) $a_obj_id); $this->logger->debug('Found new ref_id: ' . $new_obj_id . ' for ' . $a_obj_id); return (int) $new_obj_id; } diff --git a/components/ILIAS/Course/classes/class.ilCourseAppEventListener.php b/components/ILIAS/Course/classes/class.ilCourseAppEventListener.php index 133363d780fd..50351bd3c561 100644 --- a/components/ILIAS/Course/classes/class.ilCourseAppEventListener.php +++ b/components/ILIAS/Course/classes/class.ilCourseAppEventListener.php @@ -134,7 +134,7 @@ protected static function awardCertificate(int $a_obj_id, int $a_usr_id): void public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { - if ($a_component == 'Services/AccessControl') { + if ($a_component == 'components/ILIAS/AccessControl') { $listener = new self(); $listener->handleUserAssignments($a_event, $a_parameter); } @@ -155,7 +155,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ break; } - if ($a_component == "Services/Tracking" && $a_event == "updateStatus") { + if ($a_component == "components/ILIAS/Tracking" && $a_event == "updateStatus") { // see ilObjCourseGUI::updateLPFromStatus() if (self::$blocked_for_lp) { return; diff --git a/components/ILIAS/Course/classes/class.ilCourseExporter.php b/components/ILIAS/Course/classes/class.ilCourseExporter.php index c5f3d89e7192..66276cd2d874 100644 --- a/components/ILIAS/Course/classes/class.ilCourseExporter.php +++ b/components/ILIAS/Course/classes/class.ilCourseExporter.php @@ -52,7 +52,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ // always trigger container because of co-page(s) return array( array( - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ) @@ -108,7 +108,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($page_ids !== []) { $dependencies[] = [ - 'component' => 'Services/COPage', + 'component' => 'components/ILIAS/COPage', 'entity' => 'pg', 'ids' => $page_ids ]; @@ -124,7 +124,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($advmd_ids !== []) { $dependencies[] = [ - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ]; @@ -136,7 +136,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ } if ($md_ids !== []) { $dependencies[] = [ - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids ]; diff --git a/components/ILIAS/Course/classes/class.ilCourseImporter.php b/components/ILIAS/Course/classes/class.ilCourseImporter.php index 55430c9daa39..0ae453b5e6bd 100644 --- a/components/ILIAS/Course/classes/class.ilCourseImporter.php +++ b/components/ILIAS/Course/classes/class.ilCourseImporter.php @@ -49,11 +49,11 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $refs = ilObject::_getAllReferences((int) $new_id); $this->course = ilObjectFactory::getInstanceByRefId((int) end($refs), false); } // Mapping for containers without subitems - elseif ($new_id = $a_mapping->getMapping('Services/Container', 'refs', '0')) { + elseif ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'refs', '0')) { $this->course = ilObjectFactory::getInstanceByRefId((int) $new_id, false); } elseif (!$this->course instanceof ilObjCourse) { $this->course = new ilObjCourse(); @@ -85,7 +85,7 @@ public function importXmlRepresentation( // workaround for ilImportContainer::createDummy which creates Metadata via create(true) $this->course->deleteMetaData(); $a_mapping->addMapping( - 'Services/MetaData', + 'components/ILIAS/MetaData', 'md', $a_id . ':0:crs', $this->course->getId() . ':0:crs' diff --git a/components/ILIAS/Course/classes/class.ilCourseRegistrationGUI.php b/components/ILIAS/Course/classes/class.ilCourseRegistrationGUI.php index 76f4f2eca418..7d419c9c0469 100644 --- a/components/ILIAS/Course/classes/class.ilCourseRegistrationGUI.php +++ b/components/ILIAS/Course/classes/class.ilCourseRegistrationGUI.php @@ -98,7 +98,7 @@ protected function fillRegistrationPeriod(): void $warning = ''; if (ilDateTime::_before($now, $start)) { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_start')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($start)); @@ -107,7 +107,7 @@ protected function fillRegistrationPeriod(): void $warning = $this->lng->txt('mem_reg_not_started'); } elseif (ilDateTime::_after($now, $end)) { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_start')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($start)); @@ -116,7 +116,7 @@ protected function fillRegistrationPeriod(): void $warning = $this->lng->txt('mem_reg_expired'); } else { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_end')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($end)); } @@ -137,7 +137,7 @@ protected function fillMaxMembers(): void if (!$this->container->isSubscriptionMembershipLimited()) { return; } - $tpl = new ilTemplate('tpl.max_members_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.max_members_form.html', true, true, 'components/ILIAS/Membership'); $alert = ''; if ($this->container->getSubscriptionMinMembers()) { diff --git a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceAppEventListener.php b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceAppEventListener.php index d47ca9681124..971e41cf497a 100644 --- a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceAppEventListener.php +++ b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceAppEventListener.php @@ -99,7 +99,7 @@ protected function handleReferences($a_course_obj_id, $a_usr_id, $a_role_id) /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ @@ -107,7 +107,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { ilLoggerFactory::getLogger('crs')->warning($a_component); switch ($a_component) { - case 'Services/AccessControl': + case 'components/ILIAS/AccessControl': $self = new self(); $self->handleUserAssignments($a_event, $a_parameter); break; diff --git a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceExporter.php b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceExporter.php index 0df2d47e4519..123cb797aa40 100644 --- a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceExporter.php +++ b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceExporter.php @@ -2,8 +2,8 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './Services/Export/classes/class.ilXmlExporter.php'; -include_once './Services/ContainerReference/classes/class.ilContainerReferenceExporter.php'; +include_once './components/ILIAS/Export/classes/class.ilXmlExporter.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php'; /** * Class for category export diff --git a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceImporter.php b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceImporter.php index dc7764d8c3bc..ea32c5daeb41 100644 --- a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceImporter.php +++ b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceImporter.php @@ -2,8 +2,8 @@ /* Copyright (c) 1998-2010 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once("./Services/Export/classes/class.ilXmlImporter.php"); -include_once './Services/ContainerReference/classes/class.ilContainerReferenceImporter.php'; +include_once("./components/ILIAS/Export/classes/class.ilXmlImporter.php"); +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php'; /** diff --git a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlParser.php b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlParser.php index c052e13dd6ca..fa9a5ded830b 100644 --- a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlParser.php +++ b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlParser.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once './Services/ContainerReference/classes/class.ilContainerReferenceXmlParser.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php'; /** diff --git a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlWriter.php b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlWriter.php index f096dce5f633..45a0e8aa4107 100644 --- a/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlWriter.php +++ b/components/ILIAS/CourseReference/classes/class.ilCourseReferenceXmlWriter.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './Services/ContainerReference/classes/class.ilContainerReferenceXmlWriter.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlWriter.php'; /** * Class for container reference export diff --git a/components/ILIAS/CourseReference/classes/class.ilObjCourseReference.php b/components/ILIAS/CourseReference/classes/class.ilObjCourseReference.php index dd554c8749f4..16eec2388364 100644 --- a/components/ILIAS/CourseReference/classes/class.ilObjCourseReference.php +++ b/components/ILIAS/CourseReference/classes/class.ilObjCourseReference.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); +include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); /** * diff --git a/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceAccess.php b/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceAccess.php index ceb2fab42003..12ce6ab838bf 100644 --- a/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceAccess.php +++ b/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceAccess.php @@ -16,7 +16,7 @@ * *********************************************************************/ -include_once("./Services/ContainerReference/classes/class.ilContainerReferenceAccess.php"); +include_once("./components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAccess.php"); /** * diff --git a/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceListGUI.php b/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceListGUI.php index a284efa00a66..ad60902f8dc3 100644 --- a/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceListGUI.php +++ b/components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceListGUI.php @@ -128,7 +128,7 @@ public function initItem( $this->reference_obj_id = $obj_id; - include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); + include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); $target_obj_id = ilContainerReference::_lookupTargetId($obj_id); $target_ref_ids = ilObject::_getAllReferences($target_obj_id); diff --git a/components/ILIAS/Cron/classes/Setup/class.ilCronDefinitionProcessor.php b/components/ILIAS/Cron/classes/Setup/class.ilCronDefinitionProcessor.php index 93b8c733f359..879d8203e116 100644 --- a/components/ILIAS/Cron/classes/Setup/class.ilCronDefinitionProcessor.php +++ b/components/ILIAS/Cron/classes/Setup/class.ilCronDefinitionProcessor.php @@ -18,7 +18,7 @@ declare(strict_types=1); -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; class ilCronDefinitionProcessor implements ilComponentDefinitionProcessor { diff --git a/components/ILIAS/Cron/classes/class.ilCronManagerTableGUI.php b/components/ILIAS/Cron/classes/class.ilCronManagerTableGUI.php index 3a11b7b3f257..4ca5a53b6310 100644 --- a/components/ILIAS/Cron/classes/class.ilCronManagerTableGUI.php +++ b/components/ILIAS/Cron/classes/class.ilCronManagerTableGUI.php @@ -57,7 +57,7 @@ public function __construct( $this->addMultiCommand('reset', $this->lng->txt('cron_action_reset')); } - $this->setRowTemplate('tpl.cron_job_row.html', 'Services/Cron'); + $this->setRowTemplate('tpl.cron_job_row.html', 'components/ILIAS/Cron'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); } diff --git a/components/ILIAS/Dashboard/Administration/classes/class.ilDashboardSortationTableGUI.php b/components/ILIAS/Dashboard/Administration/classes/class.ilDashboardSortationTableGUI.php index ea44f042a4ca..94c4887484f2 100644 --- a/components/ILIAS/Dashboard/Administration/classes/class.ilDashboardSortationTableGUI.php +++ b/components/ILIAS/Dashboard/Administration/classes/class.ilDashboardSortationTableGUI.php @@ -42,7 +42,7 @@ public function __construct($a_parent_obj, $a_parent_cmd) $this->addCommandButton('saveSettings', $this->lng->txt('save')); $this->setRowTemplate( 'tpl.dashboard_sortation_row.html', - 'Services/Dashboard' + 'components/ILIAS/Dashboard' ); $this->setEnableNumInfo(false); $this->initData(); diff --git a/components/ILIAS/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php b/components/ILIAS/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php index 5b4af61dd95e..db4aa6dff59e 100644 --- a/components/ILIAS/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php +++ b/components/ILIAS/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php @@ -159,7 +159,7 @@ public function getViewForm(string $mode): ?StandardForm public function getViewSectionSorting(int $view, string $title): Section { - $this->tpl->addJavaScript("Services/Dashboard/Administration/js/SortationUserInputHandler.js"); + $this->tpl->addJavaScript("components/ILIAS/Dashboard/Administration/js/SortationUserInputHandler.js"); $lng = $this->lng; $availabe_sort_options = $this->viewSettings->getAvailableSortOptionsByView($view); $options = array_reduce( diff --git a/components/ILIAS/Dashboard/Block/classes/BlockDTO.php b/components/ILIAS/Dashboard/Block/classes/BlockDTO.php index 92341f7aaf4e..11bd8c3c71a3 100644 --- a/components/ILIAS/Dashboard/Block/classes/BlockDTO.php +++ b/components/ILIAS/Dashboard/Block/classes/BlockDTO.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Dashboard\Block; +namespace ILIAS\components\Dashboard\Block; use ilDateTime; diff --git a/components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php b/components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php index 1499fc59b98a..d4ea15f18b2a 100644 --- a/components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php +++ b/components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php @@ -22,7 +22,7 @@ use JetBrains\PhpStorm\NoReturn; use ILIAS\UI\Component\Card\RepositoryObject; use ILIAS\UI\Component\Item\Item; -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; use ILIAS\HTTP\Response\ResponseHeader; use ILIAS\Filesystem\Stream\Streams; @@ -162,7 +162,7 @@ public function init(): void $this->lng->loadLanguageModule('dash'); $this->lng->loadLanguageModule('rep'); $this->initViewSettings(); - $this->main_tpl->addJavaScript('Services/Dashboard/Block/js/ReplaceModalContent.js'); + $this->main_tpl->addJavaScript('components/ILIAS/Dashboard/Block/js/ReplaceModalContent.js'); $this->viewSettings->parse(); $this->requested_item_ref_id = (int) ($this->http->request()->getQueryParams()["item_ref_id"] ?? 0); $this->initData(); @@ -606,7 +606,7 @@ public function manage(ReplaceSignal $replace_signal = null): string $bot_tb->addStickyItem($button); $bot_tb->setOpenFormTag(false); - $tpl = new ilTemplate('tpl.remove_multiple_modal_id_wrapper.html', true, true, 'Services/Dashboard'); + $tpl = new ilTemplate('tpl.remove_multiple_modal_id_wrapper.html', true, true, 'components/ILIAS/Dashboard'); $tpl->setVariable('CONTENT', $top_tb->getHTML() . $this->renderManageList($grouped_items) . $bot_tb->getHTML()); $tpl->setVariable('VIEW', $this->viewSettings->getCurrentView()); diff --git a/components/ILIAS/Dashboard/Block/classes/class.ilMembershipBlockGUI.php b/components/ILIAS/Dashboard/Block/classes/class.ilMembershipBlockGUI.php index 2d8d5d98f3d3..546963b327e2 100644 --- a/components/ILIAS/Dashboard/Block/classes/class.ilMembershipBlockGUI.php +++ b/components/ILIAS/Dashboard/Block/classes/class.ilMembershipBlockGUI.php @@ -18,7 +18,7 @@ declare(strict_types=1); -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; class ilMembershipBlockGUI extends ilDashboardBlockGUI { diff --git a/components/ILIAS/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php b/components/ILIAS/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php index e0afc65aa95f..5533932080ec 100644 --- a/components/ILIAS/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php +++ b/components/ILIAS/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php @@ -18,7 +18,7 @@ declare(strict_types=1); -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; /** * @ilCtrl_IsCalledBy ilSelectedItemsBlockGUI: ilColumnGUI diff --git a/components/ILIAS/Dashboard/ItemsBlock/classes/class.ilDashObjectsTableGUI.php b/components/ILIAS/Dashboard/ItemsBlock/classes/class.ilDashObjectsTableGUI.php index d76719a291b3..0b4531eef1b7 100644 --- a/components/ILIAS/Dashboard/ItemsBlock/classes/class.ilDashObjectsTableGUI.php +++ b/components/ILIAS/Dashboard/ItemsBlock/classes/class.ilDashObjectsTableGUI.php @@ -40,7 +40,7 @@ public function __construct( $this->setEnableNumInfo(false); $this->setEnableHeader(false); - $this->setRowTemplate("tpl.dash_obj_row.html", "Services/Dashboard"); + $this->setRowTemplate("tpl.dash_obj_row.html", "components/ILIAS/Dashboard"); $this->setLimit(9999); } diff --git a/components/ILIAS/Dashboard/classes/class.ilDashboardGUI.php b/components/ILIAS/Dashboard/classes/class.ilDashboardGUI.php index 38c6e7d6f84a..d3822b2f6f31 100644 --- a/components/ILIAS/Dashboard/classes/class.ilDashboardGUI.php +++ b/components/ILIAS/Dashboard/classes/class.ilDashboardGUI.php @@ -285,7 +285,7 @@ public function getCenterColumnHTML(): string // user interface plugin slot + default rendering $uip = new ilUIHookProcessor( - "Services/Dashboard", + "components/ILIAS/Dashboard", "center_column", array("personal_desktop_gui" => $this) ); @@ -322,7 +322,7 @@ public function getRightColumnHTML(): string // user interface plugin slot + default rendering $uip = new ilUIHookProcessor( - "Services/Dashboard", + "components/ILIAS/Dashboard", "right_column", array("personal_desktop_gui" => $this) ); @@ -477,7 +477,7 @@ protected function toggleHelp(): void protected function getMainContent(): string { $html = ""; - $tpl = new ilTemplate("tpl.dashboard.html", true, true, "Services/Dashboard"); + $tpl = new ilTemplate("tpl.dashboard.html", true, true, "components/ILIAS/Dashboard"); $settings = new ilPDSelectedItemsBlockViewSettings($this->user); foreach ($settings->getViewPositions() as $view_position) { diff --git a/components/ILIAS/Dashboard/test/ilServicesDashboardSuite.php b/components/ILIAS/Dashboard/test/ilServicesDashboardSuite.php index e06b05945e10..2b4159831841 100644 --- a/components/ILIAS/Dashboard/test/ilServicesDashboardSuite.php +++ b/components/ILIAS/Dashboard/test/ilServicesDashboardSuite.php @@ -28,7 +28,7 @@ public static function suite() { $suite = new self(); - require_once("./Services/Dashboard/test/DashboardViewSettingsTest.php"); + require_once("./components/ILIAS/Dashboard/test/DashboardViewSettingsTest.php"); $suite->addTestSuite("DashboardViewSettingsTest"); return $suite; diff --git a/components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php b/components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php index 438743cca7db..c6bcf1f5db3f 100644 --- a/components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php +++ b/components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php @@ -175,7 +175,7 @@ public function renderRecord(bool $editComments = false): void ); $html = $pageObj->getHTML(); - $rctpl->addCss("./Services/COPage/css/content.css"); + $rctpl->addCss("./components/ILIAS/COPage/css/content.css"); $rctpl->fillCssFiles(); $table = ilDclCache::getTableCache($this->record_obj->getTableId()); foreach ($table->getRecordFields() as $field) { diff --git a/components/ILIAS/DataCollection/classes/class.ilDataCollectionDataSet.php b/components/ILIAS/DataCollection/classes/class.ilDataCollectionDataSet.php index b70119827288..598040fb4d17 100644 --- a/components/ILIAS/DataCollection/classes/class.ilDataCollectionDataSet.php +++ b/components/ILIAS/DataCollection/classes/class.ilDataCollectionDataSet.php @@ -112,7 +112,7 @@ public function importRecord( ): void { switch ($a_entity) { case 'dcl': - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['id'])) { $new_obj = ilObjectFactory::getInstanceByObjId((int)$new_id, false); } else { $new_obj = new ilObjDataCollection(); @@ -191,7 +191,7 @@ public function importRecord( $a_rec['id'], (string) $tableview->getId() ); - $a_mapping->addMapping('Services/COPage', 'pg', 'dclf:' . $a_rec['id'], 'dclf:' . $tableview->getId()); + $a_mapping->addMapping('components/ILIAS/COPage', 'pg', 'dclf:' . $a_rec['id'], 'dclf:' . $tableview->getId()); } break; case 'il_dcl_field': @@ -285,7 +285,7 @@ public function importRecord( if ($a_rec['type'] == 0 && $a_rec['formtype'] == 0) { //set page_object to tableview // This mapping is needed for the import handled by Services/COPage $a_mapping->addMapping( - 'Services/COPage', + 'components/ILIAS/COPage', 'pg', 'dclf:' . $a_rec['id'], 'dclf:' . $tableview->getId() @@ -435,7 +435,7 @@ public function importRecord( switch ($record_field->getField()->getDatatypeId()) { case ilDclDatatype::INPUTFORMAT_MOB: // Check if we got a mapping from old object - $new_mob_id = $a_mapping->getMapping('Services/MediaObjects', 'mob', $a_rec['value']); + $new_mob_id = $a_mapping->getMapping('components/ILIAS/MediaObjects', 'mob', $a_rec['value']); $value = ($new_mob_id) ? (int) $new_mob_id : null; $this->import_temp_new_mob_ids[] = $new_mob_id; break; diff --git a/components/ILIAS/DataCollection/classes/class.ilDataCollectionExporter.php b/components/ILIAS/DataCollection/classes/class.ilDataCollectionExporter.php index 15e63d1648db..4c7e78454d2f 100644 --- a/components/ILIAS/DataCollection/classes/class.ilDataCollectionExporter.php +++ b/components/ILIAS/DataCollection/classes/class.ilDataCollectionExporter.php @@ -76,7 +76,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ 'ids' => [], ], ilDclDatatype::INPUTFORMAT_MOB => [ - 'component' => 'Services/MediaObjects', + 'component' => 'components/ILIAS/MediaObjects', 'entity' => 'mob', 'ids' => [], ], @@ -138,7 +138,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($page_object_ids)) { return [ [ - 'component' => 'Services/COPage', + 'component' => 'components/ILIAS/COPage', 'entity' => 'pg', 'ids' => $page_object_ids, ], diff --git a/components/ILIAS/DataCollection/classes/class.ilDataCollectionGlobalTemplate.php b/components/ILIAS/DataCollection/classes/class.ilDataCollectionGlobalTemplate.php index b4fa21ea108a..466e1aa8edd3 100644 --- a/components/ILIAS/DataCollection/classes/class.ilDataCollectionGlobalTemplate.php +++ b/components/ILIAS/DataCollection/classes/class.ilDataCollectionGlobalTemplate.php @@ -19,8 +19,8 @@ declare(strict_types=1); -include_once("./Services/UICore/lib/html-it/IT.php"); -include_once("./Services/UICore/lib/html-it/ITX.php"); +include_once("./components/ILIAS/UICore/lib/html-it/IT.php"); +include_once("./components/ILIAS/UICore/lib/html-it/ITX.php"); class ilDataCollectionGlobalTemplate implements ilGlobalTemplateInterface { @@ -187,17 +187,17 @@ private function getMessageTextForType(string $m): string * List of JS-Files that should be included. * @var array */ - protected array $js_files = [0 => "./Services/JavaScript/js/Basic.js"]; + protected array $js_files = [0 => "./components/ILIAS/JavaScript/js/Basic.js"]; /** * Stores if a version parameter should be appended to the js-file to force reloading. * @var array */ - protected array $js_files_vp = ["./Services/JavaScript/js/Basic.js" => true]; + protected array $js_files_vp = ["./components/ILIAS/JavaScript/js/Basic.js" => true]; /** * Stores the order in which js-files should be included. * @var array */ - protected array $js_files_batch = ["./Services/JavaScript/js/Basic.js" => 1]; + protected array $js_files_batch = ["./components/ILIAS/JavaScript/js/Basic.js" => 1]; /** * Add a javascript file that should be included in the header. @@ -210,7 +210,7 @@ public function addJavaScript(string $a_js_file, bool $a_add_version_parameter = } // ensure jquery files being loaded first - if (is_int(strpos($a_js_file, "Services/jQuery")) + if (is_int(strpos($a_js_file, "components/ILIAS/jQuery")) || is_int(strpos($a_js_file, "/jquery.js")) || is_int(strpos($a_js_file, "/jquery-min.js")) ) { @@ -638,10 +638,10 @@ public function setLocator(): void { $html = ""; - include_once("./Services/UIComponent/classes/class.ilUIHookProcessor.php"); + include_once("./components/ILIAS/UIComponent/classes/class.ilUIHookProcessor.php"); $html = $this->locator->getHTML(); $uip = new ilUIHookProcessor( - "Services/Locator", + "components/ILIAS/Locator", "main_locator", ["locator_gui" => $this->locator, "html" => $html] ); diff --git a/components/ILIAS/DataCollection/classes/class.ilObjDataCollectionGUI.php b/components/ILIAS/DataCollection/classes/class.ilObjDataCollectionGUI.php index 605173f0c962..f149c7b25656 100644 --- a/components/ILIAS/DataCollection/classes/class.ilObjDataCollectionGUI.php +++ b/components/ILIAS/DataCollection/classes/class.ilObjDataCollectionGUI.php @@ -98,7 +98,7 @@ private function addJavaScript(): void ilYuiUtil::initConnection(); ilOverlayGUI::initJavascript(); // # see https://mantis.ilias.de/view.php?id=26463 - $this->tpl->addJavaScript("./Services/UIComponent/Modal/js/Modal.js"); + $this->tpl->addJavaScript("./components/ILIAS/UIComponent/Modal/js/Modal.js"); $this->tpl->addJavaScript("components/ILIAS/DataCollection/js/datacollection.js"); } diff --git a/components/ILIAS/DataProtection/classes/Consumer.php b/components/ILIAS/DataProtection/classes/Consumer.php index bd2f738f729e..5be6208c367a 100644 --- a/components/ILIAS/DataProtection/classes/Consumer.php +++ b/components/ILIAS/DataProtection/classes/Consumer.php @@ -112,7 +112,7 @@ private function showMatchingDocument(User $user, UI $ui, Provide $legal_documen private function userHasWithdrawn(): void { $this->container['ilAppEventHandler']->raise( - 'Services/DataProtection', + 'components/ILIAS/DataProtection', 'withdraw', ['event' => $this->container->user()] ); diff --git a/components/ILIAS/DataSet/test/ilServicesDataSetSuite.php b/components/ILIAS/DataSet/test/ilServicesDataSetSuite.php index 064d5a89f5ad..40b03a7dfe95 100644 --- a/components/ILIAS/DataSet/test/ilServicesDataSetSuite.php +++ b/components/ILIAS/DataSet/test/ilServicesDataSetSuite.php @@ -31,7 +31,7 @@ public static function suite(): \ilServicesDataSetSuite { $suite = new self(); - require_once("./Services/DataSet/test/DataSetImportParserTest.php"); + require_once("./components/ILIAS/DataSet/test/DataSetImportParserTest.php"); $suite->addTestSuite("DataSetImportParserTest"); return $suite; diff --git a/components/ILIAS/Database/classes/Integrity/Association.php b/components/ILIAS/Database/classes/Integrity/Association.php index ac616cf29a2b..339a33d847ff 100644 --- a/components/ILIAS/Database/classes/Integrity/Association.php +++ b/components/ILIAS/Database/classes/Integrity/Association.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; class Association { diff --git a/components/ILIAS/Database/classes/Integrity/Definition.php b/components/ILIAS/Database/classes/Integrity/Definition.php index 4e541b9bab9d..c4272037fdef 100644 --- a/components/ILIAS/Database/classes/Integrity/Definition.php +++ b/components/ILIAS/Database/classes/Integrity/Definition.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; use InvalidArgumentException; @@ -27,7 +27,7 @@ class Definition private Ignore $ignore; /** - * @param \ILIAS\Services\Database\Integrity\Association[] $associations + * @param \ILIAS\components\Database\Integrity\Association[] $associations */ public function __construct(private array $associations, ?Ignore $ignore = null) { diff --git a/components/ILIAS/Database/classes/Integrity/Field.php b/components/ILIAS/Database/classes/Integrity/Field.php index 6dfc4257262d..0d86667e2f6c 100644 --- a/components/ILIAS/Database/classes/Integrity/Field.php +++ b/components/ILIAS/Database/classes/Integrity/Field.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; class Field { diff --git a/components/ILIAS/Database/classes/Integrity/Ignore.php b/components/ILIAS/Database/classes/Integrity/Ignore.php index 7bf50cd3fb2c..ea91e51e20bb 100644 --- a/components/ILIAS/Database/classes/Integrity/Ignore.php +++ b/components/ILIAS/Database/classes/Integrity/Ignore.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; class Ignore { diff --git a/components/ILIAS/Database/classes/Integrity/Integrity.php b/components/ILIAS/Database/classes/Integrity/Integrity.php index 0baa5f04f5e9..ee87f6abb68f 100644 --- a/components/ILIAS/Database/classes/Integrity/Integrity.php +++ b/components/ILIAS/Database/classes/Integrity/Integrity.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; use ilDBInterface; diff --git a/components/ILIAS/Database/classes/Integrity/Result.php b/components/ILIAS/Database/classes/Integrity/Result.php index 8441ae39d021..b1a011207e73 100644 --- a/components/ILIAS/Database/classes/Integrity/Result.php +++ b/components/ILIAS/Database/classes/Integrity/Result.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Database\Integrity; +namespace ILIAS\components\Database\Integrity; class Result { diff --git a/components/ILIAS/Database/classes/PDO/FieldDefinition/ForeignKeyConstraints.php b/components/ILIAS/Database/classes/PDO/FieldDefinition/ForeignKeyConstraints.php index 55c1c4cd7201..adbcb4db03df 100644 --- a/components/ILIAS/Database/classes/PDO/FieldDefinition/ForeignKeyConstraints.php +++ b/components/ILIAS/Database/classes/PDO/FieldDefinition/ForeignKeyConstraints.php @@ -15,7 +15,7 @@ * https://github.com/ILIAS-eLearning *********************************************************************/ -namespace ILIAS\Services\Database\PDO\FieldDefinition; +namespace ILIAS\components\Database\PDO\FieldDefinition; enum ForeignKeyConstraints: string { diff --git a/components/ILIAS/Database/classes/PDO/class.ilDBPdo.php b/components/ILIAS/Database/classes/PDO/class.ilDBPdo.php index f60142c219dc..64303db53210 100644 --- a/components/ILIAS/Database/classes/PDO/class.ilDBPdo.php +++ b/components/ILIAS/Database/classes/PDO/class.ilDBPdo.php @@ -18,8 +18,8 @@ declare(strict_types=1); -use ILIAS\Services\Database\Integrity\Integrity; -use ILIAS\Services\Database\PDO\FieldDefinition\ForeignKeyConstraints; +use ILIAS\components\Database\Integrity\Integrity; +use ILIAS\components\Database\PDO\FieldDefinition\ForeignKeyConstraints; /** * Class pdoDB diff --git a/components/ILIAS/Database/classes/Setup/class.ilDatabaseMetricsCollectedObjective.php b/components/ILIAS/Database/classes/Setup/class.ilDatabaseMetricsCollectedObjective.php index 37643a21826f..7bc31b86bd5b 100644 --- a/components/ILIAS/Database/classes/Setup/class.ilDatabaseMetricsCollectedObjective.php +++ b/components/ILIAS/Database/classes/Setup/class.ilDatabaseMetricsCollectedObjective.php @@ -125,10 +125,10 @@ public function setIniFile(): void define("CLIENT_DATA_DIR", $ini->readVariable("clients", "datadir") . "/" . $client_id); } if (!defined("CLIENT_WEB_DIR")) { - define("CLIENT_WEB_DIR", dirname(__DIR__, 4) . "/data/" . $client_id); + define("CLIENT_WEB_DIR", dirname(__DIR__, 5) . "/data/" . $client_id); } if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } if (!defined("ILIAS_LOG_ENABLED")) { define("ILIAS_LOG_ENABLED", false); diff --git a/components/ILIAS/Database/classes/Setup/class.ilDatabaseUpdatedObjective.php b/components/ILIAS/Database/classes/Setup/class.ilDatabaseUpdatedObjective.php index 6d0185e3a4bd..de0c8c59a7a9 100644 --- a/components/ILIAS/Database/classes/Setup/class.ilDatabaseUpdatedObjective.php +++ b/components/ILIAS/Database/classes/Setup/class.ilDatabaseUpdatedObjective.php @@ -120,10 +120,10 @@ public function setIniFile(): void define("CLIENT_DATA_DIR", $ini->readVariable("clients", "datadir") . "/" . $client_id); } if (!defined("CLIENT_WEB_DIR")) { - define("CLIENT_WEB_DIR", dirname(__DIR__, 4) . "/data/" . $client_id); + define("CLIENT_WEB_DIR", dirname(__DIR__, 5) . "/data/" . $client_id); } if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } if (!defined("ILIAS_LOG_ENABLED")) { define("ILIAS_LOG_ENABLED", false); diff --git a/components/ILIAS/Database/interfaces/interface.ilDBInterface.php b/components/ILIAS/Database/interfaces/interface.ilDBInterface.php index 05c7dd3f0ee1..f6e1b406a01b 100644 --- a/components/ILIAS/Database/interfaces/interface.ilDBInterface.php +++ b/components/ILIAS/Database/interfaces/interface.ilDBInterface.php @@ -18,8 +18,8 @@ declare(strict_types=1); -use ILIAS\Services\Database\Integrity\Integrity; -use ILIAS\Services\Database\PDO\FieldDefinition\ForeignKeyConstraints; +use ILIAS\components\Database\Integrity\Integrity; +use ILIAS\components\Database\PDO\FieldDefinition\ForeignKeyConstraints; /** * Interface ilDBInterface diff --git a/components/ILIAS/Database/test/Integrity/AssociationTest.php b/components/ILIAS/Database/test/Integrity/AssociationTest.php index 3033c21c4a01..cf0bfd6503cb 100644 --- a/components/ILIAS/Database/test/Integrity/AssociationTest.php +++ b/components/ILIAS/Database/test/Integrity/AssociationTest.php @@ -21,8 +21,8 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Association; -use ILIAS\Services\Database\Integrity\Field; +use ILIAS\components\Database\Integrity\Association; +use ILIAS\components\Database\Integrity\Field; class AssociationTest extends TestCase { diff --git a/components/ILIAS/Database/test/Integrity/DefinitionTest.php b/components/ILIAS/Database/test/Integrity/DefinitionTest.php index ca291e6b943f..93d1337a654a 100644 --- a/components/ILIAS/Database/test/Integrity/DefinitionTest.php +++ b/components/ILIAS/Database/test/Integrity/DefinitionTest.php @@ -21,10 +21,10 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Association; -use ILIAS\Services\Database\Integrity\Definition; -use ILIAS\Services\Database\Integrity\Field; -use ILIAS\Services\Database\Integrity\Ignore; +use ILIAS\components\Database\Integrity\Association; +use ILIAS\components\Database\Integrity\Definition; +use ILIAS\components\Database\Integrity\Field; +use ILIAS\components\Database\Integrity\Ignore; use InvalidArgumentException; class DefinitionTest extends TestCase @@ -129,7 +129,7 @@ public function testInvalidParameter(): void $association_two = 'funny string'; $this->expectException(InvalidArgumentException::class); - $this->expectExceptionMessage('Associations must be of type ILIAS\Services\Database\Integrity\Association.'); + $this->expectExceptionMessage('Associations must be of type ILIAS\components\Database\Integrity\Association.'); $instance = new Definition([$association_one, $association_two]); } } diff --git a/components/ILIAS/Database/test/Integrity/FieldTest.php b/components/ILIAS/Database/test/Integrity/FieldTest.php index 741ed484f876..eba3abb7d741 100644 --- a/components/ILIAS/Database/test/Integrity/FieldTest.php +++ b/components/ILIAS/Database/test/Integrity/FieldTest.php @@ -21,7 +21,7 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Field; +use ILIAS\components\Database\Integrity\Field; class FieldTest extends TestCase { diff --git a/components/ILIAS/Database/test/Integrity/IgnoreTest.php b/components/ILIAS/Database/test/Integrity/IgnoreTest.php index c3b001185db8..1948c36dff04 100644 --- a/components/ILIAS/Database/test/Integrity/IgnoreTest.php +++ b/components/ILIAS/Database/test/Integrity/IgnoreTest.php @@ -21,7 +21,7 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Ignore; +use ILIAS\components\Database\Integrity\Ignore; class IgnoreTest extends TestCase { diff --git a/components/ILIAS/Database/test/Integrity/IntegrityTest.php b/components/ILIAS/Database/test/Integrity/IntegrityTest.php index b7e6d55576c1..e622e1c12e92 100644 --- a/components/ILIAS/Database/test/Integrity/IntegrityTest.php +++ b/components/ILIAS/Database/test/Integrity/IntegrityTest.php @@ -21,11 +21,11 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Integrity; -use ILIAS\Services\Database\Integrity\Definition; -use ILIAS\Services\Database\Integrity\Result; -use ILIAS\Services\Database\Integrity\Association; -use ILIAS\Services\Database\Integrity\Field; +use ILIAS\components\Database\Integrity\Integrity; +use ILIAS\components\Database\Integrity\Definition; +use ILIAS\components\Database\Integrity\Result; +use ILIAS\components\Database\Integrity\Association; +use ILIAS\components\Database\Integrity\Field; use ilDBInterface; use ilDBStatement; diff --git a/components/ILIAS/Database/test/Integrity/ResultTest.php b/components/ILIAS/Database/test/Integrity/ResultTest.php index 85d040c62627..6ab7a09e71e3 100644 --- a/components/ILIAS/Database/test/Integrity/ResultTest.php +++ b/components/ILIAS/Database/test/Integrity/ResultTest.php @@ -21,7 +21,7 @@ namespace ILIAS\Tests\Services\Database\Integrity; use PHPUnit\Framework\TestCase; -use ILIAS\Services\Database\Integrity\Result; +use ILIAS\components\Database\Integrity\Result; class ResultTest extends TestCase { diff --git a/components/ILIAS/Database/test/ilServicesDatabaseSuite.php b/components/ILIAS/Database/test/ilServicesDatabaseSuite.php index f09183b9befd..b20098746d35 100644 --- a/components/ILIAS/Database/test/ilServicesDatabaseSuite.php +++ b/components/ILIAS/Database/test/ilServicesDatabaseSuite.php @@ -35,10 +35,10 @@ public static function suite(): \ilServicesDatabaseSuite { $suite = new self(); /** @noRector */ - require_once('./Services/Database/test/Setup/ilDatabaseSetupSuite.php'); + require_once('./components/ILIAS/Database/test/Setup/ilDatabaseSetupSuite.php'); $suite->addTestSuite(ilDatabaseSetupSuite::suite()); - require_once('./Services/Database/test/Integrity/Suite.php'); + require_once('./components/ILIAS/Database/test/Integrity/Suite.php'); $suite->addTestSuite(IntegritySuite::suite()); return $suite; diff --git a/components/ILIAS/DidacticTemplate/test/ilServicesDidacticTemplateSuite.php b/components/ILIAS/DidacticTemplate/test/ilServicesDidacticTemplateSuite.php index 8084669f05c2..23ad889c3372 100644 --- a/components/ILIAS/DidacticTemplate/test/ilServicesDidacticTemplateSuite.php +++ b/components/ILIAS/DidacticTemplate/test/ilServicesDidacticTemplateSuite.php @@ -12,7 +12,7 @@ public static function suite(): self { $suite = new ilServicesDidacticTemplateSuite(); - include_once("./Services/DidacticTemplate/test/ilDidacticTemplatePatternTest.php"); + include_once("./components/ILIAS/DidacticTemplate/test/ilDidacticTemplatePatternTest.php"); $suite->addTestSuite(ilDidacticTemplatePatternTest::class); return $suite; } diff --git a/components/ILIAS/Environment/classes/class.ilRuntime.php b/components/ILIAS/Environment/classes/class.ilRuntime.php index 4c3b1f4c36ed..0ad47a4fa763 100644 --- a/components/ILIAS/Environment/classes/class.ilRuntime.php +++ b/components/ILIAS/Environment/classes/class.ilRuntime.php @@ -21,7 +21,7 @@ /** * Class ilRuntime * @author Michael Jansen - * @package Services/Environment + * @package components/ILIAS/Environment */ final class ilRuntime { diff --git a/components/ILIAS/EventHandling/artifacts/event_handling_data.php b/components/ILIAS/EventHandling/artifacts/event_handling_data.php index 13621931b1bc..7a9aa05da4d5 100644 --- a/components/ILIAS/EventHandling/artifacts/event_handling_data.php +++ b/components/ILIAS/EventHandling/artifacts/event_handling_data.php @@ -523,13 +523,13 @@ ), 87 => array ( - 'component' => 'Services/AccessControl', + 'component' => 'components/ILIAS/AccessControl', 'type' => 'raise', 'type_specification' => 'assignUser', ), 88 => array ( - 'component' => 'Services/AccessControl', + 'component' => 'components/ILIAS/AccessControl', 'type' => 'raise', 'type_specification' => 'deassignUser', ), @@ -559,421 +559,421 @@ ), 93 => array ( - 'component' => 'Services/WebServices', + 'component' => 'components/ILIAS/WebServices', 'type' => 'raise', 'type_specification' => 'newEcsEvent', ), 94 => array ( - 'component' => 'Services/ContainerReference', + 'component' => 'components/ILIAS/ContainerReference', 'type' => 'listen', 'type_specification' => 'Modules/Course', ), 95 => array ( - 'component' => 'Services/ContainerReference', + 'component' => 'components/ILIAS/ContainerReference', 'type' => 'listen', 'type_specification' => 'Modules/Category', ), 96 => array ( - 'component' => 'Services/ContainerReference', + 'component' => 'components/ILIAS/ContainerReference', 'type' => 'listen', 'type_specification' => 'Modules/StudyProgramme', ), 97 => array ( - 'component' => 'Services/ContainerReference', + 'component' => 'components/ILIAS/ContainerReference', 'type' => 'raise', 'type_specification' => 'deleteReference', ), 98 => array ( - 'component' => 'Services/Skill', + 'component' => 'components/ILIAS/Skill', 'type' => 'listen', 'type_specification' => 'Services/Tracking', ), 99 => array ( - 'component' => 'Services/Skill', + 'component' => 'components/ILIAS/Skill', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 100 => array ( - 'component' => 'Services/Skill', + 'component' => 'components/ILIAS/Skill', 'type' => 'raise', 'type_specification' => 'deleteSkill', ), 101 => array ( - 'component' => 'Services/Repository', + 'component' => 'components/ILIAS/Repository', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 102 => array ( - 'component' => 'Services/Badge', + 'component' => 'components/ILIAS/Badge', 'type' => 'listen', 'type_specification' => 'Services/User', ), 103 => array ( - 'component' => 'Services/Badge', + 'component' => 'components/ILIAS/Badge', 'type' => 'listen', 'type_specification' => 'Services/Tracking', ), 104 => array ( - 'component' => 'Services/LTI', + 'component' => 'components/ILIAS/LTI', 'type' => 'listen', 'type_specification' => 'Services/Tracking', ), 105 => array ( - 'component' => 'Services/LTI', + 'component' => 'components/ILIAS/LTI', 'type' => 'listen', 'type_specification' => 'Services/User', ), 106 => array ( - 'component' => 'Services/Notification', + 'component' => 'components/ILIAS/Notification', 'type' => 'listen', 'type_specification' => 'Service/Object', ), 107 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'raise', 'type_specification' => 'afterUpdate', ), 108 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'raise', 'type_specification' => 'deleteUser', ), 109 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'raise', 'type_specification' => 'afterCreate', ), 110 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'raise', 'type_specification' => 'onUserFieldAttributesChanged', ), 111 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 112 => array ( - 'component' => 'Services/User', + 'component' => 'components/ILIAS/User', 'type' => 'listen', 'type_specification' => 'Services/TermsOfService', ), 113 => array ( - 'component' => 'Services/TermsOfService', + 'component' => 'components/ILIAS/TermsOfService', 'type' => 'listen', 'type_specification' => 'Services/User', ), 114 => array ( - 'component' => 'Services/TermsOfService', + 'component' => 'components/ILIAS/TermsOfService', 'type' => 'raise', 'type_specification' => 'ilTermsOfServiceEventWithdrawn', ), 115 => array ( - 'component' => 'Services/EventHandling', + 'component' => 'components/ILIAS/EventHandling', 'type' => 'listen', 'type_specification' => 'Services/EventHandling', ), 116 => array ( - 'component' => 'Services/Mail', + 'component' => 'components/ILIAS/Mail', 'type' => 'raise', 'type_specification' => 'externalEmailDelegated', ), 117 => array ( - 'component' => 'Services/Mail', + 'component' => 'components/ILIAS/Mail', 'type' => 'raise', 'type_specification' => 'sentInternalMail', ), 118 => array ( - 'component' => 'Services/Mail', + 'component' => 'components/ILIAS/Mail', 'type' => 'listen', 'type_specification' => 'Services/User', ), 119 => array ( - 'component' => 'Services/Saml', + 'component' => 'components/ILIAS/Saml', 'type' => 'listen', 'type_specification' => 'Services/Authentication', ), 120 => array ( - 'component' => 'Services/OnScreenChat', + 'component' => 'components/ILIAS/OnScreenChat', 'type' => 'listen', 'type_specification' => 'Modules/Chatroom', ), 121 => array ( - 'component' => 'Services/Certificate', + 'component' => 'components/ILIAS/Certificate', 'type' => 'listen', 'type_specification' => 'Services/Tracking', ), 122 => array ( - 'component' => 'Services/Certificate', + 'component' => 'components/ILIAS/Certificate', 'type' => 'listen', 'type_specification' => 'Services/Certificate', ), 123 => array ( - 'component' => 'Services/Certificate', + 'component' => 'components/ILIAS/Certificate', 'type' => 'listen', 'type_specification' => 'Services/User', ), 124 => array ( - 'component' => 'Services/Certificate', + 'component' => 'components/ILIAS/Certificate', 'type' => 'raise', 'type_specification' => 'certificateIssued', ), 125 => array ( - 'component' => 'Services/News', + 'component' => 'components/ILIAS/News', 'type' => 'raise', 'type_specification' => 'readNews', ), 126 => array ( - 'component' => 'Services/News', + 'component' => 'components/ILIAS/News', 'type' => 'raise', 'type_specification' => 'unreadNews', ), 127 => array ( - 'component' => 'Services/Authentication', + 'component' => 'components/ILIAS/Authentication', 'type' => 'raise', 'type_specification' => 'afterLogin', ), 128 => array ( - 'component' => 'Services/Authentication', + 'component' => 'components/ILIAS/Authentication', 'type' => 'raise', 'type_specification' => 'beforeLogout', ), 129 => array ( - 'component' => 'Services/Authentication', + 'component' => 'components/ILIAS/Authentication', 'type' => 'raise', 'type_specification' => 'afterLogout', ), 130 => array ( - 'component' => 'Services/Authentication', + 'component' => 'components/ILIAS/Authentication', 'type' => 'raise', 'type_specification' => 'expiredSessionDetected', ), 131 => array ( - 'component' => 'Services/Authentication', + 'component' => 'components/ILIAS/Authentication', 'type' => 'raise', 'type_specification' => 'reachedSessionPoolLimit', ), 132 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'listen', 'type_specification' => 'Services/User', ), 133 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'listen', 'type_specification' => 'Services/Contact', ), 134 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'raise', 'type_specification' => 'contactRequested', ), 135 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'raise', 'type_specification' => 'contactIgnored', ), 136 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'raise', 'type_specification' => 'relationLinked', ), 137 => array ( - 'component' => 'Services/Contact', + 'component' => 'components/ILIAS/Contact', 'type' => 'raise', 'type_specification' => 'relationUnlinked', ), 138 => array ( - 'component' => 'Services/Calendar', + 'component' => 'components/ILIAS/Calendar', 'type' => 'listen', 'type_specification' => 'Modules/Group', ), 139 => array ( - 'component' => 'Services/Calendar', + 'component' => 'components/ILIAS/Calendar', 'type' => 'listen', 'type_specification' => 'Modules/Session', ), 140 => array ( - 'component' => 'Services/Calendar', + 'component' => 'components/ILIAS/Calendar', 'type' => 'listen', 'type_specification' => 'Modules/Course', ), 141 => array ( - 'component' => 'Services/Calendar', + 'component' => 'components/ILIAS/Calendar', 'type' => 'listen', 'type_specification' => 'Modules/Exercise', ), 142 => array ( - 'component' => 'Services/Calendar', + 'component' => 'components/ILIAS/Calendar', 'type' => 'listen', 'type_specification' => 'Modules/EmployeeTalk', ), 143 => array ( - 'component' => 'Services/LegalDocuments', + 'component' => 'components/ILIAS/LegalDocuments', 'type' => 'listen', 'type_specification' => 'Services/Authentication', ), 144 => array ( - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'type' => 'listen', 'type_specification' => 'Services/Skill', ), 145 => array ( - 'component' => 'Services/Tree', + 'component' => 'components/ILIAS/Tree', 'type' => 'raise', 'type_specification' => 'deleteNode', ), 146 => array ( - 'component' => 'Services/OpenIdConnect', + 'component' => 'components/ILIAS/OpenIdConnect', 'type' => 'listen', 'type_specification' => 'Services/Authentication', ), 147 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'raise', 'type_specification' => 'updateStatus', ), 148 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 149 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'listen', 'type_specification' => 'Services/Tree', ), 150 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'listen', 'type_specification' => 'Modules/Course', ), 151 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'listen', 'type_specification' => 'Modules/Group', ), 152 => array ( - 'component' => 'Services/Tracking', + 'component' => 'components/ILIAS/Tracking', 'type' => 'listen', 'type_specification' => 'Modules/LearningSequence', ), 153 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'raise', 'type_specification' => 'create', ), 154 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'raise', 'type_specification' => 'update', ), 155 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'raise', 'type_specification' => 'toTrash', ), 156 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'raise', 'type_specification' => 'delete', ), 157 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'raise', 'type_specification' => 'undelete', ), 158 => array ( - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 159 => array ( - 'component' => 'Services/Search', + 'component' => 'components/ILIAS/Search', 'type' => 'raise', 'type_specification' => 'contentChanged', ), 160 => array ( - 'component' => 'Services/Search', + 'component' => 'components/ILIAS/Search', 'type' => 'listen', 'type_specification' => 'Services/Search', ), 161 => array ( - 'component' => 'Services/Search', + 'component' => 'components/ILIAS/Search', 'type' => 'listen', 'type_specification' => 'Services/Object', ), 162 => array ( - 'component' => 'Services/Tagging', + 'component' => 'components/ILIAS/Tagging', 'type' => 'listen', 'type_specification' => 'Services/Object', ), diff --git a/components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php b/components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php index 43de8a7108f9..5cf3526527ab 100644 --- a/components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php +++ b/components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php @@ -29,19 +29,19 @@ * handler through the global instance ilAppEventHandler: * * E.g. in ilObjUser->delete(): - * $ilAppEventHandler->raise("Services/User", "deleteUser", array("id" => ..., ...)) + * $ilAppEventHandler->raise("components/ILIAS/User", "deleteUser", array("id" => ..., ...)) * * A listener has to subscribe to the events of another component. This currently * is done here in the constructor, e.g. if the News service listens to the User * service, add a - * $this->listener["Services/User"] = array("Services/News"); + * $this->listener["components/ILIAS/User"] = array("components/ILIAS/News"); * This information will go to xml files in the future. * * A component has to implement a listener class that implements * Services/EventHandling/interfaces/interface.ilAppEventListener.php * * The location must be /classes/class.ilAppEventListener.php, - * e.g. ./Services/News/classes/class.ilNewsAppEventListener.php + * e.g. ./components/ILIAS/News/classes/class.ilNewsAppEventListener.php * * The class name must be ilAppEventListener. * @@ -79,7 +79,7 @@ protected function initListeners(): void /** * Raise an event. The event is passed to all interested listeners. * - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ diff --git a/components/ILIAS/EventHandling/classes/class.ilArtifactEventHandlingData.php b/components/ILIAS/EventHandling/classes/class.ilArtifactEventHandlingData.php index 84e183c9eb7a..f25eaf0c60a0 100644 --- a/components/ILIAS/EventHandling/classes/class.ilArtifactEventHandlingData.php +++ b/components/ILIAS/EventHandling/classes/class.ilArtifactEventHandlingData.php @@ -18,7 +18,7 @@ class ilArtifactEventHandlingData { - public const EVENT_HANDLING_DATA_PATH = "./Services/EventHandling/artifacts/event_handling_data.php"; + public const EVENT_HANDLING_DATA_PATH = "./components/ILIAS/EventHandling/artifacts/event_handling_data.php"; protected array $event_handling_data; diff --git a/components/ILIAS/EventHandling/classes/class.ilEventHandlingAppEventListener.php b/components/ILIAS/EventHandling/classes/class.ilEventHandlingAppEventListener.php index 142d2cad9e51..8422fce8e5bf 100644 --- a/components/ILIAS/EventHandling/classes/class.ilEventHandlingAppEventListener.php +++ b/components/ILIAS/EventHandling/classes/class.ilEventHandlingAppEventListener.php @@ -30,7 +30,7 @@ class ilEventHandlingAppEventListener implements ilAppEventListener */ public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { - if ($a_component == "Services/EventHandling" && + if ($a_component == "components/ILIAS/EventHandling" && $a_event == "myEvent" && isset($a_parameter["par1"]) && $a_parameter["par1"] == "val1" && diff --git a/components/ILIAS/EventHandling/classes/class.ilEventHookPlugin.php b/components/ILIAS/EventHandling/classes/class.ilEventHookPlugin.php index 572b210d1145..a43a92efb32d 100644 --- a/components/ILIAS/EventHandling/classes/class.ilEventHookPlugin.php +++ b/components/ILIAS/EventHandling/classes/class.ilEventHookPlugin.php @@ -28,7 +28,7 @@ abstract class ilEventHookPlugin extends ilPlugin /** * Handle the event * - * @param string component, e.g. "Services/User" + * @param string component, e.g. "components/ILIAS/User" * @param string event, e.g. "afterUpdate" * @param array array of event specific parameters */ diff --git a/components/ILIAS/EventHandling/interfaces/interface.ilAppEventListener.php b/components/ILIAS/EventHandling/interfaces/interface.ilAppEventListener.php index 18a2661e5ecd..dccccb48faea 100644 --- a/components/ILIAS/EventHandling/interfaces/interface.ilAppEventListener.php +++ b/components/ILIAS/EventHandling/interfaces/interface.ilAppEventListener.php @@ -28,7 +28,7 @@ interface ilAppEventListener { /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ diff --git a/components/ILIAS/EventHandling/test/EventTest.php b/components/ILIAS/EventHandling/test/EventTest.php index e2fa06ca3700..dafcb0a5993a 100644 --- a/components/ILIAS/EventHandling/test/EventTest.php +++ b/components/ILIAS/EventHandling/test/EventTest.php @@ -48,7 +48,7 @@ protected function setUp(): void ->will( $this->onConsecutiveCalls( [ - "component" => "Services/EventHandling", + "component" => "components/ILIAS/EventHandling", "id" => "MyTestComponent" ], null @@ -113,7 +113,7 @@ public function testEvent(): void $this->expectException(ilEventHandlingTestException::class); $handler->raise( - "Services/EventHandling", + "components/ILIAS/EventHandling", "myEvent", [ "par1" => "val1", diff --git a/components/ILIAS/EventHandling/test/ilServicesEventHandlingSuite.php b/components/ILIAS/EventHandling/test/ilServicesEventHandlingSuite.php index 025a52debb1e..70e700673abb 100644 --- a/components/ILIAS/EventHandling/test/ilServicesEventHandlingSuite.php +++ b/components/ILIAS/EventHandling/test/ilServicesEventHandlingSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/EventHandling/test/EventTest.php"); + require_once("./components/ILIAS/EventHandling/test/EventTest.php"); $suite->addTestSuite("EventTest"); return $suite; diff --git a/components/ILIAS/Excel/README.md b/components/ILIAS/Excel/README.md index bf2fdc77db28..96b47b212c82 100644 --- a/components/ILIAS/Excel/README.md +++ b/components/ILIAS/Excel/README.md @@ -8,7 +8,7 @@ This service uses an adapter interface to map behaviour from the external class ## Updates and changes (Oct 24, 2018) ILIAS 5.4 migrated from the deprecated PHPExcel to PhpSpreadsheet. To avoid any change in consumer classes of this service, -all changes were done in the adapter class ./Services/Excel/classes/class.ilExcel.php +all changes were done in the adapter class ./components/ILIAS/Excel/classes/class.ilExcel.php # Common issues diff --git a/components/ILIAS/Excel/test/ilServicesExcelSuite.php b/components/ILIAS/Excel/test/ilServicesExcelSuite.php index 298fcb011d89..1bf3c6009ee3 100644 --- a/components/ILIAS/Excel/test/ilServicesExcelSuite.php +++ b/components/ILIAS/Excel/test/ilServicesExcelSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Excel/test/ExcelTest.php"); + require_once("./components/ILIAS/Excel/test/ExcelTest.php"); $suite->addTestSuite("ExcelTest"); return $suite; diff --git a/components/ILIAS/Exceptions/test/ilServicesExceptionsSuite.php b/components/ILIAS/Exceptions/test/ilServicesExceptionsSuite.php index 96260e668a79..a82c137bea07 100644 --- a/components/ILIAS/Exceptions/test/ilServicesExceptionsSuite.php +++ b/components/ILIAS/Exceptions/test/ilServicesExceptionsSuite.php @@ -23,7 +23,7 @@ class ilServicesExceptionsSuite extends TestSuite public static function suite(): self { $suite = new self(); - include_once('./Services/Exceptions/test/ilExceptionTest.php'); + include_once('./components/ILIAS/Exceptions/test/ilExceptionTest.php'); $suite->addTestSuite(ilExceptionTest::class); return $suite; } diff --git a/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php b/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php index e85949065a5e..cc1eb00bc16a 100644 --- a/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php +++ b/components/ILIAS/Exercise/Assignment/class.ilExAssignment.php @@ -23,7 +23,7 @@ use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\UI\NotImplementedException; use ILIAS\Filesystem\Stream\Streams; -use ILIAS\Services\ResourceStorage\Collections\View\PreviewDefinition; +use ILIAS\components\ResourceStorage_\Collections\View\PreviewDefinition; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; /** diff --git a/components/ILIAS/Exercise/Assignment/class.ilExAssignmentEditorGUI.php b/components/ILIAS/Exercise/Assignment/class.ilExAssignmentEditorGUI.php index 282bef8c92a3..743d7972d1cd 100644 --- a/components/ILIAS/Exercise/Assignment/class.ilExAssignmentEditorGUI.php +++ b/components/ILIAS/Exercise/Assignment/class.ilExAssignmentEditorGUI.php @@ -19,7 +19,7 @@ use ILIAS\Exercise\Assignment\Mandatory; use ILIAS\ResourceStorage\Identification\ResourceCollectionIdentification; use ILIAS\Filesystem\Stream\Streams; -use ILIAS\Services\ResourceStorage\Collections\View\Mode; +use ILIAS\components\ResourceStorage_\Collections\View\Mode; /** * Class ilExAssignmentEditorGUI diff --git a/components/ILIAS/Exercise/IRSS/CollectionWrapperGUI.php b/components/ILIAS/Exercise/IRSS/CollectionWrapperGUI.php index 8e019a48ff15..b3c64981cd63 100644 --- a/components/ILIAS/Exercise/IRSS/CollectionWrapperGUI.php +++ b/components/ILIAS/Exercise/IRSS/CollectionWrapperGUI.php @@ -21,8 +21,8 @@ namespace ILIAS\Exercise\IRSS; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\ResourceStorage\Collections\View\Configuration; -use ILIAS\Services\ResourceStorage\Collections\View\Mode; +use ILIAS\components\ResourceStorage_\Collections\View\Configuration; +use ILIAS\components\ResourceStorage_\Collections\View\Mode; class CollectionWrapperGUI { diff --git a/components/ILIAS/Exercise/classes/class.ilExerciseDataSet.php b/components/ILIAS/Exercise/classes/class.ilExerciseDataSet.php index 3689e9c421d7..e01bcc13989c 100644 --- a/components/ILIAS/Exercise/classes/class.ilExerciseDataSet.php +++ b/components/ILIAS/Exercise/classes/class.ilExerciseDataSet.php @@ -526,7 +526,7 @@ public function importRecord( switch ($a_entity) { case "exc": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjExercise(); @@ -547,10 +547,10 @@ public function importRecord( $this->current_exc = $newObj; $a_mapping->addMapping("components/ILIAS/Exercise", "exc", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping('Services/Object', 'objs', $a_rec['Id'], $newObj->getId()); - $a_mapping->addMapping('Services/AdvancedMetaData', 'parent', $a_rec['Id'], $newObj->getId()); + $a_mapping->addMapping('components/ILIAS/Object', 'objs', $a_rec['Id'], $newObj->getId()); + $a_mapping->addMapping('components/ILIAS/AdvancedMetaData', 'parent', $a_rec['Id'], $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["Id"] . ":0:exc", $newObj->getId() . ":0:exc" diff --git a/components/ILIAS/Exercise/classes/class.ilExerciseExporter.php b/components/ILIAS/Exercise/classes/class.ilExerciseExporter.php index 184ba5856abb..06d3d5cdcb4b 100644 --- a/components/ILIAS/Exercise/classes/class.ilExerciseExporter.php +++ b/components/ILIAS/Exercise/classes/class.ilExerciseExporter.php @@ -99,7 +99,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($a_entity == "exc") { // service settings $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ); @@ -114,7 +114,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($advmd_ids !== []) { $deps[] = array( - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ); @@ -127,7 +127,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($md_ids !== []) { $deps[] = array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids ); @@ -135,7 +135,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ // service settings $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "service_settings", "ids" => $a_ids ); diff --git a/components/ILIAS/Export/HTML/class.Util.php b/components/ILIAS/Export/HTML/class.Util.php index b2227e3bd75e..8538c8181e04 100644 --- a/components/ILIAS/Export/HTML/class.Util.php +++ b/components/ILIAS/Export/HTML/class.Util.php @@ -18,7 +18,7 @@ * *********************************************************************/ -namespace ILIAS\Services\Export\HTML; +namespace ILIAS\components\Export\HTML; use ILIAS\GlobalScreen\Services; use ilFileUtils; diff --git a/components/ILIAS/Export/Print/class.PrintProcessGUI.php b/components/ILIAS/Export/Print/class.PrintProcessGUI.php index 7c6518bd3930..236f8c6f4a51 100644 --- a/components/ILIAS/Export/Print/class.PrintProcessGUI.php +++ b/components/ILIAS/Export/Print/class.PrintProcessGUI.php @@ -89,7 +89,7 @@ public function getModalElements( $ui = $this->ui; $lng = $this->lng; - $ui->mainTemplate()->addJavaScript("./Services/Form/js/Form.js"); + $ui->mainTemplate()->addJavaScript("./components/ILIAS/Form/js/Form.js"); $modal = $ui->factory()->modal()->roundtrip( $this->lng->txt("exp_print_pdf"), $ui->factory()->legacy('some modal') @@ -113,7 +113,7 @@ public function sendForm(): void { $form = $this->provider->getSelectionForm(); $mb = $this->ui->factory()->messageBox()->info($this->lng->txt("exp_print_pdf_info")); - $tpl = new \ilTemplate("tpl.print_view_selection.html", true, true, "Services/Export/Print"); + $tpl = new \ilTemplate("tpl.print_view_selection.html", true, true, "components/ILIAS/Export/Print"); $form->setTarget("print_view"); $tpl->setVariable("FORM", $form->getHTML()); $tpl->setVariable("ON_SUBMIT_CODE", $this->provider->getOnSubmitCode()); @@ -136,7 +136,7 @@ public function renderPrintView(int $content_style_id = 0): string "tpl.print_view.html", true, true, - "Services/Export/Print" + "components/ILIAS/Export/Print" ); // get all current resources from globalscreen and add them to our template diff --git a/components/ILIAS/Export/classes/class.ilExport.php b/components/ILIAS/Export/classes/class.ilExport.php index 7277b7c2cf52..ddbdb6508d1f 100644 --- a/components/ILIAS/Export/classes/class.ilExport.php +++ b/components/ILIAS/Export/classes/class.ilExport.php @@ -291,7 +291,7 @@ public static function _generateIndexFile( $a_tpl->setTitle(ilObject::_lookupTitle($a_obj_id)); $a_tpl->setDescription($lng->txt("export_export_date") . ": " . date('Y-m-d H:i:s', time()) . " (" . date_default_timezone_get() . ")"); - $f_tpl = new ilTemplate("tpl.export_list.html", true, true, "Services/Export"); + $f_tpl = new ilTemplate("tpl.export_list.html", true, true, "components/ILIAS/Export"); foreach ($a_files as $file) { $f_tpl->setCurrentBlock("file_row"); $f_tpl->setVariable("TITLE", $file["title"]); @@ -313,7 +313,7 @@ public static function _generateIndexFile( * e.g. Services/Mediapool/set_1.xml * - manifest.xml lists all files * - * + * * ... * tpl->addJavaScript('./Services/CopyWizard/js/ilContainer.js'); + $this->tpl->addJavaScript('./components/ILIAS/CopyWizard/js/ilContainer.js'); $this->tpl->setVariable('BODY_ATTRIBUTES', 'onload="ilDisableChilds(\'cmd\');"'); $table = new ilExportSelectionTableGUI($this, 'listExportFiles'); diff --git a/components/ILIAS/Export/classes/class.ilExportSelectionTableGUI.php b/components/ILIAS/Export/classes/class.ilExportSelectionTableGUI.php index f8adb5f09d0e..d2e0b8d5d9c3 100644 --- a/components/ILIAS/Export/classes/class.ilExportSelectionTableGUI.php +++ b/components/ILIAS/Export/classes/class.ilExportSelectionTableGUI.php @@ -54,7 +54,7 @@ public function __construct(object $a_parent_class, string $a_parent_cmd) $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); - $this->setRowTemplate("tpl.export_item_selection_row.html", "Services/Export"); + $this->setRowTemplate("tpl.export_item_selection_row.html", "components/ILIAS/Export"); $this->setEnableTitle(true); $this->setEnableNumInfo(true); $this->setLimit(10000); diff --git a/components/ILIAS/Export/classes/class.ilExportTableGUI.php b/components/ILIAS/Export/classes/class.ilExportTableGUI.php index 9fd6ce4092c2..0d294b9b9c0d 100644 --- a/components/ILIAS/Export/classes/class.ilExportTableGUI.php +++ b/components/ILIAS/Export/classes/class.ilExportTableGUI.php @@ -48,7 +48,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, ilObject $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate('tpl.export_table_row.html', 'Services/Export'); + $this->setRowTemplate('tpl.export_table_row.html', 'components/ILIAS/Export'); $this->initMultiCommands(); } diff --git a/components/ILIAS/Export/classes/class.ilImport.php b/components/ILIAS/Export/classes/class.ilImport.php index 203f6adaa70b..faad1dd55481 100644 --- a/components/ILIAS/Export/classes/class.ilImport.php +++ b/components/ILIAS/Export/classes/class.ilImport.php @@ -414,7 +414,7 @@ protected function doImportObject( } // write import ids before(!) final processing - $obj_map = $this->getMapping()->getMappingsOfEntity('Services/Container', 'objs'); + $obj_map = $this->getMapping()->getMappingsOfEntity('components/ILIAS/Container', 'objs'); if (is_array($obj_map)) { foreach ($obj_map as $obj_id_old => $obj_id_new) { ilObject::_writeImportId( @@ -458,7 +458,7 @@ public function processItemXml( } if ($this->objDefinition->isRBACObject($a_entity) && - $this->getMapping()->getMapping('Services/Container', 'imported', $a_id)) { + $this->getMapping()->getMapping('components/ILIAS/Container', 'imported', $a_id)) { $this->log->info('Ignoring referenced ' . $a_entity . ' with id ' . $a_id); return; } @@ -470,7 +470,7 @@ public function processItemXml( // Store information about imported obj_ids in mapping to avoid double imports of references if ($this->objDefinition->isRBACObject($a_entity)) { - $this->getMapping()->addMapping('Services/Container', 'imported', $a_id, '1'); + $this->getMapping()->addMapping('components/ILIAS/Container', 'imported', $a_id, '1'); } } } diff --git a/components/ILIAS/Export/classes/class.ilImportContainer.php b/components/ILIAS/Export/classes/class.ilImportContainer.php index da5440c2c565..378bb3fdcdba 100644 --- a/components/ILIAS/Export/classes/class.ilImportContainer.php +++ b/components/ILIAS/Export/classes/class.ilImportContainer.php @@ -81,8 +81,8 @@ protected function createDummy(string $a_type): ilObject $new->putInTree($this->getMapping()->getTargetId()); $new->setPermissions($this->getMapping()->getTargetId()); - $this->getMapping()->addMapping('Services/Container', 'objs', '0', (string) $new->getId()); - $this->getMapping()->addMapping('Services/Container', 'refs', '0', (string) $new->getRefId()); + $this->getMapping()->addMapping('components/ILIAS/Container', 'objs', '0', (string) $new->getId()); + $this->getMapping()->addMapping('components/ILIAS/Container', 'refs', '0', (string) $new->getRefId()); return $new; } diff --git a/components/ILIAS/Export/classes/class.ilSubItemSelectionTableGUI.php b/components/ILIAS/Export/classes/class.ilSubItemSelectionTableGUI.php index 7fee0685b515..64c89644749e 100644 --- a/components/ILIAS/Export/classes/class.ilSubItemSelectionTableGUI.php +++ b/components/ILIAS/Export/classes/class.ilSubItemSelectionTableGUI.php @@ -49,7 +49,7 @@ public function __construct( $this->addCommandButton($a_cmd, $a_cmd_txt); $this->setRowTemplate( "tpl.sub_item_selection_row.html", - "Services/Export" + "components/ILIAS/Export" ); $this->setTitle($this->lng->txt("export_select_resources")); $this->setData(ilExport::_getValidExportSubItems($a_ref_id)); diff --git a/components/ILIAS/Export/test/ilServicesExportSuite.php b/components/ILIAS/Export/test/ilServicesExportSuite.php index 6d49aeb2d275..4f8eb397dd66 100644 --- a/components/ILIAS/Export/test/ilServicesExportSuite.php +++ b/components/ILIAS/Export/test/ilServicesExportSuite.php @@ -26,7 +26,7 @@ public static function suite() { $suite = new ilServicesExportSuite(); - include_once("./Services/Export/test/ilExportOptionsTest.php"); + include_once("./components/ILIAS/Export/test/ilExportOptionsTest.php"); $suite->addTestSuite(ilExportOptionsTest::class); return $suite; } diff --git a/components/ILIAS/Feeds/classes/class.ilFeedWriter.php b/components/ILIAS/Feeds/classes/class.ilFeedWriter.php index 9d3226bb376e..882cf5b95f2d 100644 --- a/components/ILIAS/Feeds/classes/class.ilFeedWriter.php +++ b/components/ILIAS/Feeds/classes/class.ilFeedWriter.php @@ -116,7 +116,7 @@ public function prepareStr(string $a_str): string public function getFeed(): string { - $this->tpl = new ilTemplate("tpl.rss_2_0.xml", true, true, "Services/Feeds"); + $this->tpl = new ilTemplate("tpl.rss_2_0.xml", true, true, "components/ILIAS/Feeds"); $this->tpl->setVariable("XML", "xml"); $this->tpl->setVariable("CONTENT_ENCODING", $this->getEncoding()); diff --git a/components/ILIAS/Feeds/test/ilServicesFeedsSuite.php b/components/ILIAS/Feeds/test/ilServicesFeedsSuite.php index 6153243afa1d..05bdd5d9e0c6 100644 --- a/components/ILIAS/Feeds/test/ilServicesFeedsSuite.php +++ b/components/ILIAS/Feeds/test/ilServicesFeedsSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Feeds/test/FeedItemTest.php"); + require_once("./components/ILIAS/Feeds/test/FeedItemTest.php"); $suite->addTestSuite("FeedItemTest"); return $suite; diff --git a/components/ILIAS/File/classes/Versions/class.ilFileVersionsGUI.php b/components/ILIAS/File/classes/Versions/class.ilFileVersionsGUI.php index cd33f91be485..1e382af95517 100644 --- a/components/ILIAS/File/classes/Versions/class.ilFileVersionsGUI.php +++ b/components/ILIAS/File/classes/Versions/class.ilFileVersionsGUI.php @@ -23,12 +23,12 @@ use ILIAS\UI\Implementation\Component\Modal\Interruptive; use ILIAS\Refinery\Factory as Refinery; use ILIAS\ResourceStorage\Revision\RevisionStatus; -use ILIAS\Services\WOPI\Discovery\ActionDBRepository; -use ILIAS\Services\WOPI\Discovery\ActionRepository; -use ILIAS\Services\WOPI\Embed\EmbeddedApplication; +use ILIAS\components\WOPI\Discovery\ActionDBRepository; +use ILIAS\components\WOPI\Discovery\ActionRepository; +use ILIAS\components\WOPI\Embed\EmbeddedApplication; use ILIAS\Data\URI; use ILIAS\UI\Component\Modal\Modal; -use ILIAS\Services\WOPI\Discovery\ActionTarget; +use ILIAS\components\WOPI\Discovery\ActionTarget; /** * @author Fabian Schmid diff --git a/components/ILIAS/File/classes/class.ilFileExporter.php b/components/ILIAS/File/classes/class.ilFileExporter.php index dbf745eb246b..1c809ecd993a 100644 --- a/components/ILIAS/File/classes/class.ilFileExporter.php +++ b/components/ILIAS/File/classes/class.ilFileExporter.php @@ -47,12 +47,12 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ return [ [ - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids, ], [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ] diff --git a/components/ILIAS/File/classes/class.ilFileImporter.php b/components/ILIAS/File/classes/class.ilFileImporter.php index 1c2a477af64b..79a1b77ae1bc 100644 --- a/components/ILIAS/File/classes/class.ilFileImporter.php +++ b/components/ILIAS/File/classes/class.ilFileImporter.php @@ -37,7 +37,7 @@ public function importXmlRepresentation( ilImportMapping $a_mapping ): void { // case i container - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); $newObj->setVersion( 0 @@ -61,7 +61,7 @@ public function importXmlRepresentation( $a_mapping->addMapping("components/ILIAS/File", "file", $a_id, $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_id . ":0:file", $newObj->getId() . ":0:file" diff --git a/components/ILIAS/File/classes/class.ilObjFileGUI.php b/components/ILIAS/File/classes/class.ilObjFileGUI.php index d4b6308d2d09..396d374096fd 100644 --- a/components/ILIAS/File/classes/class.ilObjFileGUI.php +++ b/components/ILIAS/File/classes/class.ilObjFileGUI.php @@ -27,10 +27,10 @@ use ILIAS\Data\DataSize; use ILIAS\Refinery\String\Group; use ILIAS\Data\Factory; -use ILIAS\Services\WOPI\Discovery\ActionDBRepository; -use ILIAS\Services\WOPI\Embed\EmbeddedApplication; +use ILIAS\components\WOPI\Discovery\ActionDBRepository; +use ILIAS\components\WOPI\Embed\EmbeddedApplication; use ILIAS\Data\URI; -use ILIAS\Services\WOPI\Discovery\ActionTarget; +use ILIAS\components\WOPI\Discovery\ActionTarget; /** * GUI class for file objects. @@ -311,7 +311,7 @@ protected function addUIFormToAccordion(ilAccordionGUI $accordion, Standard $for $title = ($inputs === []) ? '' : $inputs[array_key_first($inputs)]->getLabel(); - $tpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "Services/Object"); + $tpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "components/ILIAS/Object"); $tpl->setVariable("TITLE", $this->lng->txt("option") . " " . $form_type . ": " . $title); $accordion->addItem($tpl->get(), $this->ui->renderer()->render($form)); @@ -336,7 +336,7 @@ protected function addLegacyFormToAccordion( $form->setTitle($title); } - $tpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "Services/Object"); + $tpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "components/ILIAS/Object"); $tpl->setVariable("TITLE", $this->lng->txt("option") . " " . $form_type . ": " . $form->getTitle()); $accordion->addItem($tpl->get(), $form->getHTML()); diff --git a/components/ILIAS/File/classes/class.ilObjFileListGUI.php b/components/ILIAS/File/classes/class.ilObjFileListGUI.php index 18c5cb910cdf..53adbe689c91 100644 --- a/components/ILIAS/File/classes/class.ilObjFileListGUI.php +++ b/components/ILIAS/File/classes/class.ilObjFileListGUI.php @@ -22,8 +22,8 @@ use ILIAS\ResourceStorage\Flavour\Definition\PagesToExtract; use ILIAS\ResourceStorage\Services; use ILIAS\Data\DataSize; -use ILIAS\Services\WOPI\Discovery\ActionDBRepository; -use ILIAS\Services\WOPI\Discovery\ActionTarget; +use ILIAS\components\WOPI\Discovery\ActionDBRepository; +use ILIAS\components\WOPI\Discovery\ActionTarget; /** * Class ilObjFileListGUI diff --git a/components/ILIAS/FileDelivery/classes/Delivery.php b/components/ILIAS/FileDelivery/classes/Delivery.php index 586e00f0a1eb..df25b034f03c 100644 --- a/components/ILIAS/FileDelivery/classes/Delivery.php +++ b/components/ILIAS/FileDelivery/classes/Delivery.php @@ -225,10 +225,10 @@ private function detemineDeliveryType(): void // $this->setDeliveryType(DeliveryMethod::XSENDFILE); // } - if (is_file('./Services/FileDelivery/classes/override.php')) { + if (is_file('./components/ILIAS/FileDelivery/classes/override.php')) { $override_delivery_type = false; /** @noRector */ - require_once('./Services/FileDelivery/classes/override.php'); + require_once('./components/ILIAS/FileDelivery/classes/override.php'); if ($override_delivery_type) { $this->setDeliveryType($override_delivery_type); } diff --git a/components/ILIAS/FileDelivery/test/ilServicesFileDeliverySuite.php b/components/ILIAS/FileDelivery/test/ilServicesFileDeliverySuite.php index 080a2e91a9f8..a48e954e354b 100644 --- a/components/ILIAS/FileDelivery/test/ilServicesFileDeliverySuite.php +++ b/components/ILIAS/FileDelivery/test/ilServicesFileDeliverySuite.php @@ -29,9 +29,9 @@ public static function suite(): \ilServicesFileDeliverySuite $suite = new self(); $suite->addTestFiles([ - './Services/FileDelivery/test/FileDeliveryTypes/XSendfileTest.php', - './Services/FileDelivery/test/FileDeliveryTypes/XAccelTest.php', - './Services/FileDelivery/test/FileDeliveryTypes/FileDeliveryTypeFactoryTest.php' + './components/ILIAS/FileDelivery/test/FileDeliveryTypes/XSendfileTest.php', + './components/ILIAS/FileDelivery/test/FileDeliveryTypes/XAccelTest.php', + './components/ILIAS/FileDelivery/test/FileDeliveryTypes/FileDeliveryTypeFactoryTest.php' ]); return $suite; diff --git a/components/ILIAS/FileServices/classes/class.ilFileServicesSettings.php b/components/ILIAS/FileServices/classes/class.ilFileServicesSettings.php index 0fd3dce4298f..e86caab91cd6 100644 --- a/components/ILIAS/FileServices/classes/class.ilFileServicesSettings.php +++ b/components/ILIAS/FileServices/classes/class.ilFileServicesSettings.php @@ -48,7 +48,7 @@ public function __construct( $this->convert_to_ascii = $general_settings->isDownloadWithAsciiFileName(); $this->settings = $settings; /** @noRector */ - $this->white_list_default = include "./Services/FileServices/defaults/default_whitelist.php"; + $this->white_list_default = include "./components/ILIAS/FileServices/defaults/default_whitelist.php"; $this->file_admin_ref_id = $this->determineFileAdminRefId(); $this->read(); } diff --git a/components/ILIAS/FileServices/test/ilServicesFileServicesSuite.php b/components/ILIAS/FileServices/test/ilServicesFileServicesSuite.php index df0630154b49..6ecb389939a4 100644 --- a/components/ILIAS/FileServices/test/ilServicesFileServicesSuite.php +++ b/components/ILIAS/FileServices/test/ilServicesFileServicesSuite.php @@ -28,10 +28,10 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/FileServices/test/ilServicesFileServicesTest.php"); + require_once("./components/ILIAS/FileServices/test/ilServicesFileServicesTest.php"); $suite->addTestSuite("ilServicesFileServicesTest"); - require_once("./Services/FileServices/test/UploadPolicyResolverTest.php"); + require_once("./components/ILIAS/FileServices/test/UploadPolicyResolverTest.php"); $suite->addTestSuite("UploadPolicyResolverTest"); return $suite; diff --git a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemComponentDataDirectoryCreatedObjective.php b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemComponentDataDirectoryCreatedObjective.php index 924dfe381fde..ccfad774f063 100644 --- a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemComponentDataDirectoryCreatedObjective.php +++ b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemComponentDataDirectoryCreatedObjective.php @@ -49,7 +49,7 @@ protected function buildPath(Setup\Environment $environment): string if ($this->base_location === self::DATADIR) { $data_dir = $ini->readVariable('clients', 'datadir'); } elseif ($this->base_location === self::WEBDIR) { - $data_dir = dirname(__DIR__, 4) . "/data"; + $data_dir = dirname(__DIR__, 5) . "/data"; } if (!isset($data_dir)) { throw new LogicException('cannot determine base directory'); diff --git a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php index 70c461114734..61db0bfdd5c9 100644 --- a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php +++ b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php @@ -53,8 +53,8 @@ public function getPreconditions(Setup\Environment $environment): array { $client_id = $environment->getResource(Setup\Environment::RESOURCE_CLIENT_ID); $data_dir = $this->config->getDataDir(); - $web_dir = dirname(__DIR__, 4) . "/data"; - $root = dirname(__DIR__, 4); + $web_dir = dirname(__DIR__, 5) . "/data"; + $root = dirname(__DIR__, 5); $client_data_dir = $data_dir . '/' . $client_id; $client_web_dir = $web_dir . '/' . $client_id; diff --git a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemSetupConfig.php b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemSetupConfig.php index 4f533c91b395..74785f5193ce 100644 --- a/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemSetupConfig.php +++ b/components/ILIAS/FileSystem/classes/Setup/class.ilFileSystemSetupConfig.php @@ -38,6 +38,6 @@ public function getDataDir(): string public function getWebDir(): string { - return dirname(__DIR__, 4) . "/data"; + return dirname(__DIR__, 5) . "/data"; } } diff --git a/components/ILIAS/FileSystem/classes/class.ilFileSystemTableGUI.php b/components/ILIAS/FileSystem/classes/class.ilFileSystemTableGUI.php index e7e60af32ca9..c10ec4174fa6 100644 --- a/components/ILIAS/FileSystem/classes/class.ilFileSystemTableGUI.php +++ b/components/ILIAS/FileSystem/classes/class.ilFileSystemTableGUI.php @@ -103,7 +103,7 @@ public function __construct( $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.directory_row.html", - "Services/FileSystem" + "components/ILIAS/FileSystem" ); $this->setEnableTitle(true); } diff --git a/components/ILIAS/FileSystem/test/ilServicesFileSystemSuite.php b/components/ILIAS/FileSystem/test/ilServicesFileSystemSuite.php index 82f708f6de52..00a65fae764c 100644 --- a/components/ILIAS/FileSystem/test/ilServicesFileSystemSuite.php +++ b/components/ILIAS/FileSystem/test/ilServicesFileSystemSuite.php @@ -26,7 +26,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/FileSystem/test/ilServicesFileSystemTest.php"); + require_once("./components/ILIAS/FileSystem/test/ilServicesFileSystemTest.php"); $suite->addTestSuite("ilServicesFileSystemTest"); return $suite; diff --git a/components/ILIAS/Folder/classes/class.ilFolderExporter.php b/components/ILIAS/Folder/classes/class.ilFolderExporter.php index 6812f5085c63..44659621b6c0 100644 --- a/components/ILIAS/Folder/classes/class.ilFolderExporter.php +++ b/components/ILIAS/Folder/classes/class.ilFolderExporter.php @@ -30,7 +30,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ // always trigger container because of co-page(s) return [ [ - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ] diff --git a/components/ILIAS/Folder/classes/class.ilFolderImporter.php b/components/ILIAS/Folder/classes/class.ilFolderImporter.php index 04f9936065ec..4515d93fe5e8 100644 --- a/components/ILIAS/Folder/classes/class.ilFolderImporter.php +++ b/components/ILIAS/Folder/classes/class.ilFolderImporter.php @@ -31,9 +31,9 @@ public function init(): void public function importXmlRepresentation(string $a_entity, string $a_id, string $a_xml, ilImportMapping $a_mapping): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $this->folder = ilObjectFactory::getInstanceByObjId((int) $new_id, false); - } elseif ($new_id = $a_mapping->getMapping('Services/Container', 'refs', '0')) { + } elseif ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'refs', '0')) { $this->folder = ilObjectFactory::getInstanceByRefId((int) $new_id, false); } elseif (!$this->folder instanceof ilObjFolder) { $this->folder = new ilObjFolder(); diff --git a/components/ILIAS/Form/classes/class.ilAlphabetInputGUI.php b/components/ILIAS/Form/classes/class.ilAlphabetInputGUI.php index 7c9c3ce9d787..026e090fb81c 100644 --- a/components/ILIAS/Form/classes/class.ilAlphabetInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilAlphabetInputGUI.php @@ -152,7 +152,7 @@ public function getToolbarHTML(): string $lng->loadLanguageModule("form"); - $tpl = new ilTemplate("tpl.prop_alphabet.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_alphabet.html", true, true, "components/ILIAS/Form"); foreach ($this->getLetters() as $l) { if (is_null($l)) { continue; diff --git a/components/ILIAS/Form/classes/class.ilCheckboxGroupInputGUI.php b/components/ILIAS/Form/classes/class.ilCheckboxGroupInputGUI.php index e16f49bc036c..64651576527f 100644 --- a/components/ILIAS/Form/classes/class.ilCheckboxGroupInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilCheckboxGroupInputGUI.php @@ -169,7 +169,7 @@ public function getToolbarHTML(): string protected function render($a_mode = ''): string { - $tpl = new ilTemplate("tpl.prop_checkbox_group.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_checkbox_group.html", true, true, "components/ILIAS/Form"); foreach ($this->getOptions() as $option) { // information text for option diff --git a/components/ILIAS/Form/classes/class.ilCheckboxInputGUI.php b/components/ILIAS/Form/classes/class.ilCheckboxInputGUI.php index 09f0f8939841..051e91acb8f3 100644 --- a/components/ILIAS/Form/classes/class.ilCheckboxInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilCheckboxInputGUI.php @@ -118,7 +118,7 @@ public function hideSubForm(): bool public function render($a_mode = ''): string { - $tpl = new ilTemplate("tpl.prop_checkbox.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_checkbox.html", true, true, "components/ILIAS/Form"); $tpl->setVariable("POST_VAR", $this->getPostVar()); $tpl->setVariable("ID", $this->getFieldId()); diff --git a/components/ILIAS/Form/classes/class.ilColorPickerInputGUI.php b/components/ILIAS/Form/classes/class.ilColorPickerInputGUI.php index 6451a4997c18..992e55c2fe09 100644 --- a/components/ILIAS/Form/classes/class.ilColorPickerInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilColorPickerInputGUI.php @@ -181,7 +181,7 @@ public static function determineHexcode(string $a_value): string public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate('tpl.prop_color.html', true, true, 'Services/Form'); + $tpl = new ilTemplate('tpl.prop_color.html', true, true, 'components/ILIAS/Form'); $tpl->setVariable('COLOR_ID', $this->getFieldId()); $ic = ilColorPickerInputGUI::determineHexcode($this->getHexcode()); if ($ic == "") { diff --git a/components/ILIAS/Form/classes/class.ilCombinationInputGUI.php b/components/ILIAS/Form/classes/class.ilCombinationInputGUI.php index c7106037132d..8290c9911de7 100644 --- a/components/ILIAS/Form/classes/class.ilCombinationInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilCombinationInputGUI.php @@ -244,7 +244,7 @@ public function insert(ilTemplate $a_tpl): void public function render(): string { - $tpl = new ilTemplate("tpl.prop_combination.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_combination.html", true, true, "components/ILIAS/Form"); if (sizeof($this->items)) { foreach ($this->items as $id => $obj) { diff --git a/components/ILIAS/Form/classes/class.ilDateDurationInputGUI.php b/components/ILIAS/Form/classes/class.ilDateDurationInputGUI.php index f498ae321e60..c74263d5a083 100644 --- a/components/ILIAS/Form/classes/class.ilDateDurationInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilDateDurationInputGUI.php @@ -346,7 +346,7 @@ public function render(): string $lng = $this->lng; $toggle_id = null; - $tpl = new ilTemplate("tpl.prop_datetime_duration.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_datetime_duration.html", true, true, "components/ILIAS/Form"); if ($this->enabledToggleFullTime()) { $this->setShowTime(true); diff --git a/components/ILIAS/Form/classes/class.ilDateTimeInputGUI.php b/components/ILIAS/Form/classes/class.ilDateTimeInputGUI.php index 4d8f48ecc8f0..0f1f18a16ed5 100644 --- a/components/ILIAS/Form/classes/class.ilDateTimeInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilDateTimeInputGUI.php @@ -217,7 +217,7 @@ public function render(): string $ilUser = $this->user; $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_datetime.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_datetime.html", true, true, "components/ILIAS/Form"); // config picker if (!$this->getDisabled()) { diff --git a/components/ILIAS/Form/classes/class.ilDurationInputGUI.php b/components/ILIAS/Form/classes/class.ilDurationInputGUI.php index ba99fc7a2922..1bd5521f6425 100644 --- a/components/ILIAS/Form/classes/class.ilDurationInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilDurationInputGUI.php @@ -181,7 +181,7 @@ public function render(): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_duration.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_duration.html", true, true, "components/ILIAS/Form"); if ($this->getShowMonths()) { $tpl->setCurrentBlock("dur_months"); diff --git a/components/ILIAS/Form/classes/class.ilEMailInputGUI.php b/components/ILIAS/Form/classes/class.ilEMailInputGUI.php index afec6dd4cafd..89c8cc21452b 100644 --- a/components/ILIAS/Form/classes/class.ilEMailInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilEMailInputGUI.php @@ -109,7 +109,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $ptpl = new ilTemplate('tpl.prop_email.html', true, true, 'Services/Form'); + $ptpl = new ilTemplate('tpl.prop_email.html', true, true, 'components/ILIAS/Form'); if ($this->getRetype()) { $ptpl->setCurrentBlock('retype_email'); diff --git a/components/ILIAS/Form/classes/class.ilFileInputGUI.php b/components/ILIAS/Form/classes/class.ilFileInputGUI.php index 696ab37c177d..023e5eb39600 100644 --- a/components/ILIAS/Form/classes/class.ilFileInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilFileInputGUI.php @@ -259,7 +259,7 @@ public function render(string $a_mode = ""): string $quota_exceeded = $quota_legend = false; - $f_tpl = new ilTemplate("tpl.prop_file.html", true, true, "Services/Form"); + $f_tpl = new ilTemplate("tpl.prop_file.html", true, true, "components/ILIAS/Form"); // show filename selection if enabled diff --git a/components/ILIAS/Form/classes/class.ilFileWizardInputGUI.php b/components/ILIAS/Form/classes/class.ilFileWizardInputGUI.php index d461e1a6f414..ccb4c536aeb4 100644 --- a/components/ILIAS/Form/classes/class.ilFileWizardInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilFileWizardInputGUI.php @@ -173,7 +173,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_filewizardinput.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_filewizardinput.html", true, true, "components/ILIAS/Form"); $i = 0; foreach ($this->filenames as $value) { @@ -231,7 +231,7 @@ public function insert(ilTemplate $a_tpl): void $a_tpl->parseCurrentBlock(); $main_tpl = $this->tpl; - $main_tpl->addJavascript("./Services/Form/js/ServiceFormWizardInput.js"); - $main_tpl->addJavascript("./Services/Form/templates/default/filewizard.js"); + $main_tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); + $main_tpl->addJavascript("./components/ILIAS/Form/templates/default/filewizard.js"); } } diff --git a/components/ILIAS/Form/classes/class.ilFormGUI.php b/components/ILIAS/Form/classes/class.ilFormGUI.php index d82710294d7e..2b8d48dbdf21 100644 --- a/components/ILIAS/Form/classes/class.ilFormGUI.php +++ b/components/ILIAS/Form/classes/class.ilFormGUI.php @@ -125,12 +125,12 @@ public function getPreventDoubleSubmission(): bool public function getHTML(): string { - $tpl = new ilTemplate("tpl.form.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.form.html", true, true, "components/ILIAS/Form"); // this line also sets multipart, so it must be before the multipart check $content = $this->getContent(); if ($this->getOpenTag()) { - $opentpl = new ilTemplate('tpl.form_open.html', true, true, "Services/Form"); + $opentpl = new ilTemplate('tpl.form_open.html', true, true, "components/ILIAS/Form"); if ($this->getTarget() != "") { $opentpl->setCurrentBlock("form_target"); $opentpl->setVariable("FORM_TARGET", $this->getTarget()); diff --git a/components/ILIAS/Form/classes/class.ilFormPropertyGUI.php b/components/ILIAS/Form/classes/class.ilFormPropertyGUI.php index df03fab871b4..351d85fc5324 100644 --- a/components/ILIAS/Form/classes/class.ilFormPropertyGUI.php +++ b/components/ILIAS/Form/classes/class.ilFormPropertyGUI.php @@ -365,7 +365,7 @@ protected function getMultiIconsHTML(): string $id = $this->getFieldId(); - $tpl = new ilTemplate("tpl.multi_icons.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.multi_icons.html", true, true, "components/ILIAS/Form"); $html = ""; if ($this->multi_addremove) { diff --git a/components/ILIAS/Form/classes/class.ilHierarchyFormGUI.php b/components/ILIAS/Form/classes/class.ilHierarchyFormGUI.php index c02200f14e98..94bce4fda082 100644 --- a/components/ILIAS/Form/classes/class.ilHierarchyFormGUI.php +++ b/components/ILIAS/Form/classes/class.ilHierarchyFormGUI.php @@ -79,7 +79,7 @@ public function __construct() $this->help_items = array(); ilYuiUtil::initDragDrop(); - $this->main_tpl->addJavascript("./Services/Form/js/ServiceFormHierarchyForm.js"); + $this->main_tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormHierarchyForm.js"); $this->http = $DIC->http(); @@ -410,7 +410,7 @@ public function getContent(): string $this->updateExpanded(); } - $ttpl = new ilTemplate("tpl.hierarchy_form.html", true, true, "Services/Form"); + $ttpl = new ilTemplate("tpl.hierarchy_form.html", true, true, "components/ILIAS/Form"); $ttpl->setVariable("TXT_SAVING", $lng->txt("saving")); $top_node_data = $this->getTree()->getNodeData($this->getCurrentTopNodeId()); $top_node = array("node_id" => $top_node_data["child"] ?? 0, @@ -557,7 +557,7 @@ public function getLegend(): string { $lng = $this->lng; - $ttpl = new ilTemplate("tpl.hierarchy_form_legend.html", true, true, "Services/Form"); + $ttpl = new ilTemplate("tpl.hierarchy_form_legend.html", true, true, "components/ILIAS/Form"); if ($this->getDragIcon() != "") { $ttpl->setCurrentBlock("help_drag"); $ttpl->setVariable("IMG_DRAG", $this->getDragIcon()); @@ -607,7 +607,7 @@ public function getLevelHTML( $childs = $this->getChilds((int) $a_par_node["node_id"]); $a_childs = $childs; - $ttpl = new ilTemplate("tpl.hierarchy_form_nodes.html", true, true, "Services/Form"); + $ttpl = new ilTemplate("tpl.hierarchy_form_nodes.html", true, true, "components/ILIAS/Form"); // prepended drop area if ($this->nodeAllowsChilds($a_par_node) && (count($childs) > 0 || $a_depth == 0)) { diff --git a/components/ILIAS/Form/classes/class.ilImageFileInputGUI.php b/components/ILIAS/Form/classes/class.ilImageFileInputGUI.php index b441527bd2ac..86bd9c2c949c 100644 --- a/components/ILIAS/Form/classes/class.ilImageFileInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilImageFileInputGUI.php @@ -110,7 +110,7 @@ public function insert(ilTemplate $a_tpl): void $lng = $this->lng; $quota_exceeded = $quota_legend = false; - $i_tpl = new ilTemplate("tpl.prop_image_file.html", true, true, "Services/Form"); + $i_tpl = new ilTemplate("tpl.prop_image_file.html", true, true, "components/ILIAS/Form"); if ($this->getAllowCapture()) { $i_tpl->setCurrentBlock("capture"); @@ -119,7 +119,7 @@ public function insert(ilTemplate $a_tpl): void $i_tpl->setVariable("TXT_TAKE_SNAPSHOT", $lng->txt("form_take_snapshot")); $i_tpl->parseCurrentBlock(); $main_tpl = $this->tpl; - $main_tpl->addJavascript("./Services/Form/js/ServiceFormImageFileCapture.js"); + $main_tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormImageFileCapture.js"); } if ($this->getImage() != "") { diff --git a/components/ILIAS/Form/classes/class.ilLinkInputGUI.php b/components/ILIAS/Form/classes/class.ilLinkInputGUI.php index c4e14ffeae15..5ce52836f13c 100644 --- a/components/ILIAS/Form/classes/class.ilLinkInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilLinkInputGUI.php @@ -348,7 +348,7 @@ public function render(): string $ti->setMaxLength($this->getExternalLinkMaxLength()); } - $itpl = new ilTemplate('tpl.prop_link.html', true, true, 'Services/Form'); + $itpl = new ilTemplate('tpl.prop_link.html', true, true, 'components/ILIAS/Form'); // internal if ($has_int) { diff --git a/components/ILIAS/Form/classes/class.ilLocationInputGUI.php b/components/ILIAS/Form/classes/class.ilLocationInputGUI.php index df9e239d6d19..1e4109c16494 100644 --- a/components/ILIAS/Form/classes/class.ilLocationInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilLocationInputGUI.php @@ -127,7 +127,7 @@ public function insert(ilTemplate $a_tpl): void $levels = []; $lng->loadLanguageModule("maps"); - $tpl = new ilTemplate("tpl.prop_location.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_location.html", true, true, "components/ILIAS/Form"); $tpl->setVariable("POST_VAR", $this->getPostVar()); $tpl->setVariable("TXT_ZOOM", $lng->txt("maps_zoom_level")); $tpl->setVariable("TXT_LATITUDE", $lng->txt("maps_latitude")); diff --git a/components/ILIAS/Form/classes/class.ilMultiSelectInputGUI.php b/components/ILIAS/Form/classes/class.ilMultiSelectInputGUI.php index 105011062a34..cb9782df734e 100644 --- a/components/ILIAS/Form/classes/class.ilMultiSelectInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilMultiSelectInputGUI.php @@ -154,7 +154,7 @@ public function render(): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_multi_select.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_multi_select.html", true, true, "components/ILIAS/Form"); $values = $this->getValue(); $options = $this->getOptions(); diff --git a/components/ILIAS/Form/classes/class.ilNonEditableValueGUI.php b/components/ILIAS/Form/classes/class.ilNonEditableValueGUI.php index 2b24ab35df98..abd240e886b0 100644 --- a/components/ILIAS/Form/classes/class.ilNonEditableValueGUI.php +++ b/components/ILIAS/Form/classes/class.ilNonEditableValueGUI.php @@ -113,7 +113,7 @@ public function render(): string { $postvar = ""; - $tpl = new ilTemplate("tpl.non_editable_value.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.non_editable_value.html", true, true, "components/ILIAS/Form"); if ($this->getPostVar() != "") { $postvar = $this->getPostVar(); if ($this->getMulti() && substr($postvar, -2) != "[]") { diff --git a/components/ILIAS/Form/classes/class.ilNumberInputGUI.php b/components/ILIAS/Form/classes/class.ilNumberInputGUI.php index 3010abceccb1..f076ab021ef9 100644 --- a/components/ILIAS/Form/classes/class.ilNumberInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilNumberInputGUI.php @@ -272,7 +272,7 @@ public function render(): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_number.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_number.html", true, true, "components/ILIAS/Form"); if (strlen((string) $this->getValue())) { $tpl->setCurrentBlock("prop_number_propval"); diff --git a/components/ILIAS/Form/classes/class.ilPasswordInputGUI.php b/components/ILIAS/Form/classes/class.ilPasswordInputGUI.php index 3d5224b3571c..7f3a17f48647 100644 --- a/components/ILIAS/Form/classes/class.ilPasswordInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilPasswordInputGUI.php @@ -226,7 +226,7 @@ public function render(): string { $lng = $this->lng; - $ptpl = new ilTemplate("tpl.prop_password.html", true, true, "Services/Form"); + $ptpl = new ilTemplate("tpl.prop_password.html", true, true, "components/ILIAS/Form"); if ($this->getRetype()) { $ptpl->setCurrentBlock("retype"); diff --git a/components/ILIAS/Form/classes/class.ilPropertyFormGUI.php b/components/ILIAS/Form/classes/class.ilPropertyFormGUI.php index 2cdf3a97c9e8..4d971a04eb09 100644 --- a/components/ILIAS/Form/classes/class.ilPropertyFormGUI.php +++ b/components/ILIAS/Form/classes/class.ilPropertyFormGUI.php @@ -492,10 +492,10 @@ public function getContent(): string ilYuiUtil::initEvent(); ilYuiUtil::initDom(); - $tpl->addJavaScript("./Services/JavaScript/js/Basic.js"); - $tpl->addJavaScript("Services/Form/js/Form.js"); + $tpl->addJavaScript("./components/ILIAS/JavaScript/js/Basic.js"); + $tpl->addJavaScript("components/ILIAS/Form/js/Form.js"); - $this->tpl = new ilTemplate("tpl.property_form.html", true, true, "Services/Form"); + $this->tpl = new ilTemplate("tpl.property_form.html", true, true, "components/ILIAS/Form"); // check if form has not title and first item is a section header // -> use section header for title and remove section header @@ -632,7 +632,7 @@ public function insertItem( //if(method_exists($item, "getMulti") && $item->getMulti()) if ($item instanceof ilMultiValuesItem && $item->getMulti()) { - $tpl->addJavascript("./Services/Form/js/ServiceFormMulti.js"); + $tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormMulti.js"); $this->tpl->setCurrentBlock("multi_in"); $this->tpl->setVariable("ID", $item->getFieldId()); diff --git a/components/ILIAS/Form/classes/class.ilRadioGroupInputGUI.php b/components/ILIAS/Form/classes/class.ilRadioGroupInputGUI.php index a4414e21205b..4739bdd97f05 100644 --- a/components/ILIAS/Form/classes/class.ilRadioGroupInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilRadioGroupInputGUI.php @@ -109,7 +109,7 @@ public function insert(ilTemplate $a_tpl): void public function render(): string { - $tpl = new ilTemplate("tpl.prop_radio.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_radio.html", true, true, "components/ILIAS/Form"); foreach ($this->getOptions() as $option) { // information text for option diff --git a/components/ILIAS/Form/classes/class.ilRepositorySelectorInputGUI.php b/components/ILIAS/Form/classes/class.ilRepositorySelectorInputGUI.php index 9636f1839ba4..11241b7fddee 100644 --- a/components/ILIAS/Form/classes/class.ilRepositorySelectorInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilRepositorySelectorInputGUI.php @@ -185,7 +185,7 @@ public function render($a_mode = "property_form"): string $tree = $this->tree; $parent_gui = ""; - $tpl = new ilTemplate("tpl.prop_rep_select.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_rep_select.html", true, true, "components/ILIAS/Form"); $tpl->setVariable("POST_VAR", $this->getPostVar()); $tpl->setVariable("ID", $this->getFieldId()); diff --git a/components/ILIAS/Form/classes/class.ilSelectBuilderInputGUI.php b/components/ILIAS/Form/classes/class.ilSelectBuilderInputGUI.php index 92c6776c789f..b95016d7ff07 100644 --- a/components/ILIAS/Form/classes/class.ilSelectBuilderInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilSelectBuilderInputGUI.php @@ -108,7 +108,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_selectbuilder.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_selectbuilder.html", true, true, "components/ILIAS/Form"); $i = 0; foreach ($this->values as $value) { if (!is_string($value)) { @@ -167,7 +167,7 @@ public function insert(ilTemplate $a_tpl): void $a_tpl->parseCurrentBlock(); $tpl = $this->tpl; - $tpl->addJavascript("./Services/Form/js/ServiceFormWizardInput.js"); - $tpl->addJavascript("./Services/Form/templates/default/textwizard.js"); + $tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); + $tpl->addJavascript("./components/ILIAS/Form/templates/default/textwizard.js"); } } diff --git a/components/ILIAS/Form/classes/class.ilSelectInputGUI.php b/components/ILIAS/Form/classes/class.ilSelectInputGUI.php index 8e5bec7a828b..ac43b3d4fe61 100644 --- a/components/ILIAS/Form/classes/class.ilSelectInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilSelectInputGUI.php @@ -142,7 +142,7 @@ public function getCustomAttributes(): array public function render($a_mode = ""): string { $sel_value = ""; - $tpl = new ilTemplate("tpl.prop_select.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_select.html", true, true, "components/ILIAS/Form"); foreach ($this->getCustomAttributes() as $attr) { $tpl->setCurrentBlock('cust_attr'); diff --git a/components/ILIAS/Form/classes/class.ilTextAreaInputGUI.php b/components/ILIAS/Form/classes/class.ilTextAreaInputGUI.php index e3135cd3c2a5..9e025e633db7 100644 --- a/components/ILIAS/Form/classes/class.ilTextAreaInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilTextAreaInputGUI.php @@ -313,7 +313,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $ttpl = new ilTemplate("tpl.prop_textarea.html", true, true, "Services/Form"); + $ttpl = new ilTemplate("tpl.prop_textarea.html", true, true, "components/ILIAS/Form"); // disabled rte if ($this->getUseRte() && $this->getDisabled()) { diff --git a/components/ILIAS/Form/classes/class.ilTextInputGUI.php b/components/ILIAS/Form/classes/class.ilTextInputGUI.php index 44ec39ba59b6..24e528ec5dbf 100644 --- a/components/ILIAS/Form/classes/class.ilTextInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilTextInputGUI.php @@ -278,7 +278,7 @@ public function render(string $a_mode = ""): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_textinput.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_textinput.html", true, true, "components/ILIAS/Form"); if (strlen((string) $this->getValue())) { $tpl->setCurrentBlock("prop_text_propval"); $tpl->setVariable( @@ -353,7 +353,7 @@ public function render(string $a_mode = ""): string iljQueryUtil::initjQuery(); iljQueryUtil::initjQueryUI(); - $jstpl = new ilTemplate("tpl.prop_text_autocomplete.js", true, true, "Services/Form"); + $jstpl = new ilTemplate("tpl.prop_text_autocomplete.js", true, true, "components/ILIAS/Form"); if ($this->getMulti()) { $jstpl->setCurrentBlock("ac_multi"); diff --git a/components/ILIAS/Form/classes/class.ilTextWizardInputGUI.php b/components/ILIAS/Form/classes/class.ilTextWizardInputGUI.php index 40129b3008c3..da10db68e70b 100644 --- a/components/ILIAS/Form/classes/class.ilTextWizardInputGUI.php +++ b/components/ILIAS/Form/classes/class.ilTextWizardInputGUI.php @@ -108,7 +108,7 @@ public function insert(ilTemplate $a_tpl): void public function render(string $a_mode = ""): string { - $tpl = new ilTemplate("tpl.prop_textwizardinput.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.prop_textwizardinput.html", true, true, "components/ILIAS/Form"); $i = 0; foreach ($this->values as $value) { if (strlen($value)) { @@ -150,8 +150,8 @@ public function render(string $a_mode = ""): string $tpl->setVariable("ELEMENT_ID", $this->getFieldId()); if (!$this->getDisabled()) { - $this->tpl->addJavascript("./Services/Form/js/ServiceFormWizardInput.js"); - $this->tpl->addJavascript("./Services/Form/templates/default/textwizard.js"); + $this->tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); + $this->tpl->addJavascript("./components/ILIAS/Form/templates/default/textwizard.js"); } return $tpl->get(); diff --git a/components/ILIAS/Form/test/ilServicesFormSuite.php b/components/ILIAS/Form/test/ilServicesFormSuite.php index c6fb299f9383..7bf4ed362485 100644 --- a/components/ILIAS/Form/test/ilServicesFormSuite.php +++ b/components/ILIAS/Form/test/ilServicesFormSuite.php @@ -31,7 +31,7 @@ public static function suite() { $suite = new self(); - require_once("./Services/Form/test/FormGUITest.php"); + require_once("./components/ILIAS/Form/test/FormGUITest.php"); $suite->addTestSuite("FormGUITest"); return $suite; diff --git a/components/ILIAS/Forum/classes/class.ilForumAppEventListener.php b/components/ILIAS/Forum/classes/class.ilForumAppEventListener.php index e2c5c720792b..f0eb6327afc2 100644 --- a/components/ILIAS/Forum/classes/class.ilForumAppEventListener.php +++ b/components/ILIAS/Forum/classes/class.ilForumAppEventListener.php @@ -430,12 +430,12 @@ public static function handleEvent(string $a_component, string $a_event, array $ } break; - case "Services/News": + case "components/ILIAS/News": if ($a_event === "readNews") { } break; - case "Services/Tree": + case "components/ILIAS/Tree": if ($a_event === "moveTree") { ilForumNotification::_clearForcedForumNotifications($a_parameter); } @@ -465,7 +465,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ } break; - case 'Services/User': + case 'components/ILIAS/User': if ($a_event === 'deleteUser') { ilForumPostDraft::deleteDraftsByUserId($a_parameter['usr_id']); } diff --git a/components/ILIAS/Forum/classes/class.ilForumExporter.php b/components/ILIAS/Forum/classes/class.ilForumExporter.php index 4681a3cf1a64..fd8b8e4e3a1d 100644 --- a/components/ILIAS/Forum/classes/class.ilForumExporter.php +++ b/components/ILIAS/Forum/classes/class.ilForumExporter.php @@ -59,13 +59,13 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ('frm' === $a_entity) { $deps[] = [ - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'entity' => 'common', 'ids' => $a_ids ]; $deps[] = [ - "component" => "Services/News", + "component" => "components/ILIAS/News", "entity" => "news_settings", "ids" => $a_ids ]; @@ -93,7 +93,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($pageObjectIds !== []) { $deps[] = [ - 'component' => 'Services/COPage', + 'component' => 'components/ILIAS/COPage', 'entity' => 'pg', 'ids' => $pageObjectIds, ]; @@ -101,7 +101,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($styleIds !== []) { $deps[] = [ - 'component' => 'Services/Style', + 'component' => 'components/ILIAS/Style', 'entity' => 'sty', 'ids' => array_values($styleIds), ]; diff --git a/components/ILIAS/Forum/classes/class.ilForumImporter.php b/components/ILIAS/Forum/classes/class.ilForumImporter.php index b2b922544d23..b5497b6d7e20 100644 --- a/components/ILIAS/Forum/classes/class.ilForumImporter.php +++ b/components/ILIAS/Forum/classes/class.ilForumImporter.php @@ -37,7 +37,7 @@ public function init(): void public function importXmlRepresentation(string $a_entity, string $a_id, string $a_xml, ilImportMapping $a_mapping): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $newObj = new ilObjForum(); @@ -59,7 +59,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void { parent::finalProcessing($a_mapping); - $copaMap = $a_mapping->getMappingsOfEntity('Services/COPage', 'pg'); + $copaMap = $a_mapping->getMappingsOfEntity('components/ILIAS/COPage', 'pg'); foreach ($copaMap as $newCopaId) { $newCopaId = (int) substr($newCopaId, strlen(self::OBJ_TYPE) + 1); @@ -68,7 +68,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void $styleMapping = $a_mapping->getMappingsOfEntity('components/ILIAS/Forum', 'style'); foreach ($styleMapping as $newForumId => $oldStyleId) { - $newStyleId = (int) $a_mapping->getMapping('Services/Style', 'sty', $oldStyleId); + $newStyleId = (int) $a_mapping->getMapping('components/ILIAS/Style', 'sty', $oldStyleId); if ($newForumId > 0 && $newStyleId > 0) { $frm = ilObjectFactory::getInstanceByObjId((int) $newForumId, false); if (!($frm instanceof ilObjForum)) { diff --git a/components/ILIAS/Forum/classes/class.ilForumXMLParser.php b/components/ILIAS/Forum/classes/class.ilForumXMLParser.php index 16aefa870821..a22981b50c35 100644 --- a/components/ILIAS/Forum/classes/class.ilForumXMLParser.php +++ b/components/ILIAS/Forum/classes/class.ilForumXMLParser.php @@ -323,7 +323,7 @@ public function handlerEndTag(XMLParser $a_xml_parser, string $a_name): void $this->lastHandledForumId = $id; $this->importMapping->addMapping( - 'Services/COPage', + 'components/ILIAS/COPage', 'pg', 'frm:' . $this->forumArray['ObjId'], 'frm:' . $this->forum->getId() diff --git a/components/ILIAS/Forum/classes/class.ilObjForumGUI.php b/components/ILIAS/Forum/classes/class.ilObjForumGUI.php index 00a1a04186de..4bece0770ccd 100644 --- a/components/ILIAS/Forum/classes/class.ilObjForumGUI.php +++ b/components/ILIAS/Forum/classes/class.ilObjForumGUI.php @@ -110,7 +110,7 @@ public function __construct($data, int $id = 0, bool $call_by_reference = true, $this->type = 'frm'; parent::__construct($data, $id, $call_by_reference, false); - $this->tpl->addJavaScript('./Services/JavaScript/js/Basic.js'); + $this->tpl->addJavaScript('./components/ILIAS/JavaScript/js/Basic.js'); $this->lng->loadLanguageModule('forum'); $this->lng->loadLanguageModule('content'); diff --git a/components/ILIAS/GlobalCache/PRIVACY.md b/components/ILIAS/GlobalCache_/PRIVACY.md similarity index 100% rename from components/ILIAS/GlobalCache/PRIVACY.md rename to components/ILIAS/GlobalCache_/PRIVACY.md diff --git a/components/ILIAS/GlobalCache/ROADMAP.md b/components/ILIAS/GlobalCache_/ROADMAP.md similarity index 100% rename from components/ILIAS/GlobalCache/ROADMAP.md rename to components/ILIAS/GlobalCache_/ROADMAP.md diff --git a/components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheAllFlushedObjective.php b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheAllFlushedObjective.php similarity index 100% rename from components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheAllFlushedObjective.php rename to components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheAllFlushedObjective.php diff --git a/components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php similarity index 96% rename from components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php rename to components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php index d500397124b6..77d61b55929b 100644 --- a/components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php +++ b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheConfigStoredObjective.php @@ -35,7 +35,7 @@ public function getHash(): string public function getLabel(): string { - return "Store configuration of Services/GlobalCache"; + return "Store configuration of components/ILIAS/GlobalCache_"; } public function isNotable(): bool diff --git a/components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheMetricsCollectedObjective.php b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheMetricsCollectedObjective.php similarity index 100% rename from components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheMetricsCollectedObjective.php rename to components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheMetricsCollectedObjective.php diff --git a/components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheSetupAgent.php b/components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php similarity index 100% rename from components/ILIAS/GlobalCache/classes/Setup/class.ilGlobalCacheSetupAgent.php rename to components/ILIAS/GlobalCache_/classes/Setup/class.ilGlobalCacheSetupAgent.php diff --git a/components/ILIAS/GlobalCache/classes/class.ilGlobalCacheSettingsAdapter.php b/components/ILIAS/GlobalCache_/classes/class.ilGlobalCacheSettingsAdapter.php similarity index 100% rename from components/ILIAS/GlobalCache/classes/class.ilGlobalCacheSettingsAdapter.php rename to components/ILIAS/GlobalCache_/classes/class.ilGlobalCacheSettingsAdapter.php diff --git a/components/ILIAS/GlobalCache/classes/class.ilMemcacheNodesRepository.php b/components/ILIAS/GlobalCache_/classes/class.ilMemcacheNodesRepository.php similarity index 100% rename from components/ILIAS/GlobalCache/classes/class.ilMemcacheNodesRepository.php rename to components/ILIAS/GlobalCache_/classes/class.ilMemcacheNodesRepository.php diff --git a/components/ILIAS/GlobalCache/maintenance.json b/components/ILIAS/GlobalCache_/maintenance.json similarity index 90% rename from components/ILIAS/GlobalCache/maintenance.json rename to components/ILIAS/GlobalCache_/maintenance.json index 1bb42f22c96f..05f8841c9f8e 100644 --- a/components/ILIAS/GlobalCache/maintenance.json +++ b/components/ILIAS/GlobalCache_/maintenance.json @@ -8,7 +8,7 @@ ], "tester": "", "testcase_writer": "", - "path": "Services/GlobalCache", + "path": "components/ILIAS/GlobalCache_", "belong_to_component": "GlobalCache", "used_in_components": [ "Component", diff --git a/components/ILIAS/GlobalScreen/ROADMAP.md b/components/ILIAS/GlobalScreen_/ROADMAP.md similarity index 100% rename from components/ILIAS/GlobalScreen/ROADMAP.md rename to components/ILIAS/GlobalScreen_/ROADMAP.md diff --git a/components/ILIAS/GlobalScreen/artifacts/global_screen_providers.php b/components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php similarity index 97% rename from components/ILIAS/GlobalScreen/artifacts/global_screen_providers.php rename to components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php index bf6d4398afbe..471cacfb35f6 100644 --- a/components/ILIAS/GlobalScreen/artifacts/global_screen_providers.php +++ b/components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php @@ -60,8 +60,8 @@ 2 => 'ILIAS\\Init\\Provider\\StartUpModificationProvider', 3 => 'ILIAS\\LTI\\Screen\\LtiViewLayoutProvider', 4 => 'ILIAS\\Repository\\Provider\\RepositoryOpenGraphExposer', - 5 => 'ILIAS\\Services\\WOPI\\Embed\\EmbeddedApplicationGSProvider', - 6 => 'ILIAS\\UICore\\PageContentProvider', + 5 => 'ILIAS\\UICore\\PageContentProvider', + 6 => 'ILIAS\\components\\WOPI\\Embed\\EmbeddedApplicationGSProvider', 7 => 'ilHTMLExportViewLayoutProvider', 8 => 'ilHelpViewLayoutProvider', 9 => 'ilLMHtmlExportViewLayoutProvider', diff --git a/components/ILIAS/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php b/components/ILIAS/GlobalScreen_/classes/Helper/BasicAccessCheckClosures.php similarity index 100% rename from components/ILIAS/GlobalScreen/classes/Helper/BasicAccessCheckClosures.php rename to components/ILIAS/GlobalScreen_/classes/Helper/BasicAccessCheckClosures.php diff --git a/components/ILIAS/GlobalScreen/classes/Helper/BasicAccessCheckClosuresSingleton.php b/components/ILIAS/GlobalScreen_/classes/Helper/BasicAccessCheckClosuresSingleton.php similarity index 100% rename from components/ILIAS/GlobalScreen/classes/Helper/BasicAccessCheckClosuresSingleton.php rename to components/ILIAS/GlobalScreen_/classes/Helper/BasicAccessCheckClosuresSingleton.php diff --git a/components/ILIAS/GlobalScreen/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php b/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php similarity index 95% rename from components/ILIAS/GlobalScreen/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php rename to components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php index 49be872a4bd5..f6d13ecd6cfc 100644 --- a/components/ILIAS/GlobalScreen/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php +++ b/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php @@ -34,7 +34,7 @@ class ilGlobalScreenBuildProviderMapObjective extends Setup\Artifact\BuildArtifa { public function getArtifactPath(): string { - return "Services/GlobalScreen/artifacts/global_screen_providers.php"; + return "components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php"; } public function build(): Setup\Artifact diff --git a/components/ILIAS/GlobalScreen/classes/Setup/class.ilGlobalScreenSetupAgent.php b/components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php similarity index 100% rename from components/ILIAS/GlobalScreen/classes/Setup/class.ilGlobalScreenSetupAgent.php rename to components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenSetupAgent.php diff --git a/components/ILIAS/GlobalScreen/classes/class.ilGSProviderFactory.php b/components/ILIAS/GlobalScreen_/classes/class.ilGSProviderFactory.php similarity index 98% rename from components/ILIAS/GlobalScreen/classes/class.ilGSProviderFactory.php rename to components/ILIAS/GlobalScreen_/classes/class.ilGSProviderFactory.php index 4dbbae533a1a..82ac621eaaee 100644 --- a/components/ILIAS/GlobalScreen/classes/class.ilGSProviderFactory.php +++ b/components/ILIAS/GlobalScreen_/classes/class.ilGSProviderFactory.php @@ -59,7 +59,7 @@ public function __construct(Container $dic) $this->dic = $dic; $this->main_menu_item_information = new ilMMItemInformation(); /** @noRector */ - $this->class_loader = include "Services/GlobalScreen/artifacts/global_screen_providers.php"; + $this->class_loader = include "components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php"; $this->component_repository = $dic["component.repository"]; $this->component_factory = $dic["component.factory"]; } diff --git a/components/ILIAS/GlobalScreen/maintenance.json b/components/ILIAS/GlobalScreen_/maintenance.json similarity index 85% rename from components/ILIAS/GlobalScreen/maintenance.json rename to components/ILIAS/GlobalScreen_/maintenance.json index dba626177e6c..12c19226b1cb 100644 --- a/components/ILIAS/GlobalScreen/maintenance.json +++ b/components/ILIAS/GlobalScreen_/maintenance.json @@ -6,7 +6,7 @@ "coordinator": [], "tester": "", "testcase_writer": "", - "path": "Services/GlobalScreen", + "path": "components/ILIAS/GlobalScreen_", "belong_to_component": "GlobalScreen", "used_in_components": [] } \ No newline at end of file diff --git a/components/ILIAS/GlobalScreen/test/ilServicesGlobalScreenSuite.php b/components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenSuite.php similarity index 89% rename from components/ILIAS/GlobalScreen/test/ilServicesGlobalScreenSuite.php rename to components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenSuite.php index 01a0f28277f6..d0a9fbfb5c3b 100644 --- a/components/ILIAS/GlobalScreen/test/ilServicesGlobalScreenSuite.php +++ b/components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenSuite.php @@ -24,7 +24,7 @@ public static function suite(): self { $suite = new self(); /** @noRector */ - require_once("./Services/GlobalScreen/test/ilServicesGlobalScreenTest.php"); + require_once("./components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenTest.php"); $suite->addTestSuite("ilServicesGlobalScreenTest"); return $suite; diff --git a/components/ILIAS/GlobalScreen/test/ilServicesGlobalScreenTest.php b/components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenTest.php similarity index 100% rename from components/ILIAS/GlobalScreen/test/ilServicesGlobalScreenTest.php rename to components/ILIAS/GlobalScreen_/test/ilServicesGlobalScreenTest.php diff --git a/components/ILIAS/Glossary/Export/GlossaryHtmlExport.php b/components/ILIAS/Glossary/Export/GlossaryHtmlExport.php index 1254b21a552c..c7c631fc54ec 100644 --- a/components/ILIAS/Glossary/Export/GlossaryHtmlExport.php +++ b/components/ILIAS/Glossary/Export/GlossaryHtmlExport.php @@ -33,7 +33,7 @@ class GlossaryHtmlExport protected string $sub_dir; protected string $target_dir; protected \ILIAS\GlobalScreen\Services $global_screen; - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; protected \ilCOPageHTMLExport $co_page_html_export; protected \ILIAS\Style\Content\Object\ObjectFacade $content_style; protected \ILIAS\Glossary\InternalService $service; @@ -54,7 +54,7 @@ public function __construct( $this->service = $DIC->glossary() ->internal(); $this->global_screen = $DIC->globalScreen(); - $this->export_util = new \ILIAS\Services\Export\HTML\Util($exp_dir, $sub_dir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($exp_dir, $sub_dir); $this->co_page_html_export = new \ilCOPageHTMLExport($this->target_dir); // get glossary presentation gui classes diff --git a/components/ILIAS/Glossary/Export/class.ilGlossaryDataSet.php b/components/ILIAS/Glossary/Export/class.ilGlossaryDataSet.php index 774ea48a2769..6eec3ad66288 100644 --- a/components/ILIAS/Glossary/Export/class.ilGlossaryDataSet.php +++ b/components/ILIAS/Glossary/Export/class.ilGlossaryDataSet.php @@ -267,7 +267,7 @@ public function importRecord( switch ($a_entity) { case "glo": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjGlossary(); @@ -291,14 +291,14 @@ public function importRecord( $this->current_obj = $newObj; $this->old_glo_id = $a_rec["Id"]; $a_mapping->addMapping("components/ILIAS/Glossary", "glo", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["Id"] . ":0:glo", $newObj->getId() . ":0:glo" ); - $a_mapping->addMapping("Services/AdvancedMetaData", "parent", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/AdvancedMetaData", "parent", $a_rec["Id"], $newObj->getId()); break; case "glo_term": @@ -327,28 +327,28 @@ public function importRecord( ); $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item", "glo:term:" . $a_rec["Id"], $term_id ); $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item_obj_id", "glo:term:" . $a_rec["Id"], $glo_id ); $a_mapping->addMapping( - "Services/AdvancedMetaData", + "components/ILIAS/AdvancedMetaData", "advmd_sub_item", "advmd:term:" . $a_rec["Id"], $term_id ); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "term:" . $a_rec["Id"], "term:" . $term_id diff --git a/components/ILIAS/Glossary/Export/class.ilGlossaryExporter.php b/components/ILIAS/Glossary/Export/class.ilGlossaryExporter.php index 1b364593db9e..a6f3060a6fa2 100644 --- a/components/ILIAS/Glossary/Export/class.ilGlossaryExporter.php +++ b/components/ILIAS/Glossary/Export/class.ilGlossaryExporter.php @@ -72,11 +72,11 @@ public function getXmlExportTailDependencies( // definition pages and their metadat $deps = array( array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $page_ids), array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids), ); @@ -91,7 +91,7 @@ public function getXmlExportTailDependencies( } if (count($tax_ids)) { $deps[] = array( - "component" => "Services/Taxonomy", + "component" => "components/ILIAS/Taxonomy", "entity" => "tax", "ids" => $tax_ids ); @@ -109,7 +109,7 @@ public function getXmlExportTailDependencies( } if (count($advmd_ids)) { $deps[] = array( - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ); @@ -120,14 +120,14 @@ public function getXmlExportTailDependencies( ? $a_ids : array($a_ids); $deps[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "object_style", "ids" => $obj_ids ); // service settings $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids); diff --git a/components/ILIAS/Glossary/Export/class.ilGlossaryImporter.php b/components/ILIAS/Glossary/Export/class.ilGlossaryImporter.php index c71c67ef98bd..1e83c522e8e3 100644 --- a/components/ILIAS/Glossary/Export/class.ilGlossaryImporter.php +++ b/components/ILIAS/Glossary/Export/class.ilGlossaryImporter.php @@ -40,7 +40,7 @@ public function importXmlRepresentation( ): void { if ($a_entity == "glo") { // case i container - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } @@ -76,7 +76,7 @@ public function finalProcessing( foreach ($maps as $old => $new) { if ($old != "new_id" && (int) $old > 0) { // get all new taxonomys of this object - $new_tax_ids = $a_mapping->getMapping("Services/Taxonomy", "tax_usage_of_obj", $old); + $new_tax_ids = $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_usage_of_obj", $old); if ($new_tax_ids !== false) { $tax_ids = explode(":", $new_tax_ids); foreach ($tax_ids as $tid) { @@ -93,7 +93,7 @@ public function finalProcessing( $field_id = $id[1]; if ($field_glo_id == $old) { // #17454 - $new_local_id = $a_mapping->getMapping("Services/AdvancedMetaData", "lfld", $field_id); + $new_local_id = $a_mapping->getMapping("components/ILIAS/AdvancedMetaData", "lfld", $field_id); if ($new_local_id) { $field_id = $new_local_id; } diff --git a/components/ILIAS/Glossary/Presentation/class.ilGlossaryPresentationGUI.php b/components/ILIAS/Glossary/Presentation/class.ilGlossaryPresentationGUI.php index 567e332fc1be..969bcb3fbca3 100644 --- a/components/ILIAS/Glossary/Presentation/class.ilGlossaryPresentationGUI.php +++ b/components/ILIAS/Glossary/Presentation/class.ilGlossaryPresentationGUI.php @@ -649,7 +649,7 @@ public function fullscreen(): string */ public function media(string $a_mode = "media"): string { - $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "Services/COPage"); + $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "components/ILIAS/COPage"); $this->tpl->setVariable("LOCATION_STYLESHEET", ilUtil::getStyleSheetLocation()); $this->tpl->setVariable( "LOCATION_CONTENT_STYLESHEET", diff --git a/components/ILIAS/Glossary/classes/class.ilGlossaryAppEventListener.php b/components/ILIAS/Glossary/classes/class.ilGlossaryAppEventListener.php index f5cc3e4a7bd8..0d55ade4ab9b 100644 --- a/components/ILIAS/Glossary/classes/class.ilGlossaryAppEventListener.php +++ b/components/ILIAS/Glossary/classes/class.ilGlossaryAppEventListener.php @@ -30,7 +30,7 @@ class ilGlossaryAppEventListener implements ilAppEventListener public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { switch ($a_component) { - case "Services/Object": + case "components/ILIAS/Object": switch ($a_event) { case "beforeDeletion": $handler = new ilGlossaryObjDeletionHandler(); diff --git a/components/ILIAS/Group/classes/class.ilGroupAppEventListener.php b/components/ILIAS/Group/classes/class.ilGroupAppEventListener.php index f8adc474cd85..a43e04364ea2 100644 --- a/components/ILIAS/Group/classes/class.ilGroupAppEventListener.php +++ b/components/ILIAS/Group/classes/class.ilGroupAppEventListener.php @@ -79,13 +79,13 @@ protected static function doAutoFill(int $a_obj_id): void /** * Handle an event in a listener. * - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { - if ($a_component == 'Services/AccessControl') { + if ($a_component == 'components/ILIAS/AccessControl') { $listener = new self(); $listener->handleUserAssignments($a_event, $a_parameter); } diff --git a/components/ILIAS/Group/classes/class.ilGroupExporter.php b/components/ILIAS/Group/classes/class.ilGroupExporter.php index 8df88e91bb51..3868b8aa9db3 100644 --- a/components/ILIAS/Group/classes/class.ilGroupExporter.php +++ b/components/ILIAS/Group/classes/class.ilGroupExporter.php @@ -40,7 +40,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ // always trigger container because of co-page(s) return array( array( - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ) @@ -60,7 +60,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($advmd_ids !== []) { $deps[] = [ - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ]; @@ -73,7 +73,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($md_ids !== []) { $deps[] = array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids ); diff --git a/components/ILIAS/Group/classes/class.ilGroupImporter.php b/components/ILIAS/Group/classes/class.ilGroupImporter.php index 95c6c6517893..c73fb2f138da 100644 --- a/components/ILIAS/Group/classes/class.ilGroupImporter.php +++ b/components/ILIAS/Group/classes/class.ilGroupImporter.php @@ -33,11 +33,11 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $refs = ilObject::_getAllReferences((int) $new_id); $ref_id = end($refs); $this->group = ilObjectFactory::getInstanceByRefId((int) $ref_id, false); - } elseif ($new_id = $a_mapping->getMapping('Services/Container', 'refs', "0")) { + } elseif ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'refs', "0")) { $this->group = ilObjectFactory::getInstanceByRefId((int) $new_id, false); } elseif (!$this->group instanceof ilObjGroup) { $this->group = new ilObjGroup(); @@ -49,7 +49,7 @@ public function importXmlRepresentation( $parser->startParsing(); $a_mapping->addMapping('components/ILIAS/Group', 'grp', $a_id, (string) $this->group->getId()); $a_mapping->addMapping( - 'Services/MetaData', + 'components/ILIAS/MetaData', 'md', $a_id . ':0:grp', $this->group->getId() . ':0:grp' diff --git a/components/ILIAS/Group/classes/class.ilGroupRegistrationGUI.php b/components/ILIAS/Group/classes/class.ilGroupRegistrationGUI.php index 7e82d0efbd44..4b3ffae08e67 100644 --- a/components/ILIAS/Group/classes/class.ilGroupRegistrationGUI.php +++ b/components/ILIAS/Group/classes/class.ilGroupRegistrationGUI.php @@ -97,7 +97,7 @@ protected function fillRegistrationPeriod(): void $warning = ''; if (ilDateTime::_before($now, $start)) { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_start')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($start)); @@ -106,7 +106,7 @@ protected function fillRegistrationPeriod(): void $warning = $this->lng->txt('mem_reg_not_started'); } elseif (ilDateTime::_after($now, $end)) { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_start')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($start)); @@ -115,7 +115,7 @@ protected function fillRegistrationPeriod(): void $warning = $this->lng->txt('mem_reg_expired'); } else { - $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.registration_period_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_FIRST', $this->lng->txt('mem_end')); $tpl->setVariable('FIRST', ilDatePresentation::formatDate($end)); } @@ -143,7 +143,7 @@ protected function fillMaxMembers(): void return; } - $tpl = new ilTemplate('tpl.max_members_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.max_members_form.html', true, true, 'components/ILIAS/Membership'); if ($this->container->getMinMembers()) { $tpl->setVariable('TXT_MIN', $this->lng->txt('mem_min_users')); diff --git a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceExporter.php b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceExporter.php index cbc30d4b3018..48af324b2722 100644 --- a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceExporter.php +++ b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceExporter.php @@ -2,8 +2,8 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './Services/Export/classes/class.ilXmlExporter.php'; -include_once './Services/ContainerReference/classes/class.ilContainerReferenceExporter.php'; +include_once './components/ILIAS/Export/classes/class.ilXmlExporter.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceExporter.php'; /** * Class for group reference export diff --git a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceImporter.php b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceImporter.php index 318a95b7babf..a8bf76dad3f6 100644 --- a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceImporter.php +++ b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceImporter.php @@ -2,8 +2,8 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once("./Services/Export/classes/class.ilXmlImporter.php"); -include_once './Services/ContainerReference/classes/class.ilContainerReferenceImporter.php'; +include_once("./components/ILIAS/Export/classes/class.ilXmlImporter.php"); +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceImporter.php'; /** diff --git a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlParser.php b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlParser.php index c0a0f169772a..62d216c3e32b 100644 --- a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlParser.php +++ b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlParser.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './Services/ContainerReference/classes/class.ilContainerReferenceXmlParser.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlParser.php'; /** diff --git a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlWriter.php b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlWriter.php index ebc7087940a3..8651226c176d 100644 --- a/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlWriter.php +++ b/components/ILIAS/GroupReference/classes/class.ilGroupReferenceXmlWriter.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once './Services/ContainerReference/classes/class.ilContainerReferenceXmlWriter.php'; +include_once './components/ILIAS/ContainerReference/classes/class.ilContainerReferenceXmlWriter.php'; /** * Class for container reference export diff --git a/components/ILIAS/GroupReference/classes/class.ilObjGroupReference.php b/components/ILIAS/GroupReference/classes/class.ilObjGroupReference.php index bd7bf5058ff0..64abbf1eeefd 100644 --- a/components/ILIAS/GroupReference/classes/class.ilObjGroupReference.php +++ b/components/ILIAS/GroupReference/classes/class.ilObjGroupReference.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); +include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); /** * @author Fabian Wolf diff --git a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceAccess.php b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceAccess.php index 9755f7e3db09..6b944eeb07ce 100644 --- a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceAccess.php +++ b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceAccess.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once("./Services/ContainerReference/classes/class.ilContainerReferenceAccess.php"); +include_once("./components/ILIAS/ContainerReference/classes/class.ilContainerReferenceAccess.php"); /** * @author Fabian Wolf diff --git a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceGUI.php b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceGUI.php index 018373a78ebc..60b312ee55a4 100644 --- a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceGUI.php +++ b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceGUI.php @@ -56,7 +56,7 @@ public function executeCommand(): void */ public static function _goto($a_target) { - include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); + include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); $target_ref_id = ilContainerReference::_lookupTargetRefId(ilObject::_lookupObjId($a_target)); include_once('./components/ILIAS/Group/classes/class.ilObjGroupGUI.php'); diff --git a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceListGUI.php b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceListGUI.php index 153f1c1ba6da..6e22748359ba 100644 --- a/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceListGUI.php +++ b/components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceListGUI.php @@ -109,7 +109,7 @@ public function initItem( $this->reference_obj_id = $obj_id; - include_once('./Services/ContainerReference/classes/class.ilContainerReference.php'); + include_once('./components/ILIAS/ContainerReference/classes/class.ilContainerReference.php'); $target_obj_id = ilContainerReference::_lookupTargetId($obj_id); $target_ref_ids = ilObject::_getAllReferences($target_obj_id); diff --git a/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleDataSet.php b/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleDataSet.php index 8ae47206116c..dc69ba1b31f4 100644 --- a/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleDataSet.php +++ b/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleDataSet.php @@ -81,7 +81,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI switch ($a_entity) { case "htlm": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { /** @var ilObjFileBasedLM $newObj */ $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { @@ -105,7 +105,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI $a_mapping->addMapping("components/ILIAS/HTMLLearningModule", "htlm", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["Id"] . ":0:htlm", $newObj->getId() . ":0:htlm" diff --git a/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleExporter.php b/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleExporter.php index d1f88713e523..0722870de48e 100644 --- a/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleExporter.php +++ b/components/ILIAS/HTMLLearningModule/classes/class.ilHTMLLearningModuleExporter.php @@ -40,14 +40,14 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ } $deps[] = [ - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids ]; // service settings $deps[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; diff --git a/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php b/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php index 3bf89a9d8ef1..e2fab9b5f5aa 100644 --- a/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php +++ b/components/ILIAS/Help/Administration/class.ilHelpModuleTableGUI.php @@ -59,7 +59,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.help_module_row.html", "Services/Help/Administration"); + $this->setRowTemplate("tpl.help_module_row.html", "components/ILIAS/Help/Administration"); $this->addCommandButton("saveOrdering", $lng->txt("sorting_save")); if ($this->has_write_permission) { diff --git a/components/ILIAS/Help/Export/class.ilHelpDataSet.php b/components/ILIAS/Help/Export/class.ilHelpDataSet.php index 0126dfba3786..3e036a8c79ff 100644 --- a/components/ILIAS/Help/Export/class.ilHelpDataSet.php +++ b/components/ILIAS/Help/Export/class.ilHelpDataSet.php @@ -114,11 +114,11 @@ public function importRecord( case "help_map": // without module ID we do nothing - $module_id = $a_mapping->getMapping('Services/Help', 'help_module', 0); + $module_id = $a_mapping->getMapping('components/ILIAS/Help', 'help_module', 0); $t = $a_mapping->getAllMappings(); if ($module_id) { $new_chap = $a_mapping->getMapping( - 'Services/Help', + 'components/ILIAS/Help', 'help_chap', $a_rec["Chap"] ); @@ -148,7 +148,7 @@ public function importRecord( case "help_tooltip": // without module ID we do nothing - $module_id = $a_mapping->getMapping('Services/Help', 'help_module', 0); + $module_id = $a_mapping->getMapping('components/ILIAS/Help', 'help_module', 0); if ($module_id) { $this->help_tooltips->addTooltip($a_rec["TtId"], $a_rec["TtText"], $module_id); } diff --git a/components/ILIAS/Help/Export/class.ilHelpExporter.php b/components/ILIAS/Help/Export/class.ilHelpExporter.php index 1a1d44f02fcc..b0873b4c716a 100644 --- a/components/ILIAS/Help/Export/class.ilHelpExporter.php +++ b/components/ILIAS/Help/Export/class.ilHelpExporter.php @@ -48,11 +48,11 @@ public function getXmlExportTailDependencies( return array( array( - "component" => "Services/Help", + "component" => "components/ILIAS/Help", "entity" => "help_map", "ids" => $lm_node_ids), array( - "component" => "Services/Help", + "component" => "components/ILIAS/Help", "entity" => "help_tooltip", "ids" => $a_ids) ); diff --git a/components/ILIAS/Help/Export/class.ilHelpImporter.php b/components/ILIAS/Help/Export/class.ilHelpImporter.php index 1d5ad356bada..3e761dbf9e5c 100644 --- a/components/ILIAS/Help/Export/class.ilHelpImporter.php +++ b/components/ILIAS/Help/Export/class.ilHelpImporter.php @@ -32,11 +32,11 @@ public function init(): void $this->ds->setDSPrefix("ds"); /** @var ilHelpImportConfig $config */ - $config = $this->getImport()->getConfig("Services/Help"); + $config = $this->getImport()->getConfig("components/ILIAS/Help"); $this->config = $config; $module_id = $this->config->getModuleId(); if ($module_id > 0) { - $this->getImport()->getMapping()->addMapping('Services/Help', 'help_module', 0, $module_id); + $this->getImport()->getMapping()->addMapping('components/ILIAS/Help', 'help_module', 0, $module_id); } } diff --git a/components/ILIAS/Help/Module/ModuleManager.php b/components/ILIAS/Help/Module/ModuleManager.php index 659cade50dd5..57d2f1402056 100644 --- a/components/ILIAS/Help/Module/ModuleManager.php +++ b/components/ILIAS/Help/Module/ModuleManager.php @@ -51,7 +51,7 @@ public function upload( try { $imp = new \ilImport(); - $conf = $imp->getConfig("Services/Help"); + $conf = $imp->getConfig("components/ILIAS/Help"); $conf->setModuleId($id); $new_id = $imp->importObject(null, $file["tmp_name"], $file["name"], "lm", "components/ILIAS/LearningModule"); // $newObj = new \ilObjLearningModule($new_id, false); @@ -62,7 +62,7 @@ public function upload( } $this->event->raise( - 'Services/Help', + 'components/ILIAS/Help', 'create', array( 'obj_id' => $id, diff --git a/components/ILIAS/Help/classes/class.ilHelpGUI.php b/components/ILIAS/Help/classes/class.ilHelpGUI.php index 6c3fc838661f..6810b326b599 100644 --- a/components/ILIAS/Help/classes/class.ilHelpGUI.php +++ b/components/ILIAS/Help/classes/class.ilHelpGUI.php @@ -198,7 +198,7 @@ public function showHelp(): void $acc->addItem(ilLMObject::_lookupTitle($st_id), $this->ui->renderer()->renderAsync($list)); } - $h_tpl = new ilTemplate("tpl.help.html", true, true, "Services/Help"); + $h_tpl = new ilTemplate("tpl.help.html", true, true, "components/ILIAS/Help"); $h_tpl->setVariable("HEAD", $lng->txt("help")); $h_tpl->setCurrentBlock("search"); @@ -226,7 +226,7 @@ public function showPage(): void $page_id = $this->help_request->getHelpPage(); - $h_tpl = new ilTemplate("tpl.help.html", true, true, "Services/Help"); + $h_tpl = new ilTemplate("tpl.help.html", true, true, "components/ILIAS/Help"); if (($t = ilSession::get("help_search_term")) != "") { $back_button = $ui->factory()->button()->bulky($ui->factory()->symbol()->glyph()->back(), $lng->txt("back"), "#")->withOnLoadCode(function ($id) use ($t) { @@ -310,10 +310,10 @@ public function initHelp( $ilSetting = $DIC->settings(); $ctrl = $DIC->ctrl(); - $a_tpl->addJavaScript("./Services/Help/js/ilHelp.js"); - $a_tpl->addJavaScript("./Services/Accordion/js/accordion.js"); + $a_tpl->addJavaScript("./components/ILIAS/Help/js/ilHelp.js"); + $a_tpl->addJavaScript("./components/ILIAS/Accordion/js/accordion.js"); iljQueryUtil::initMaphilight(); - $a_tpl->addJavaScript("./Services/COPage/js/ilCOPagePres.js"); + $a_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js"); $this->setCtrlPar(); $a_tpl->addOnLoadCode( @@ -420,7 +420,7 @@ public function search(): void $this->resetCurrentPage(); - $h_tpl = new ilTemplate("tpl.help.html", true, true, "Services/Help"); + $h_tpl = new ilTemplate("tpl.help.html", true, true, "components/ILIAS/Help"); $back_button = $ui->factory()->button()->bulky($ui->factory()->symbol()->glyph()->back(), $lng->txt("back"), "#")->withOnLoadCode(function ($id) { return diff --git a/components/ILIAS/Help/test/ilServicesHelpSuite.php b/components/ILIAS/Help/test/ilServicesHelpSuite.php index 0bc3737c16af..b21d2f804956 100644 --- a/components/ILIAS/Help/test/ilServicesHelpSuite.php +++ b/components/ILIAS/Help/test/ilServicesHelpSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Help/test/HelpStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Help/test/HelpStandardGUIRequestTest.php"); $suite->addTestSuite("HelpStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/History/classes/class.ilHistoryTableGUI.php b/components/ILIAS/History/classes/class.ilHistoryTableGUI.php index d43535781dc4..849bb69ab5be 100644 --- a/components/ILIAS/History/classes/class.ilHistoryTableGUI.php +++ b/components/ILIAS/History/classes/class.ilHistoryTableGUI.php @@ -54,7 +54,7 @@ public function getDataFromDb(): void public function initTable(): void { - $this->setRowTemplate("tpl.history_row.html", "Services/History"); + $this->setRowTemplate("tpl.history_row.html", "components/ILIAS/History"); $this->setFormAction($this->ilCtrl->getFormAction($this->getParentObject())); $this->setTitle($this->lng->txt("history")); diff --git a/components/ILIAS/History/test/ilServicesHistorySuite.php b/components/ILIAS/History/test/ilServicesHistorySuite.php index 989bd64513d4..d2224a9648ad 100644 --- a/components/ILIAS/History/test/ilServicesHistorySuite.php +++ b/components/ILIAS/History/test/ilServicesHistorySuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/History/test/HistCompareTest.php"); + require_once("./components/ILIAS/History/test/HistCompareTest.php"); $suite->addTestSuite("HistCompareTest"); return $suite; diff --git a/components/ILIAS/Imprint/test/ilServicesImprintSuite.php b/components/ILIAS/Imprint/test/ilServicesImprintSuite.php index bc38b0cc7533..625dff0a254d 100644 --- a/components/ILIAS/Imprint/test/ilServicesImprintSuite.php +++ b/components/ILIAS/Imprint/test/ilServicesImprintSuite.php @@ -26,7 +26,7 @@ public static function suite(): self { $suite = new self(); /** @noRector */ - require_once("./Services/Imprint/test/ImprintStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Imprint/test/ImprintStandardGUIRequestTest.php"); $suite->addTestSuite("ImprintStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentDataSet.php b/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentDataSet.php index 5bb75fb0a14f..a2b03b045c14 100644 --- a/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentDataSet.php +++ b/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentDataSet.php @@ -126,7 +126,7 @@ public function importRecord( string $a_schema_version ): void { if ($a_entity == "iass") { - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['id'])) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $newObj = new ilObjIndividualAssessment(); diff --git a/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentExporter.php b/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentExporter.php index 19c8e09c4689..9944ac6aec57 100644 --- a/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentExporter.php +++ b/components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentExporter.php @@ -54,7 +54,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($a_entity == "iass") { // service settings $res[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; diff --git a/components/ILIAS/IndividualAssessment/test/ilIndividualAssessmentExporterTest.php b/components/ILIAS/IndividualAssessment/test/ilIndividualAssessmentExporterTest.php index 953b4f980f79..a5e1686d6855 100644 --- a/components/ILIAS/IndividualAssessment/test/ilIndividualAssessmentExporterTest.php +++ b/components/ILIAS/IndividualAssessment/test/ilIndividualAssessmentExporterTest.php @@ -40,7 +40,7 @@ public function test_getXmlExportTailDependencies_no_entity(): void public function test_getXmlExportTailDependencies_iass(): void { $expected[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => [12,13] ]; diff --git a/components/ILIAS/InfoScreen/classes/class.ilInfoScreenGUI.php b/components/ILIAS/InfoScreen/classes/class.ilInfoScreenGUI.php index 5c3f2c59edec..56a8313bec42 100644 --- a/components/ILIAS/InfoScreen/classes/class.ilInfoScreenGUI.php +++ b/components/ILIAS/InfoScreen/classes/class.ilInfoScreenGUI.php @@ -716,7 +716,7 @@ public function getHTML(): string $ilCtrl = $this->ctrl; $ilUser = $this->user; - $tpl = new ilTemplate("tpl.infoscreen.html", true, true, "Services/InfoScreen"); + $tpl = new ilTemplate("tpl.infoscreen.html", true, true, "components/ILIAS/InfoScreen"); // other class handles form action (@todo: this is not implemented/tested) if ($this->form_action == "") { @@ -754,7 +754,7 @@ public function getHTML(): string // add top formbuttons if ((count($this->top_formbuttons) > 0) && ($this->form_action !== '')) { - $tpl->addBlockFile("TOP_FORMBUTTONS", "top_submitbuttons", "tpl.submitbuttons.html", "Services/InfoScreen"); + $tpl->addBlockFile("TOP_FORMBUTTONS", "top_submitbuttons", "tpl.submitbuttons.html", "components/ILIAS/InfoScreen"); foreach ($this->top_formbuttons as $button) { // view button diff --git a/components/ILIAS/InfoScreen/test/ilServicesInfoScreenSuite.php b/components/ILIAS/InfoScreen/test/ilServicesInfoScreenSuite.php index d56bb6aa81ef..e7bc09ffc792 100644 --- a/components/ILIAS/InfoScreen/test/ilServicesInfoScreenSuite.php +++ b/components/ILIAS/InfoScreen/test/ilServicesInfoScreenSuite.php @@ -31,7 +31,7 @@ public static function suite() { $suite = new self(); - require_once("./Services/InfoScreen/test/InfoScreenStandardGUIRequestTest.php"); + require_once("./components/ILIAS/InfoScreen/test/InfoScreenStandardGUIRequestTest.php"); $suite->addTestSuite("InfoScreenStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/Init/classes/Dependencies/InitCtrlService.php b/components/ILIAS/Init/classes/Dependencies/InitCtrlService.php index d01169f215fd..4a396b0e163e 100644 --- a/components/ILIAS/Init/classes/Dependencies/InitCtrlService.php +++ b/components/ILIAS/Init/classes/Dependencies/InitCtrlService.php @@ -19,7 +19,7 @@ declare(strict_types=1); use ILIAS\DI\Container; -use ILIAS\Services\Help\ScreenId\HelpScreenIdObserver; +use ILIAS\components\Help\ScreenId\HelpScreenIdObserver; /** * Class InitCtrlService wraps the initialization of ilCtrl. @@ -40,7 +40,7 @@ final class InitCtrlService public function init(Container $dic): void { $this->abortIfMissingDependencies($dic); - $ilias_path = dirname(__FILE__, 5) . '/'; + $ilias_path = dirname(__FILE__, 6) . '/'; try { $ctrl_structure = new ilCtrlStructure( diff --git a/components/ILIAS/Init/classes/class.ilErrorHandling.php b/components/ILIAS/Init/classes/class.ilErrorHandling.php index b2cc0acc5c00..bd059d2773b0 100644 --- a/components/ILIAS/Init/classes/class.ilErrorHandling.php +++ b/components/ILIAS/Init/classes/class.ilErrorHandling.php @@ -258,9 +258,9 @@ protected function defaultHandler(): HandlerInterface return new CallbackHandler(function ($exception, Inspector $inspector, Run $run) { global $DIC; - require_once("Services/Logging/classes/error/class.ilLoggingErrorSettings.php"); - require_once("Services/Logging/classes/error/class.ilLoggingErrorFileStorage.php"); - require_once("Services/Utilities/classes/class.ilUtil.php"); + require_once("components/ILIAS/Logging/classes/error/class.ilLoggingErrorSettings.php"); + require_once("components/ILIAS/Logging/classes/error/class.ilLoggingErrorFileStorage.php"); + require_once("components/ILIAS/Utilities/classes/class.ilUtil.php"); $session_id = substr(session_id(), 0, 5); $random = new \ilRandom(); diff --git a/components/ILIAS/Init/classes/class.ilInitialisation.php b/components/ILIAS/Init/classes/class.ilInitialisation.php index 36308330b787..4ee45c59ae56 100644 --- a/components/ILIAS/Init/classes/class.ilInitialisation.php +++ b/components/ILIAS/Init/classes/class.ilInitialisation.php @@ -102,7 +102,7 @@ protected static function requireCommonIncludes(): void /** @noRector */ require_once "cli/inc.ilias_version.php"; - self::initGlobal("ilBench", "ilBenchmark", "./Services/Utilities/classes/class.ilBenchmark.php"); + self::initGlobal("ilBench", "ilBenchmark", "./components/ILIAS/Utilities/classes/class.ilBenchmark.php"); } /** @@ -667,7 +667,7 @@ protected static function setCookieConstants(): void define('IL_COOKIE_EXPIRE', 0); define('IL_COOKIE_DOMAIN', ''); if (!defined('IL_COOKIE_PATH')) { - // Might be already defined by ./cli/sso/index.php or other scripts (like those in ./Services/SAML/lib/*) + // Might be already defined by ./cli/sso/index.php or other scripts (like those in ./components/ILIAS/SAML/lib/*) define('IL_COOKIE_PATH', $cookie_path); } } @@ -775,7 +775,7 @@ protected static function initSettings(): void self::initGlobal( "ilSetting", "ilSetting", - "Services/Administration/classes/class.ilSetting.php" + "components/ILIAS/Administration/classes/class.ilSetting.php" ); // check correct setup @@ -817,13 +817,13 @@ protected static function initStyle(): void self::initGlobal( "styleDefinition", "ilStyleDefinition", - "./Services/Style/System/classes/class.ilStyleDefinition.php" + "./components/ILIAS/Style/System/classes/class.ilStyleDefinition.php" ); // add user interface hook for style initialisation foreach ($component_factory->getActivePluginsInSlot("uihk") as $ui_plugin) { $gui_class = $ui_plugin->getUIClassInstance(); - $gui_class->modifyGUI("Services/Init", "init_style", array("styleDefinition" => $DIC->systemStyle())); + $gui_class->modifyGUI("components/ILIAS/Init", "init_style", array("styleDefinition" => $DIC->systemStyle())); } } @@ -1021,7 +1021,7 @@ protected static function initAccessHandling(): void self::initGlobal( "rbacreview", "ilRbacReview", - "./Services/AccessControl/classes/class.ilRbacReview.php" + "./components/ILIAS/AccessControl/classes/class.ilRbacReview.php" ); $rbacsystem = ilRbacSystem::getInstance(); @@ -1030,13 +1030,13 @@ protected static function initAccessHandling(): void self::initGlobal( "rbacadmin", "ilRbacAdmin", - "./Services/AccessControl/classes/class.ilRbacAdmin.php" + "./components/ILIAS/AccessControl/classes/class.ilRbacAdmin.php" ); self::initGlobal( "ilAccess", "ilAccess", - "./Services/AccessControl/classes/class.ilAccess.php" + "./components/ILIAS/AccessControl/classes/class.ilAccess.php" ); } @@ -1194,7 +1194,7 @@ protected static function initCore(): void self::initGlobal( "ilErr", "ilErrorHandling", - "./Services/Init/classes/class.ilErrorHandling.php" + "./components/ILIAS/Init/classes/class.ilErrorHandling.php" ); self::removeUnsafeCharacters(); @@ -1204,7 +1204,7 @@ protected static function initCore(): void define('IL_INITIAL_WD', getcwd()); // deprecated - self::initGlobal("ilias", "ILIAS", "./Services/Init/classes/class.ilias.php"); + self::initGlobal("ilias", "ILIAS", "./components/ILIAS/Init/classes/class.ilias.php"); } /** @@ -1249,7 +1249,7 @@ protected static function initClient(): void self::initGlobal( "ilAppEventHandler", "ilAppEventHandler", - "./Services/EventHandling/classes/class.ilAppEventHandler.php" + "./components/ILIAS/EventHandling/classes/class.ilAppEventHandler.php" ); // there are rare cases where initILIAS is called twice for a request @@ -1261,10 +1261,10 @@ protected static function initClient(): void self::initGlobal( "ilPluginAdmin", new ilPluginAdmin($DIC["component.repository"]), - "./Services/Component/classes/class.ilPluginAdmin.php" + "./components/ILIAS/Component/classes/class.ilPluginAdmin.php" ); } - self::initGlobal("https", "ilHTTPS", "./Services/Http/classes/class.ilHTTPS.php"); + self::initGlobal("https", "ilHTTPS", "./components/ILIAS/Http/classes/class.ilHTTPS.php"); self::initSettings(); self::setSessionHandler(); self::initCron($GLOBALS['DIC']); @@ -1287,13 +1287,13 @@ protected static function initClient(): void self::initGlobal( "ilObjDataCache", "ilObjectDataCache", - "./Services/Object/classes/class.ilObjectDataCache.php" + "./components/ILIAS/Object/classes/class.ilObjectDataCache.php" ); self::initGlobal( "objDefinition", "ilObjectDefinition", - "./Services/Object/classes/class.ilObjectDefinition.php" + "./components/ILIAS/Object/classes/class.ilObjectDefinition.php" ); // $tree @@ -1321,7 +1321,7 @@ protected static function initUser(): void self::initGlobal( "ilUser", new ilObjUser(ANONYMOUS_USER_ID), - "./Services/User/classes/class.ilObjUser.php" + "./components/ILIAS/User/classes/class.ilObjUser.php" ); $ilias->account = $ilUser; @@ -1540,13 +1540,13 @@ protected static function initHTML(): void self::initGlobal( "ilNavigationHistory", "ilNavigationHistory", - "Services/Navigation/classes/class.ilNavigationHistory.php" + "components/ILIAS/Navigation/classes/class.ilNavigationHistory.php" ); self::initGlobal( "ilHelp", "ilHelpGUI", - "Services/Help/classes/class.ilHelpGUI.php" + "components/ILIAS/Help/classes/class.ilHelpGUI.php" ); if (DEVMODE) { @@ -1558,19 +1558,19 @@ protected static function initHTML(): void self::initGlobal( "ilToolbar", "ilToolbarGUI", - "./Services/UIComponent/Toolbar/classes/class.ilToolbarGUI.php" + "./components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php" ); self::initGlobal( "ilLocator", "ilLocatorGUI", - "./Services/Locator/classes/class.ilLocatorGUI.php" + "./components/ILIAS/Locator/classes/class.ilLocatorGUI.php" ); self::initGlobal( "ilTabs", "ilTabsGUI", - "./Services/UIComponent/Tabs/classes/class.ilTabsGUI.php" + "./components/ILIAS/UIComponent/Tabs/classes/class.ilTabsGUI.php" ); if (ilContext::hasUser()) { @@ -1590,7 +1590,7 @@ protected static function initHTML(): void $_GET['offset'] = (int) $_GET['offset']; // old code } - self::initGlobal("lti", "ilLTIViewGUI", "./Services/LTI/classes/class.ilLTIViewGUI.php"); + self::initGlobal("lti", "ilLTIViewGUI", "./components/ILIAS/LTI/classes/class.ilLTIViewGUI.php"); $GLOBALS["DIC"]["lti"]->init(); self::initKioskMode($GLOBALS["DIC"]); } diff --git a/components/ILIAS/Init/classes/class.ilStartUpGUI.php b/components/ILIAS/Init/classes/class.ilStartUpGUI.php index e1ac040af75d..ccc7ce5ea7d7 100644 --- a/components/ILIAS/Init/classes/class.ilStartUpGUI.php +++ b/components/ILIAS/Init/classes/class.ilStartUpGUI.php @@ -199,7 +199,7 @@ private function showLoginPageOrStartupPage(): void $auth_session->logout(); $ilAppEventHandler->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'afterLogout', [ 'username' => $this->user->getLogin(), @@ -810,7 +810,7 @@ private function showLoginInformation(string $page_editor_html, ilGlobalTemplate private function showCASLoginForm(string $page_editor_html): string { if ($this->setting->get('cas_active')) { - $tpl = new ilTemplate('tpl.login_form_cas.html', true, true, 'Services/Init'); + $tpl = new ilTemplate('tpl.login_form_cas.html', true, true, 'components/ILIAS/Init'); $tpl->setVariable('TXT_CAS_LOGIN', $this->lng->txt('login_to_ilias_via_cas')); $tpl->setVariable('TXT_CAS_LOGIN_BUTTON', ilUtil::getImagePath('auth/cas_login_button.png')); $tpl->setVariable('TXT_CAS_LOGIN_INSTRUCTIONS', $this->setting->get('cas_login_instructions')); @@ -835,7 +835,7 @@ private function showShibbolethLoginForm(string $page_editor_html): string $target = $this->initTargetFromQuery(); if ($this->setting->get('shib_active')) { - $tpl = new ilTemplate('tpl.login_form_shibboleth.html', true, true, 'Services/Init'); + $tpl = new ilTemplate('tpl.login_form_shibboleth.html', true, true, 'components/ILIAS/Init'); $tpl->setVariable( 'SHIB_FORMACTION', @@ -962,7 +962,7 @@ private function showRegistrationLinks(string $page_editor_html): string { global $tpl; - $rtpl = new ilTemplate('tpl.login_registration_links.html', true, true, 'Services/Init'); + $rtpl = new ilTemplate('tpl.login_registration_links.html', true, true, 'components/ILIAS/Init'); // allow new registrations? if (ilRegistrationSettings::_lookupRegistrationType() !== ilRegistrationSettings::IL_REG_DISABLED) { @@ -1275,7 +1275,7 @@ private function showLogout(): void private function doLogout(): void { $this->eventHandler->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'beforeLogout', [ 'user_id' => $this->user->getId() @@ -1289,7 +1289,7 @@ private function doLogout(): void ilSession::setClosingContext(ilSession::SESSION_CLOSE_USER); $this->authSession->logout(); $this->eventHandler->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'afterLogout', [ 'username' => $this->user->getLogin(), @@ -1315,7 +1315,7 @@ private function doLogout(): void protected function showLegalDocuments(): void { global $DIC; - $tpl = self::initStartUpTemplate(['agreement.html', 'Services/LegalDocuments'], true, false); + $tpl = self::initStartUpTemplate(['agreement.html', 'components/ILIAS/LegalDocuments'], true, false); $tpl->setVariable('CONTENT', $DIC['legalDocuments']->agreeContent(self::class, __FUNCTION__)); self::printToGlobalTemplate($tpl); } @@ -1597,7 +1597,7 @@ public static function initStartUpTemplate( $tpl = new ilGlobalTemplate('tpl.main.html', true, true); - $tpl->addBlockfile('CONTENT', 'content', 'tpl.startup_screen.html', 'Services/Init'); + $tpl->addBlockfile('CONTENT', 'content', 'tpl.startup_screen.html', 'components/ILIAS/Init'); $view_title = $DIC->language()->txt('login_to_ilias'); if ($a_show_back) { @@ -1628,7 +1628,7 @@ public static function initStartUpTemplate( $template_dir = $a_tmpl[1]; } else { $template_file = $a_tmpl; - $template_dir = 'Services/Init'; + $template_dir = 'components/ILIAS/Init'; } $tpl->addBlockFile('STARTUP_CONTENT', 'startup_content', $template_file, $template_dir); @@ -1649,7 +1649,7 @@ public static function initStartUpTemplate( private function showSamlLoginForm(string $page_editor_html): string { if (count(ilSamlIdp::getActiveIdpList()) > 0 && ilSamlSettings::getInstance()->isDisplayedOnLoginPage()) { - $tpl = new ilTemplate('tpl.login_form_saml.html', true, true, 'Services/Saml'); + $tpl = new ilTemplate('tpl.login_form_saml.html', true, true, 'components/ILIAS/Saml'); $return = ''; $target = $this->initTargetFromQuery(); @@ -1679,7 +1679,7 @@ private function showOpenIdConnectLoginForm(string $page_editor_html): string { $oidc_settings = ilOpenIdConnectSettings::getInstance(); if ($oidc_settings->getActive()) { - $tpl = new ilTemplate('tpl.login_element.html', true, true, 'Services/OpenIdConnect'); + $tpl = new ilTemplate('tpl.login_element.html', true, true, 'components/ILIAS/OpenIdConnect'); $this->lng->loadLanguageModule('auth'); $tpl->setVariable('TXT_OIDCONNECT_HEADER', $this->lng->txt('auth_oidc_login_element_info')); @@ -1901,7 +1901,7 @@ private function showSamlIdpSelection(ilSamlAuth $auth, array $idps): void { $this->help->setSubScreenId('saml_idp_selection'); - self::initStartUpTemplate(['tpl.saml_idp_selection.html', 'Services/Saml']); + self::initStartUpTemplate(['tpl.saml_idp_selection.html', 'components/ILIAS/Saml']); $this->ctrl->setTargetScript('saml.php'); $items = []; diff --git a/components/ILIAS/ItemGroup/classes/class.ilItemGroupDataSet.php b/components/ILIAS/ItemGroup/classes/class.ilItemGroupDataSet.php index 1e02100ce738..f71473f5b55f 100644 --- a/components/ILIAS/ItemGroup/classes/class.ilItemGroupDataSet.php +++ b/components/ILIAS/ItemGroup/classes/class.ilItemGroupDataSet.php @@ -134,7 +134,7 @@ public function importRecord( ): void { switch ($a_entity) { case "itgr": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { /** @var ilObjItemGroup $newObj */ $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { @@ -154,7 +154,7 @@ public function importRecord( break; case "itgr_item": - if ($obj_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['ItemId'])) { + if ($obj_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['ItemId'])) { $ref_id = current(ilObject::_getAllReferences($obj_id)); $itgri = new ilItemGroupItems(); $itgri->setItemGroupId($this->current_obj->getId()); diff --git a/components/ILIAS/KioskMode/README.md b/components/ILIAS/KioskMode_/README.md similarity index 100% rename from components/ILIAS/KioskMode/README.md rename to components/ILIAS/KioskMode_/README.md diff --git a/components/ILIAS/KioskMode/classes/class.ilKioskModeService.php b/components/ILIAS/KioskMode_/classes/class.ilKioskModeService.php similarity index 100% rename from components/ILIAS/KioskMode/classes/class.ilKioskModeService.php rename to components/ILIAS/KioskMode_/classes/class.ilKioskModeService.php diff --git a/components/ILIAS/KioskMode/classes/class.ilKioskModeView.php b/components/ILIAS/KioskMode_/classes/class.ilKioskModeView.php similarity index 100% rename from components/ILIAS/KioskMode/classes/class.ilKioskModeView.php rename to components/ILIAS/KioskMode_/classes/class.ilKioskModeView.php diff --git a/components/ILIAS/KioskMode/maintenance.json b/components/ILIAS/KioskMode_/maintenance.json similarity index 88% rename from components/ILIAS/KioskMode/maintenance.json rename to components/ILIAS/KioskMode_/maintenance.json index 6691624d2a2e..1ae2066c5a70 100644 --- a/components/ILIAS/KioskMode/maintenance.json +++ b/components/ILIAS/KioskMode_/maintenance.json @@ -8,7 +8,7 @@ ], "tester": "", "testcase_writer": "", - "path": "Services/KioskMode", + "path": "components/ILIAS/KioskMode_", "belong_to_component": "General Kiosk-Mode", "used_in_components": [ "Learning Sequence" diff --git a/components/ILIAS/KioskMode/test/class.ilDummyKioskModeView.php b/components/ILIAS/KioskMode_/test/class.ilDummyKioskModeView.php similarity index 100% rename from components/ILIAS/KioskMode/test/class.ilDummyKioskModeView.php rename to components/ILIAS/KioskMode_/test/class.ilDummyKioskModeView.php diff --git a/components/ILIAS/KioskMode/test/ilKioskModeServiceTest.php b/components/ILIAS/KioskMode_/test/ilKioskModeServiceTest.php similarity index 100% rename from components/ILIAS/KioskMode/test/ilKioskModeServiceTest.php rename to components/ILIAS/KioskMode_/test/ilKioskModeServiceTest.php diff --git a/components/ILIAS/KioskMode/test/ilServicesKioskModeSuite.php b/components/ILIAS/KioskMode_/test/ilServicesKioskModeSuite.php similarity index 100% rename from components/ILIAS/KioskMode/test/ilServicesKioskModeSuite.php rename to components/ILIAS/KioskMode_/test/ilServicesKioskModeSuite.php diff --git a/components/ILIAS/LDAP/classes/class.ilLDAPRoleAssignmentTableGUI.php b/components/ILIAS/LDAP/classes/class.ilLDAPRoleAssignmentTableGUI.php index 2c1bd44736d5..c3ff62f3a0e0 100644 --- a/components/ILIAS/LDAP/classes/class.ilLDAPRoleAssignmentTableGUI.php +++ b/components/ILIAS/LDAP/classes/class.ilLDAPRoleAssignmentTableGUI.php @@ -42,7 +42,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd = '') $this->addColumn($this->lng->txt('ldap_add_remove'), '', '30%'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.show_role_assignment_row.html", "Services/LDAP"); + $this->setRowTemplate("tpl.show_role_assignment_row.html", "components/ILIAS/LDAP"); $this->setDefaultOrderField('type'); $this->setDefaultOrderDirection("desc"); } diff --git a/components/ILIAS/LDAP/classes/class.ilLDAPRoleMappingTableGUI.php b/components/ILIAS/LDAP/classes/class.ilLDAPRoleMappingTableGUI.php index fc827a691cf2..2632eae2262a 100644 --- a/components/ILIAS/LDAP/classes/class.ilLDAPRoleMappingTableGUI.php +++ b/components/ILIAS/LDAP/classes/class.ilLDAPRoleMappingTableGUI.php @@ -49,7 +49,7 @@ public function __construct(object $a_parent_obj, int $a_server_id, string $a_pa $this->addColumn($this->lng->txt('ldap_info_text'), "info"); $this->addColumn($this->lng->txt('action')); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); - $this->setRowTemplate("tpl.ldap_role_mapping_row.html", "Services/LDAP"); + $this->setRowTemplate("tpl.ldap_role_mapping_row.html", "components/ILIAS/LDAP"); $this->setDefaultOrderField('title'); $this->setDefaultOrderDirection("desc"); $this->addMultiCommand('confirmDeleteRoleMapping', $this->lng->txt("delete")); diff --git a/components/ILIAS/LDAP/classes/class.ilLDAPServerTableGUI.php b/components/ILIAS/LDAP/classes/class.ilLDAPServerTableGUI.php index 605b6ba68531..1bee704d4459 100644 --- a/components/ILIAS/LDAP/classes/class.ilLDAPServerTableGUI.php +++ b/components/ILIAS/LDAP/classes/class.ilLDAPServerTableGUI.php @@ -48,7 +48,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd = "", st $this->setId('ldap_server_list'); $this->setTitle($this->lng->txt('ldap_servers')); - $this->setRowTemplate('tpl.ldap_server_row.html', 'Services/LDAP'); + $this->setRowTemplate('tpl.ldap_server_row.html', 'components/ILIAS/LDAP'); $this->addColumn($this->lng->txt('active'), '', '1%'); $this->addColumn($this->lng->txt('title'), '', '80%'); diff --git a/components/ILIAS/LDAP/classes/class.ilLDAPSettingsGUI.php b/components/ILIAS/LDAP/classes/class.ilLDAPSettingsGUI.php index 27328e07b9f1..f484c68a3f59 100644 --- a/components/ILIAS/LDAP/classes/class.ilLDAPSettingsGUI.php +++ b/components/ILIAS/LDAP/classes/class.ilLDAPSettingsGUI.php @@ -238,7 +238,7 @@ public function roleAssignments(): void $this->setSubTabs(); $this->tabs_gui->activateTab('role_assignments'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'Services/LDAP'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'components/ILIAS/LDAP'); $this->initFormRoleAssignments('create'); $this->role_mapping_rule = ilLDAPRoleAssignmentRule::_getInstanceByRuleId(0); @@ -325,7 +325,7 @@ public function updateRoleAssignment(): bool $this->main_tpl->setOnScreenMessage('failure', $this->lng->txt($roleErrorMessage)); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'Services/LDAP'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'components/ILIAS/LDAP'); $this->form->setValuesByPost(); $this->tpl->setVariable('NEW_ASSIGNMENT_TBL', $this->form->getHTML()); @@ -413,7 +413,7 @@ public function addRoleAssignment(): bool $this->main_tpl->setOnScreenMessage('failure', $this->lng->txt($roleErrorMessage)); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'Services/LDAP'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_assignments.html', 'components/ILIAS/LDAP'); // DONE: wrap this $this->form->setValuesByPost(); @@ -1373,7 +1373,7 @@ public function roleMapping(): void $propertie_form->addItem($binding); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_mappings.html', 'Services/LDAP'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ldap_role_mappings.html', 'components/ILIAS/LDAP'); $this->tpl->setVariable("NEW_ASSIGNMENT_TBL", $propertie_form->getHTML()); //Set Group Assignments Table if mappings exist diff --git a/components/ILIAS/LTI/classes/Consumer/class.ilObjectConsumerTableGUI.php b/components/ILIAS/LTI/classes/Consumer/class.ilObjectConsumerTableGUI.php index 3b64cbd27fe7..d1e0ceab7f23 100644 --- a/components/ILIAS/LTI/classes/Consumer/class.ilObjectConsumerTableGUI.php +++ b/components/ILIAS/LTI/classes/Consumer/class.ilObjectConsumerTableGUI.php @@ -53,7 +53,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd) $this->addColumn($DIC->language()->txt("actions"), ""); $this->setFormAction($DIC->ctrl()->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.lti_consumer_list_row.html", "Services/LTI"); + $this->setRowTemplate("tpl.lti_consumer_list_row.html", "components/ILIAS/LTI"); $this->setDefaultOrderField("title"); $this->getItems(); diff --git a/components/ILIAS/LTI/classes/InternalProvider/class.ilLTIProviderReleasedObjectsTableGUI.php b/components/ILIAS/LTI/classes/InternalProvider/class.ilLTIProviderReleasedObjectsTableGUI.php index 69130b5410c5..11d4add8fe64 100644 --- a/components/ILIAS/LTI/classes/InternalProvider/class.ilLTIProviderReleasedObjectsTableGUI.php +++ b/components/ILIAS/LTI/classes/InternalProvider/class.ilLTIProviderReleasedObjectsTableGUI.php @@ -47,7 +47,7 @@ public function init(): void $this->addColumn($this->lng->txt('lti_consumer'), 'consumer', '30%'); $this->setOrderColumn('title'); - $this->setRowTemplate('tpl.lti_object_table_row.html', 'Services/LTI'); + $this->setRowTemplate('tpl.lti_object_table_row.html', 'components/ILIAS/LTI'); } /** diff --git a/components/ILIAS/LTI/classes/Screen/LtiViewLayoutProvider.php b/components/ILIAS/LTI/classes/Screen/LtiViewLayoutProvider.php index c48df8fc59a0..ef85550cb3e1 100644 --- a/components/ILIAS/LTI/classes/Screen/LtiViewLayoutProvider.php +++ b/components/ILIAS/LTI/classes/Screen/LtiViewLayoutProvider.php @@ -55,7 +55,7 @@ public function isInterestedInContexts(): ContextCollection */ public function getPageBuilderDecorator(CalledContexts $screen_context_stack): ?PageBuilderModification { - $this->globalScreen()->layout()->meta()->addCss('./Services/LTI/templates/default/lti.css'); + $this->globalScreen()->layout()->meta()->addCss('./components/ILIAS/LTI/templates/default/lti.css'); $is_exit_mode = $this->isLTIExitMode($screen_context_stack); $external_css = ($is_exit_mode) ? '' : $this->dic["lti"]->getExternalCss(); if ($external_css !== '') { diff --git a/components/ILIAS/LTI/classes/class.ilLTIAppEventListener.php b/components/ILIAS/LTI/classes/class.ilLTIAppEventListener.php index 1b62f1b91494..6cde52ad229b 100644 --- a/components/ILIAS/LTI/classes/class.ilLTIAppEventListener.php +++ b/components/ILIAS/LTI/classes/class.ilLTIAppEventListener.php @@ -172,7 +172,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ $logger = ilLoggerFactory::getLogger('ltis'); $logger->debug('Handling event: ' . $a_event . ' from ' . $a_component); - if ($a_component == 'Services/Tracking') { + if ($a_component == 'components/ILIAS/Tracking') { if ($a_event == 'updateStatus') { $listener = self::getInstance(); $listener->handleUpdateStatus( diff --git a/components/ILIAS/LTI/classes/class.ilObjLTIAdministrationGUI.php b/components/ILIAS/LTI/classes/class.ilObjLTIAdministrationGUI.php index c91d06c34c4c..3dc8ccf3e912 100644 --- a/components/ILIAS/LTI/classes/class.ilObjLTIAdministrationGUI.php +++ b/components/ILIAS/LTI/classes/class.ilObjLTIAdministrationGUI.php @@ -207,7 +207,7 @@ protected function saveSettingsForm() // create global role LTI-User protected function createLtiUserRole(): void { - // include_once './Services/AccessControl/classes/class.ilObjRole.php'; + // include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; $role = new ilObjRole(); $role->setTitle("il_lti_global_role"); $role->setDescription("This global role should only contain the permission 'read' for repository and categories. Do not rename this role."); diff --git a/components/ILIAS/LTIConsumer/classes/Certificate/class.ilLTIConsumerPlaceholderDescription.php b/components/ILIAS/LTIConsumer/classes/Certificate/class.ilLTIConsumerPlaceholderDescription.php index 6634f4f7286a..61fe46b29653 100644 --- a/components/ILIAS/LTIConsumer/classes/Certificate/class.ilLTIConsumerPlaceholderDescription.php +++ b/components/ILIAS/LTIConsumer/classes/Certificate/class.ilLTIConsumerPlaceholderDescription.php @@ -84,7 +84,7 @@ public function getPlaceholderDescriptions(): array public function createPlaceholderHtmlDescription(ilTemplate $template = null): string { if (null === $template) { - $template = new ilTemplate('tpl.default_description.html', true, true, 'Services/Certificate'); + $template = new ilTemplate('tpl.default_description.html', true, true, 'components/ILIAS/Certificate'); } $template->setVariable('PLACEHOLDER_INTRODUCTION', $this->language->txt('certificate_ph_introduction')); diff --git a/components/ILIAS/LTIConsumer/ltiauth.php b/components/ILIAS/LTIConsumer/ltiauth.php index 06c30fc5b95f..69288982bf96 100644 --- a/components/ILIAS/LTIConsumer/ltiauth.php +++ b/components/ILIAS/LTIConsumer/ltiauth.php @@ -42,7 +42,7 @@ exit; } -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/lticerts.php b/components/ILIAS/LTIConsumer/lticerts.php index 62c728799e29..791016238b05 100644 --- a/components/ILIAS/LTIConsumer/lticerts.php +++ b/components/ILIAS/LTIConsumer/lticerts.php @@ -22,7 +22,7 @@ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/lticonfig.php b/components/ILIAS/LTIConsumer/lticonfig.php index 790ecc8e7486..492909dd07bd 100644 --- a/components/ILIAS/LTIConsumer/lticonfig.php +++ b/components/ILIAS/LTIConsumer/lticonfig.php @@ -21,7 +21,7 @@ /** @noRector */ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/ltiregend.php b/components/ILIAS/LTIConsumer/ltiregend.php index 7b3edfec3cbc..0810046229b0 100644 --- a/components/ILIAS/LTIConsumer/ltiregend.php +++ b/components/ILIAS/LTIConsumer/ltiregend.php @@ -21,7 +21,7 @@ /** @noRector */ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $clientId = (ilSession::has('lti_dynamic_registration_client_id')) ? (string) ilSession::get('lti_dynamic_registration_client_id') : ''; diff --git a/components/ILIAS/LTIConsumer/ltiregistration.php b/components/ILIAS/LTIConsumer/ltiregistration.php index b82514226608..9ce4ce7c331d 100644 --- a/components/ILIAS/LTIConsumer/ltiregistration.php +++ b/components/ILIAS/LTIConsumer/ltiregistration.php @@ -21,7 +21,7 @@ /** @noRector */ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/ltiregstart.php b/components/ILIAS/LTIConsumer/ltiregstart.php index 2e3bf6f83663..d27053080474 100644 --- a/components/ILIAS/LTIConsumer/ltiregstart.php +++ b/components/ILIAS/LTIConsumer/ltiregstart.php @@ -21,7 +21,7 @@ /** @noRector */ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); global $DIC; diff --git a/components/ILIAS/LTIConsumer/ltiservices.php b/components/ILIAS/LTIConsumer/ltiservices.php index 15f91f7c31a9..dce3dacfbce3 100644 --- a/components/ILIAS/LTIConsumer/ltiservices.php +++ b/components/ILIAS/LTIConsumer/ltiservices.php @@ -22,7 +22,7 @@ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/ltitoken.php b/components/ILIAS/LTIConsumer/ltitoken.php index 912f00bbdc7d..b15c76b9899c 100644 --- a/components/ILIAS/LTIConsumer/ltitoken.php +++ b/components/ILIAS/LTIConsumer/ltitoken.php @@ -26,7 +26,7 @@ chdir("../../../"); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/components/ILIAS/LTIConsumer/result.php b/components/ILIAS/LTIConsumer/result.php index 754a857e40ee..a1a48e3ad2a7 100644 --- a/components/ILIAS/LTIConsumer/result.php +++ b/components/ILIAS/LTIConsumer/result.php @@ -25,7 +25,7 @@ exit; } -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); \ilContext::init(\ilContext::CONTEXT_SCORM); \ilInitialisation::initILIAS(); diff --git a/components/ILIAS/Language/README.md b/components/ILIAS/Language_/README.md similarity index 100% rename from components/ILIAS/Language/README.md rename to components/ILIAS/Language_/README.md diff --git a/components/ILIAS/Language/ROADMAP.md b/components/ILIAS/Language_/ROADMAP.md similarity index 100% rename from components/ILIAS/Language/ROADMAP.md rename to components/ILIAS/Language_/ROADMAP.md diff --git a/components/ILIAS/Language/classes/Setup/class.ilDefaultLanguageSetObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilDefaultLanguageSetObjective.php similarity index 100% rename from components/ILIAS/Language/classes/Setup/class.ilDefaultLanguageSetObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilDefaultLanguageSetObjective.php diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguageMetricsCollectedObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilLanguageMetricsCollectedObjective.php similarity index 100% rename from components/ILIAS/Language/classes/Setup/class.ilLanguageMetricsCollectedObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilLanguageMetricsCollectedObjective.php diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguageObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilLanguageObjective.php similarity index 100% rename from components/ILIAS/Language/classes/Setup/class.ilLanguageObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilLanguageObjective.php diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php b/components/ILIAS/Language_/classes/Setup/class.ilLanguageSetupAgent.php similarity index 94% rename from components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php rename to components/ILIAS/Language_/classes/Setup/class.ilLanguageSetupAgent.php index 69e8d0dbf1e0..d6864a86b2f1 100644 --- a/components/ILIAS/Language/classes/Setup/class.ilLanguageSetupAgent.php +++ b/components/ILIAS/Language_/classes/Setup/class.ilLanguageSetupAgent.php @@ -61,7 +61,7 @@ public function getArrayToConfigTransformation(): Refinery\Transformation public function getInstallObjective(Setup\Config $config = null): Setup\Objective { return new Setup\ObjectiveCollection( - "Complete objectives from Services/Language", + "Complete objectives from components/ILIAS/Language_", false, new ilLanguagesInstalledAndUpdatedObjective($this->il_setup_language), new ilDefaultLanguageSetObjective() @@ -74,7 +74,7 @@ public function getInstallObjective(Setup\Config $config = null): Setup\Objectiv public function getUpdateObjective(Setup\Config $config = null): Setup\Objective { return new Setup\ObjectiveCollection( - "Complete objectives from Services/Language", + "Complete objectives from components/ILIAS/Language_", false, new ilLanguagesInstalledAndUpdatedObjective($this->il_setup_language), ); diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguagesInstalledAndUpdatedObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilLanguagesInstalledAndUpdatedObjective.php similarity index 100% rename from components/ILIAS/Language/classes/Setup/class.ilLanguagesInstalledAndUpdatedObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilLanguagesInstalledAndUpdatedObjective.php diff --git a/components/ILIAS/Language/classes/Setup/class.ilLanguagesUpdatedObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilLanguagesUpdatedObjective.php similarity index 100% rename from components/ILIAS/Language/classes/Setup/class.ilLanguagesUpdatedObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilLanguagesUpdatedObjective.php diff --git a/components/ILIAS/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php b/components/ILIAS/Language_/classes/Setup/class.ilPluginLanguageUpdatedObjective.php similarity index 97% rename from components/ILIAS/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php rename to components/ILIAS/Language_/classes/Setup/class.ilPluginLanguageUpdatedObjective.php index 61041936a8d5..1adee79a6283 100644 --- a/components/ILIAS/Language/classes/Setup/class.ilPluginLanguageUpdatedObjective.php +++ b/components/ILIAS/Language_/classes/Setup/class.ilPluginLanguageUpdatedObjective.php @@ -20,7 +20,7 @@ use ILIAS\Setup; use ILIAS\DI; -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; class ilPluginLanguageUpdatedObjective implements Setup\Objective { @@ -175,7 +175,7 @@ public function __construct() } if (!defined("ILIAS_ABSOLUTE_PATH")) { - define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 5)); + define("ILIAS_ABSOLUTE_PATH", dirname(__FILE__, 6)); } if (!defined('SYSTEM_ROLE_ID')) { @@ -187,7 +187,7 @@ public function __construct() } if (!defined("ILIAS_WEB_DIR")) { - define('ILIAS_WEB_DIR', dirname(__DIR__, 4) . "/data/"); + define('ILIAS_WEB_DIR', dirname(__DIR__, 5) . "/data/"); } return [$ORIG_DIC, $ORIG_ilDB]; diff --git a/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php b/components/ILIAS/Language_/classes/Setup/class.ilSetupLanguage.php similarity index 99% rename from components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php rename to components/ILIAS/Language_/classes/Setup/class.ilSetupLanguage.php index 5c7661509780..fdedf01ce036 100644 --- a/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php +++ b/components/ILIAS/Language_/classes/Setup/class.ilSetupLanguage.php @@ -53,7 +53,7 @@ class ilSetupLanguage extends ilLanguage public function __construct(string $a_lang_key) { $this->lang_key = $a_lang_key ?: $this->lang_default; - $il_absolute_path = realpath(__DIR__ . "/../../../../"); + $il_absolute_path = realpath(__DIR__ . "/../../../../../"); $this->lang_path = $il_absolute_path . "/lang"; $this->cust_lang_path = $il_absolute_path . "/Customizing/global/lang"; } diff --git a/components/ILIAS/Language/classes/class.ilCachedLanguage.php b/components/ILIAS/Language_/classes/class.ilCachedLanguage.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilCachedLanguage.php rename to components/ILIAS/Language_/classes/class.ilCachedLanguage.php diff --git a/components/ILIAS/Language/classes/class.ilDefaultLanguageDetector.php b/components/ILIAS/Language_/classes/class.ilDefaultLanguageDetector.php similarity index 89% rename from components/ILIAS/Language/classes/class.ilDefaultLanguageDetector.php rename to components/ILIAS/Language_/classes/class.ilDefaultLanguageDetector.php index f97089aa7092..07e72b6bd3ac 100644 --- a/components/ILIAS/Language/classes/class.ilDefaultLanguageDetector.php +++ b/components/ILIAS/Language_/classes/class.ilDefaultLanguageDetector.php @@ -19,12 +19,12 @@ ******************************************************************** */ -require_once "Services/Language/interfaces/interface.ilLanguageDetector.php"; +require_once "components/ILIAS/Language_/interfaces/interface.ilLanguageDetector.php"; /** * Class ilDefaultLanguageDetector * @author Michael Jansen - * @ingroup Services/Language + * @ingroup components/ILIAS/Language_ */ class ilDefaultLanguageDetector implements ilLanguageDetector { diff --git a/components/ILIAS/Language/classes/class.ilHttpRequestsLanguageDetector.php b/components/ILIAS/Language_/classes/class.ilHttpRequestsLanguageDetector.php similarity index 89% rename from components/ILIAS/Language/classes/class.ilHttpRequestsLanguageDetector.php rename to components/ILIAS/Language_/classes/class.ilHttpRequestsLanguageDetector.php index d317029f18ce..a64824851add 100644 --- a/components/ILIAS/Language/classes/class.ilHttpRequestsLanguageDetector.php +++ b/components/ILIAS/Language_/classes/class.ilHttpRequestsLanguageDetector.php @@ -19,12 +19,12 @@ ******************************************************************** */ -require_once "Services/Language/interfaces/interface.ilLanguageDetector.php"; +require_once "components/ILIAS/Language_/interfaces/interface.ilLanguageDetector.php"; /** * Class ilHttpRequestsLanguageDetector * @author Michael Jansen - * @ingroup Services/Language + * @ingroup components/ILIAS/Language_ */ class ilHttpRequestsLanguageDetector implements ilLanguageDetector { @@ -61,7 +61,7 @@ public function getIso2LanguageCode(): string } } - require_once "Services/Language/exceptions/class.ilLanguageException.php"; + require_once "components/ILIAS/Language_/exceptions/class.ilLanguageException.php"; throw new ilLanguageException("Could not extract any language information from request."); } } diff --git a/components/ILIAS/Language/classes/class.ilLangDeprecated.php b/components/ILIAS/Language_/classes/class.ilLangDeprecated.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilLangDeprecated.php rename to components/ILIAS/Language_/classes/class.ilLangDeprecated.php diff --git a/components/ILIAS/Language/classes/class.ilLanguage.php b/components/ILIAS/Language_/classes/class.ilLanguage.php similarity index 99% rename from components/ILIAS/Language/classes/class.ilLanguage.php rename to components/ILIAS/Language_/classes/class.ilLanguage.php index 91eb3699cdcc..ef7483d40b62 100644 --- a/components/ILIAS/Language/classes/class.ilLanguage.php +++ b/components/ILIAS/Language_/classes/class.ilLanguage.php @@ -104,7 +104,7 @@ public function __construct(string $a_lang_key) $this->lang_key = $this->lang_default; } - require_once("./Services/Language/classes/class.ilCachedLanguage.php"); + require_once("./components/ILIAS/Language_/classes/class.ilCachedLanguage.php"); $this->global_cache = ilCachedLanguage::getInstance($this->lang_key); if ($this->global_cache->isActive()) { $this->cached_modules = $this->global_cache->getTranslations(); @@ -291,7 +291,7 @@ public function getInstalledLanguages(): array */ public static function _getInstalledLanguages(): array { - include_once "./Services/Object/classes/class.ilObject.php"; + include_once "./components/ILIAS/Object/classes/class.ilObject.php"; $langlist = ilObject::_getObjectsByType("lng"); $languages = []; diff --git a/components/ILIAS/Language/classes/class.ilLanguageDetection.php b/components/ILIAS/Language_/classes/class.ilLanguageDetection.php similarity index 88% rename from components/ILIAS/Language/classes/class.ilLanguageDetection.php rename to components/ILIAS/Language_/classes/class.ilLanguageDetection.php index 0b95c32aa397..1f43bf1131f4 100644 --- a/components/ILIAS/Language/classes/class.ilLanguageDetection.php +++ b/components/ILIAS/Language_/classes/class.ilLanguageDetection.php @@ -19,13 +19,13 @@ ******************************************************************** */ -require_once "Services/Language/classes/class.ilLanguage.php"; -require_once "Services/Language/classes/class.ilLanguageDetectorFactory.php"; +require_once "components/ILIAS/Language_/classes/class.ilLanguage.php"; +require_once "components/ILIAS/Language_/classes/class.ilLanguageDetectorFactory.php"; /** * Class ilLanguageDetection * @author Michael Jansen - * @ingroup Services/Language + * @ingroup components/ILIAS/Language_ */ class ilLanguageDetection { diff --git a/components/ILIAS/Language/classes/class.ilLanguageDetectorFactory.php b/components/ILIAS/Language_/classes/class.ilLanguageDetectorFactory.php similarity index 86% rename from components/ILIAS/Language/classes/class.ilLanguageDetectorFactory.php rename to components/ILIAS/Language_/classes/class.ilLanguageDetectorFactory.php index dbd4f7d1472f..41beb690c5a3 100644 --- a/components/ILIAS/Language/classes/class.ilLanguageDetectorFactory.php +++ b/components/ILIAS/Language_/classes/class.ilLanguageDetectorFactory.php @@ -22,7 +22,7 @@ /** * Class ilLanguageDetectorFactory * @author Michael Jansen - * @ingroup Services/Language + * @ingroup components/ILIAS/Language_ */ class ilLanguageDetectorFactory { @@ -68,15 +68,15 @@ public function createDetectorByType(int $type) { switch ($type) { case self::HTTP_REQUEST_DETECTOR: - require_once "Services/Language/classes/class.ilHttpRequestsLanguageDetector.php"; + require_once "components/ILIAS/Language_/classes/class.ilHttpRequestsLanguageDetector.php"; return new ilHttpRequestsLanguageDetector($this->request_information["HTTP_ACCEPT_LANGUAGE"]); case self::DEFAULT_DETECTOR: - require_once "Services/Language/classes/class.ilDefaultLanguageDetector.php"; + require_once "components/ILIAS/Language_/classes/class.ilDefaultLanguageDetector.php"; return new ilDefaultLanguageDetector($this->client_ini); } - require_once "Services/Language/exceptions/class.ilLanguageException.php"; + require_once "components/ILIAS/Language_/exceptions/class.ilLanguageException.php"; throw new ilLanguageException(__METHOD__ . sprintf("Cannot create language detector instance for type %s!", $type)); } } diff --git a/components/ILIAS/Language/classes/class.ilLanguageExtTableGUI.php b/components/ILIAS/Language_/classes/class.ilLanguageExtTableGUI.php similarity index 93% rename from components/ILIAS/Language/classes/class.ilLanguageExtTableGUI.php rename to components/ILIAS/Language_/classes/class.ilLanguageExtTableGUI.php index 279fcc3e0946..2506b5158480 100644 --- a/components/ILIAS/Language/classes/class.ilLanguageExtTableGUI.php +++ b/components/ILIAS/Language_/classes/class.ilLanguageExtTableGUI.php @@ -19,7 +19,7 @@ ******************************************************************** */ -require_once "./Services/Table/classes/class.ilTable2GUI.php"; +require_once "./components/ILIAS/Table/classes/class.ilTable2GUI.php"; class ilLanguageExtTableGUI extends ilTable2GUI { @@ -39,7 +39,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, array $a parent::__construct($a_parent_obj, $a_parent_cmd); - $this->setRowTemplate("tpl.lang_items_row.html", "Services/Language"); + $this->setRowTemplate("tpl.lang_items_row.html", "components/ILIAS/Language_"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setDisableFilterHiding(true); @@ -123,7 +123,7 @@ public function initFilter(): void // most filters are only if (!ilObjLanguageAccess::_isPageTranslation()) { // pattern - include_once "./Services/Form/classes/class.ilTextInputGUI.php"; + include_once "./components/ILIAS/Form/classes/class.ilTextInputGUI.php"; $ti = new ilTextInputGUI($lng->txt("search"), "pattern"); //$ti->setParent($this->parent_obj);//Todo-PHP8-Review Begin: The wrong type is passed here, maybe you could just remove this method call $ti->setMaxLength(64); @@ -139,7 +139,7 @@ public function initFilter(): void $options[$mod] = $mod; } - include_once "./Services/Form/classes/class.ilSelectInputGUI.php"; + include_once "./components/ILIAS/Form/classes/class.ilSelectInputGUI.php"; $si = new ilSelectInputGUI(ucfirst($lng->txt("module")), "module"); //$si->setParent($this->parent_obj);//Todo-PHP8-Review Begin: The wrong type is passed here, maybe you could just remove this method call $si->setOptions($options); @@ -150,7 +150,7 @@ public function initFilter(): void } // identifier - include_once "./Services/Form/classes/class.ilTextInputGUI.php"; + include_once "./components/ILIAS/Form/classes/class.ilTextInputGUI.php"; $ti = new ilTextInputGUI(ucfirst($lng->txt("identifier")), "identifier"); //$ti->setParent($this->parent_obj);//Todo-PHP8-Review Begin: The wrong type is passed here, maybe you could just remove this method call $ti->setMaxLength(200); @@ -174,7 +174,7 @@ public function initFilter(): void } $options["conflicts"] = $lng->txt("language_scope_conflicts"); - include_once "./Services/Form/classes/class.ilSelectInputGUI.php"; + include_once "./components/ILIAS/Form/classes/class.ilSelectInputGUI.php"; $si = new ilSelectInputGUI($lng->txt("filter"), "mode"); //$si->setParent($this->parent_obj);//Todo-PHP8-Review Begin: The wrong type is passed here, maybe you could just remove this method call $si->setOptions($options); @@ -192,7 +192,7 @@ public function initFilter(): void $options[$lang_key] = $lng->txt("meta_l_" . $lang_key); } - include_once "./Services/Form/classes/class.ilSelectInputGUI.php"; + include_once "./components/ILIAS/Form/classes/class.ilSelectInputGUI.php"; $si = new ilSelectInputGUI($lng->txt("language_compare"), "compare"); //$si->setParent($this->parent_obj); $si->setOptions($options); diff --git a/components/ILIAS/Language/classes/class.ilLanguageFactory.php b/components/ILIAS/Language_/classes/class.ilLanguageFactory.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilLanguageFactory.php rename to components/ILIAS/Language_/classes/class.ilLanguageFactory.php diff --git a/components/ILIAS/Language/classes/class.ilLanguageFile.php b/components/ILIAS/Language_/classes/class.ilLanguageFile.php similarity index 99% rename from components/ILIAS/Language/classes/class.ilLanguageFile.php rename to components/ILIAS/Language_/classes/class.ilLanguageFile.php index 91685635d116..e0d80d624e27 100644 --- a/components/ILIAS/Language/classes/class.ilLanguageFile.php +++ b/components/ILIAS/Language_/classes/class.ilLanguageFile.php @@ -207,7 +207,7 @@ public function build(string $a_header = ''): string $this->params["created_by"] = $ilUser->getFullname() . " <" . $ilUser->getEmail() . ">"; // build the header - $tpl = new ilTemplate("tpl.lang_file_header.html", true, true, "Services/Language"); + $tpl = new ilTemplate("tpl.lang_file_header.html", true, true, "components/ILIAS/Language_"); foreach ($this->getAllParams() as $name => $value) { $tabs = intval(ceil((20 - 3 - strlen($name)) / 4)); $tabs = $tabs > 0 ? $tabs : 1; diff --git a/components/ILIAS/Language/classes/class.ilLanguageTableGUI.php b/components/ILIAS/Language_/classes/class.ilLanguageTableGUI.php similarity index 97% rename from components/ILIAS/Language/classes/class.ilLanguageTableGUI.php rename to components/ILIAS/Language_/classes/class.ilLanguageTableGUI.php index b3ee2432b618..3751bce05071 100644 --- a/components/ILIAS/Language/classes/class.ilLanguageTableGUI.php +++ b/components/ILIAS/Language_/classes/class.ilLanguageTableGUI.php @@ -19,7 +19,7 @@ ******************************************************************** */ -include_once "./Services/Table/classes/class.ilTable2GUI.php"; +include_once "./components/ILIAS/Table/classes/class.ilTable2GUI.php"; /** * TableGUI class for @@ -27,7 +27,7 @@ * @author Alex Killing * @version $Id$ * -* @ingroup Services +* @ingroup components/ILIAS */ class ilLanguageTableGUI extends ilTable2GUI { @@ -57,7 +57,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, $a_folde $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.lang_list_row_extended.html", "Services/Language"); + $this->setRowTemplate("tpl.lang_list_row_extended.html", "components/ILIAS/Language_"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Language/classes/class.ilObjLanguage.php b/components/ILIAS/Language_/classes/class.ilObjLanguage.php similarity index 99% rename from components/ILIAS/Language/classes/class.ilObjLanguage.php rename to components/ILIAS/Language_/classes/class.ilObjLanguage.php index d0b9e70a6992..231c0f6b5271 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguage.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguage.php @@ -19,7 +19,7 @@ ******************************************************************** */ -require_once "./Services/Object/classes/class.ilObject.php"; +require_once "./components/ILIAS/Object/classes/class.ilObject.php"; /** * Class ilObjLanguage @@ -673,7 +673,7 @@ public function optimizeData(): bool */ public function check(string $scope = ""): bool { - include_once "./Services/Utilities/classes/class.ilStr.php"; + include_once "./components/ILIAS/Utilities/classes/class.ilStr.php"; $scopeExtension = ""; if (!empty($scope)) { if ($scope === "global") { diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageAccess.php b/components/ILIAS/Language_/classes/class.ilObjLanguageAccess.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilObjLanguageAccess.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageAccess.php diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageDBAccess.php b/components/ILIAS/Language_/classes/class.ilObjLanguageDBAccess.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilObjLanguageDBAccess.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageDBAccess.php diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageExt.php b/components/ILIAS/Language_/classes/class.ilObjLanguageExt.php similarity index 98% rename from components/ILIAS/Language/classes/class.ilObjLanguageExt.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageExt.php index e474a6c3db55..58310fef6bd9 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageExt.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageExt.php @@ -18,7 +18,7 @@ declare(strict_types=1); -require_once "./Services/Language/classes/class.ilObjLanguage.php"; +require_once "./components/ILIAS/Language_/classes/class.ilObjLanguage.php"; /** * Class ilObjLanguageExt @@ -36,7 +36,7 @@ class ilObjLanguageExt extends ilObjLanguage */ public function getGlobalLanguageFile(): object { - require_once "./Services/Language/classes/class.ilLanguageFile.php"; + require_once "./components/ILIAS/Language_/classes/class.ilLanguageFile.php"; return ilLanguageFile::_getGlobalLanguageFile($this->key); } @@ -245,7 +245,7 @@ public function importLanguageFile(string $a_file, string $a_mode_existing = "ke $ilErr = $DIC["ilErr"]; // read the new language file - require_once "./Services/Language/classes/class.ilLanguageFile.php"; + require_once "./components/ILIAS/Language_/classes/class.ilLanguageFile.php"; $import_file_obj = new ilLanguageFile($a_file); if (!$import_file_obj->read()) { $ilErr->raiseError($import_file_obj->getErrorMessage(), $ilErr->MESSAGE); @@ -415,7 +415,7 @@ public static function _saveValues(string $a_lang_key, array $a_values = array() $save_date = date("Y-m-d H:i:s", time()); // read and get the global values - require_once "./Services/Language/classes/class.ilLanguageFile.php"; + require_once "./components/ILIAS/Language_/classes/class.ilLanguageFile.php"; $global_file_obj = ilLanguageFile::_getGlobalLanguageFile($a_lang_key); $file_values = $global_file_obj->getAllValues(); $file_comments = $global_file_obj->getAllComments(); diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageExtGUI.php b/components/ILIAS/Language_/classes/class.ilObjLanguageExtGUI.php similarity index 97% rename from components/ILIAS/Language/classes/class.ilObjLanguageExtGUI.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageExtGUI.php index 9e8b2d3e8d0a..5e1778ef9ffe 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageExtGUI.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageExtGUI.php @@ -24,8 +24,8 @@ use ILIAS\HTTP\Services as HTTPServices; use ILIAS\Refinery\Factory as Refinery; -require_once("./Services/Object/classes/class.ilObjectGUI.php"); -require_once("Services/Language/classes/class.ilObjLanguageAccess.php"); +require_once("./components/ILIAS/Object/classes/class.ilObjectGUI.php"); +require_once("components/ILIAS/Language_/classes/class.ilObjLanguageAccess.php"); /** @@ -44,7 +44,7 @@ */ class ilObjLanguageExtGUI extends ilObjectGUI { - private const ILIAS_LANGUAGE_MODULE = "Services/Language"; + private const ILIAS_LANGUAGE_MODULE = "components/ILIAS/Language_"; private string $langmode; protected HTTPServices $http; protected Refinery $refinery; @@ -106,7 +106,7 @@ public function __construct($a_data, int $a_id = 0, bool $a_call_by_reference = */ protected function assignObject(): void { - require_once("Services/Language/classes/class.ilObjLanguageExt.php"); + require_once("components/ILIAS/Language_/classes/class.ilObjLanguageExt.php"); $this->object = new ilObjLanguageExt($this->id); } @@ -152,7 +152,7 @@ public function cancelObject(): void protected function getViewTable(): \ilLanguageExtTableGUI { // create and configure the table object - include_once "./Services/Language/classes/class.ilLanguageExtTableGUI.php"; + include_once "./components/ILIAS/Language_/classes/class.ilLanguageExtTableGUI.php"; $table_gui = new ilLanguageExtTableGUI($this, "view", array( "langmode" => $this->langmode, "lang_key" => $this->object->key, @@ -454,7 +454,7 @@ public function importObject(): void protected function initNewImportForm(): ilPropertyFormGUI { - require_once("./Services/Form/classes/class.ilPropertyFormGUI.php"); + require_once("./components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"); $form = new ilPropertyFormGUI(); $form->setFormAction($this->ctrl->getFormAction($this)); $form->setTitle($this->lng->txt("language_import_file")); @@ -536,7 +536,7 @@ public function uploadObject(): void */ public function exportObject(): void { - require_once("./Services/Form/classes/class.ilPropertyFormGUI.php"); + require_once("./components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"); $form = new ilPropertyFormGUI(); $form->setFormAction($this->ctrl->getFormAction($this)); $form->setTitle($this->lng->txt("language_export_file")); @@ -628,7 +628,7 @@ public function downloadObject(): void */ public function maintainObject(): void { - require_once("./Services/Form/classes/class.ilPropertyFormGUI.php"); + require_once("./components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"); $form = new ilPropertyFormGUI(); $form->setFormAction($this->ctrl->getFormAction($this)); $form->setTitle($this->lng->txt("language_maintenance")); @@ -789,7 +789,7 @@ protected function initNewSettingsForm(): ilPropertyFormGUI $translate_key = "lang_translate_" . $this->object->key; $translate = (bool) $ilSetting->get($translate_key, '0'); - require_once("./Services/Form/classes/class.ilPropertyFormGUI.php"); + require_once("./components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"); $form = new ilPropertyFormGUI(); $form->setFormAction($this->ctrl->getFormAction($this)); $form->setTitle($this->lng->txt("language_settings")); @@ -831,9 +831,9 @@ public function statisticsObject(): void $data[] = $total; // create and configure the table object - include_once "Services/Table/classes/class.ilTable2GUI.php"; + include_once "components/ILIAS/Table/classes/class.ilTable2GUI.php"; $table_gui = new ilTable2GUI($this, "statistics"); - $table_gui->setRowTemplate("tpl.lang_statistics_row.html", "Services/Language"); + $table_gui->setRowTemplate("tpl.lang_statistics_row.html", "components/ILIAS/Language_"); $table_gui->setEnableTitle(false); $table_gui->setEnableNumInfo(false); $table_gui->setLimit(count($data)); @@ -1013,7 +1013,7 @@ protected function initAddNewEntryForm(string $a_id = null): ilPropertyFormGUI $ilCtrl->redirect($this, "view"); } - include_once "Services/Form/classes/class.ilPropertyFormGUI.php"; + include_once "components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"; $form = new ilPropertyFormGUI(); $form->setFormAction($ilCtrl->getFormAction($this, "saveNewEntry")); $form->setTitle($this->lng->txt("adm_missing_entry_add")); diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageFolder.php b/components/ILIAS/Language_/classes/class.ilObjLanguageFolder.php similarity index 98% rename from components/ILIAS/Language/classes/class.ilObjLanguageFolder.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageFolder.php index 9f9d12a28537..a66efaf33788 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageFolder.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageFolder.php @@ -30,7 +30,7 @@ * @extends ilObject */ -require_once "./Services/Object/classes/class.ilObject.php"; +require_once "./components/ILIAS/Object/classes/class.ilObject.php"; class ilObjLanguageFolder extends ilObject { @@ -188,7 +188,7 @@ public function addNewLanguages(array $a_languages): array if (count($a_languages) > 0) { foreach ($a_languages as $lang_key => $lang_data) { if (isset($lang_data["info"]) && $lang_data["info"] === "new_language") { - include_once "./Services/Language/classes/class.ilObjLanguage.php"; + include_once "./components/ILIAS/Language_/classes/class.ilObjLanguage.php"; $lngObj = new ilObjLanguage(); $lngObj->setTitle($lang_key); $lngObj->setDescription("not_installed"); diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageFolderAccess.php b/components/ILIAS/Language_/classes/class.ilObjLanguageFolderAccess.php similarity index 90% rename from components/ILIAS/Language/classes/class.ilObjLanguageFolderAccess.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageFolderAccess.php index 7f15d630a498..5b0446511089 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageFolderAccess.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageFolderAccess.php @@ -19,7 +19,7 @@ ******************************************************************** */ -include_once "./Services/Object/classes/class.ilObjectAccess.php"; +include_once "./components/ILIAS/Object/classes/class.ilObjectAccess.php"; /** * Class ilObjRootFolderAccess diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageFolderGUI.php b/components/ILIAS/Language_/classes/class.ilObjLanguageFolderGUI.php similarity index 97% rename from components/ILIAS/Language/classes/class.ilObjLanguageFolderGUI.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageFolderGUI.php index 08ac13eb6012..291fd71f356e 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageFolderGUI.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageFolderGUI.php @@ -32,8 +32,8 @@ * @extends ilObject */ -require_once "./Services/Language/classes/class.ilObjLanguage.php"; -require_once "./Services/Object/classes/class.ilObjectGUI.php"; +require_once "./components/ILIAS/Language_/classes/class.ilObjLanguage.php"; +require_once "./components/ILIAS/Object/classes/class.ilObjectGUI.php"; class ilObjLanguageFolderGUI extends ilObjectGUI { @@ -323,7 +323,7 @@ public function setUserLanguageObject(): void $this->checkPermission("write"); $this->lng->loadLanguageModule("meta"); - require_once "./Services/User/classes/class.ilObjUser.php"; + require_once "./components/ILIAS/User/classes/class.ilObjUser.php"; $post_id = $this->getPostId(); @@ -443,7 +443,7 @@ public function executeCommand(): void switch ($next_class) { case "ilpermissiongui": - include_once "Services/AccessControl/classes/class.ilPermissionGUI.php"; + include_once "components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php"; $perm_gui = new ilPermissionGUI($this); $this->tabs_gui->activateTab("perm_settings"); $this->ctrl->forwardCommand($perm_gui); @@ -603,7 +603,7 @@ public function listDeprecatedObject(): void ); $this->toolbar->addButtonInstance($button); - include_once "./Services/Language/classes/class.ilLangDeprecated.php"; + include_once "./components/ILIAS/Language_/classes/class.ilLangDeprecated.php"; $d = new ilLangDeprecated(); $res = ""; @@ -619,7 +619,7 @@ public function listDeprecatedObject(): void */ public function downloadDeprecatedObject(): void { - include_once "./Services/Language/classes/class.ilLangDeprecated.php"; + include_once "./components/ILIAS/Language_/classes/class.ilLangDeprecated.php"; $d = new ilLangDeprecated(); $res = ""; foreach ($d->getDeprecatedLangVars() as $key => $mod) { diff --git a/components/ILIAS/Language/classes/class.ilObjLanguageGUI.php b/components/ILIAS/Language_/classes/class.ilObjLanguageGUI.php similarity index 93% rename from components/ILIAS/Language/classes/class.ilObjLanguageGUI.php rename to components/ILIAS/Language_/classes/class.ilObjLanguageGUI.php index 33b898017e51..2b47e1a1fc34 100644 --- a/components/ILIAS/Language/classes/class.ilObjLanguageGUI.php +++ b/components/ILIAS/Language_/classes/class.ilObjLanguageGUI.php @@ -28,7 +28,7 @@ * @extends ilObjectGUI */ -require_once "./Services/Object/classes/class.ilObjectGUI.php"; +require_once "./components/ILIAS/Object/classes/class.ilObjectGUI.php"; class ilObjLanguageGUI extends ilObjectGUI { diff --git a/components/ILIAS/Language/classes/class.ilPluginLanguage.php b/components/ILIAS/Language_/classes/class.ilPluginLanguage.php similarity index 100% rename from components/ILIAS/Language/classes/class.ilPluginLanguage.php rename to components/ILIAS/Language_/classes/class.ilPluginLanguage.php diff --git a/components/ILIAS/Language/exceptions/class.ilLanguageException.php b/components/ILIAS/Language_/exceptions/class.ilLanguageException.php similarity index 90% rename from components/ILIAS/Language/exceptions/class.ilLanguageException.php rename to components/ILIAS/Language_/exceptions/class.ilLanguageException.php index 29f80860c482..6b637714b2db 100644 --- a/components/ILIAS/Language/exceptions/class.ilLanguageException.php +++ b/components/ILIAS/Language_/exceptions/class.ilLanguageException.php @@ -19,7 +19,7 @@ ******************************************************************** */ -require_once 'Services/Exceptions/classes/class.ilException.php'; +require_once 'components/ILIAS/Exceptions/classes/class.ilException.php'; /** * Class for language related exception handling in ILIAS. diff --git a/components/ILIAS/Language/interfaces/interface.ilLanguageDetector.php b/components/ILIAS/Language_/interfaces/interface.ilLanguageDetector.php similarity index 95% rename from components/ILIAS/Language/interfaces/interface.ilLanguageDetector.php rename to components/ILIAS/Language_/interfaces/interface.ilLanguageDetector.php index 1b3f91e6b374..df7e1478402a 100644 --- a/components/ILIAS/Language/interfaces/interface.ilLanguageDetector.php +++ b/components/ILIAS/Language_/interfaces/interface.ilLanguageDetector.php @@ -22,7 +22,7 @@ /** * Interface ilLanguageDetector * @author Michael Jansen - * @ingroup Services/Language + * @ingroup components/ILIAS/Language_ */ interface ilLanguageDetector { diff --git a/components/ILIAS/Language/maintenance.json b/components/ILIAS/Language_/maintenance.json similarity index 89% rename from components/ILIAS/Language/maintenance.json rename to components/ILIAS/Language_/maintenance.json index 22d154ea9474..f7551685c85e 100644 --- a/components/ILIAS/Language/maintenance.json +++ b/components/ILIAS/Language_/maintenance.json @@ -8,7 +8,7 @@ ], "tester": "kunkel(115)", "testcase_writer": "", - "path": "Services/Language", + "path": "components/ILIAS/Language_", "belong_to_component": "Language Handling", "used_in_components": [ "All" diff --git a/components/ILIAS/Language/service.xml b/components/ILIAS/Language_/service.xml similarity index 100% rename from components/ILIAS/Language/service.xml rename to components/ILIAS/Language_/service.xml diff --git a/components/ILIAS/Language/templates/default/tpl.lang_file_header.html b/components/ILIAS/Language_/templates/default/tpl.lang_file_header.html similarity index 100% rename from components/ILIAS/Language/templates/default/tpl.lang_file_header.html rename to components/ILIAS/Language_/templates/default/tpl.lang_file_header.html diff --git a/components/ILIAS/Language/templates/default/tpl.lang_items_row.html b/components/ILIAS/Language_/templates/default/tpl.lang_items_row.html similarity index 100% rename from components/ILIAS/Language/templates/default/tpl.lang_items_row.html rename to components/ILIAS/Language_/templates/default/tpl.lang_items_row.html diff --git a/components/ILIAS/Language/templates/default/tpl.lang_list_row.html b/components/ILIAS/Language_/templates/default/tpl.lang_list_row.html similarity index 100% rename from components/ILIAS/Language/templates/default/tpl.lang_list_row.html rename to components/ILIAS/Language_/templates/default/tpl.lang_list_row.html diff --git a/components/ILIAS/Language/templates/default/tpl.lang_list_row_extended.html b/components/ILIAS/Language_/templates/default/tpl.lang_list_row_extended.html similarity index 100% rename from components/ILIAS/Language/templates/default/tpl.lang_list_row_extended.html rename to components/ILIAS/Language_/templates/default/tpl.lang_list_row_extended.html diff --git a/components/ILIAS/Language/templates/default/tpl.lang_statistics_row.html b/components/ILIAS/Language_/templates/default/tpl.lang_statistics_row.html similarity index 100% rename from components/ILIAS/Language/templates/default/tpl.lang_statistics_row.html rename to components/ILIAS/Language_/templates/default/tpl.lang_statistics_row.html diff --git a/components/ILIAS/Language/test/bootstrap.php b/components/ILIAS/Language_/test/bootstrap.php similarity index 100% rename from components/ILIAS/Language/test/bootstrap.php rename to components/ILIAS/Language_/test/bootstrap.php diff --git a/components/ILIAS/Language/test/ilLanguageBaseTest.php b/components/ILIAS/Language_/test/ilLanguageBaseTest.php similarity index 100% rename from components/ILIAS/Language/test/ilLanguageBaseTest.php rename to components/ILIAS/Language_/test/ilLanguageBaseTest.php diff --git a/components/ILIAS/Language/test/ilLanguageSetupAgentTest.php b/components/ILIAS/Language_/test/ilLanguageSetupAgentTest.php similarity index 90% rename from components/ILIAS/Language/test/ilLanguageSetupAgentTest.php rename to components/ILIAS/Language_/test/ilLanguageSetupAgentTest.php index 1e53e6f5086f..b125609008ed 100644 --- a/components/ILIAS/Language/test/ilLanguageSetupAgentTest.php +++ b/components/ILIAS/Language_/test/ilLanguageSetupAgentTest.php @@ -61,7 +61,7 @@ public function testGetInstallObjectives(): void { $objective_collection = $this->obj->getInstallObjective(); - $this->assertEquals('Complete objectives from Services/Language', $objective_collection->getLabel()); + $this->assertEquals('Complete objectives from components/ILIAS/Language_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); $this->assertCount(2, $objective_collection->getObjectives()); } @@ -70,7 +70,7 @@ public function testGetUpdateObjective(): void { $objective_collection = $this->obj->getUpdateObjective(); - $this->assertEquals('Complete objectives from Services/Language', $objective_collection->getLabel()); + $this->assertEquals('Complete objectives from components/ILIAS/Language_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); $this->assertCount(1, $objective_collection->getObjectives()); } diff --git a/components/ILIAS/Language/test/ilObjLanguageDBAccessTest.php b/components/ILIAS/Language_/test/ilObjLanguageDBAccessTest.php similarity index 100% rename from components/ILIAS/Language/test/ilObjLanguageDBAccessTest.php rename to components/ILIAS/Language_/test/ilObjLanguageDBAccessTest.php diff --git a/components/ILIAS/Language/test/ilServicesLanguageSuite.php b/components/ILIAS/Language_/test/ilServicesLanguageSuite.php similarity index 100% rename from components/ILIAS/Language/test/ilServicesLanguageSuite.php rename to components/ILIAS/Language_/test/ilServicesLanguageSuite.php diff --git a/components/ILIAS/Language/test/ilSetupLanguageTest.php b/components/ILIAS/Language_/test/ilSetupLanguageTest.php similarity index 100% rename from components/ILIAS/Language/test/ilSetupLanguageTest.php rename to components/ILIAS/Language_/test/ilSetupLanguageTest.php diff --git a/components/ILIAS/Language/use-language-logging.md b/components/ILIAS/Language_/use-language-logging.md similarity index 100% rename from components/ILIAS/Language/use-language-logging.md rename to components/ILIAS/Language_/use-language-logging.md diff --git a/components/ILIAS/Language/use-language-object.md b/components/ILIAS/Language_/use-language-object.md similarity index 100% rename from components/ILIAS/Language/use-language-object.md rename to components/ILIAS/Language_/use-language-object.md diff --git a/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryGUI.php b/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryGUI.php index 3e447d10ae4e..ac511d0c4083 100644 --- a/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryGUI.php +++ b/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryGUI.php @@ -68,7 +68,7 @@ public function __construct() ? $to : null; - $this->main_tpl->addJavaScript("./Services/LearningHistory/js/LearningHistory.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/LearningHistory/js/LearningHistory.js"); $this->http = $DIC->http(); } @@ -161,7 +161,7 @@ protected function getHistoryHtml( ?array $classes = null, ?string $mode = null ): string { - $tpl = new ilTemplate("tpl.timeline.html", true, true, "Services/LearningHistory"); + $tpl = new ilTemplate("tpl.timeline.html", true, true, "components/ILIAS/LearningHistory"); $tpl->setVariable("TIMELINE", $this->renderTimeline($from, $to, $classes, $mode)); diff --git a/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryTimelineItem.php b/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryTimelineItem.php index dfceb63745f0..fb05922380ed 100644 --- a/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryTimelineItem.php +++ b/components/ILIAS/LearningHistory/classes/class.ilLearningHistoryTimelineItem.php @@ -51,7 +51,7 @@ public function render(): string $access = $this->access; $parent_ref_id = 0; - $tpl = new ilTemplate("tpl.timeline_item_inner.html", true, true, "Services/LearningHistory"); + $tpl = new ilTemplate("tpl.timeline_item_inner.html", true, true, "components/ILIAS/LearningHistory"); $f = $this->ui->factory(); $r = $this->ui->renderer(); @@ -102,7 +102,7 @@ public function render(): string protected function getEmphasizedTitle(string $title): string { - $tpl = new ilTemplate("tpl.emphasized_title.php", true, true, "Services/LearningHistory"); + $tpl = new ilTemplate("tpl.emphasized_title.php", true, true, "components/ILIAS/LearningHistory"); $tpl->setVariable("TITLE", $title); return $tpl->get(); } diff --git a/components/ILIAS/LearningHistory/classes/class.ilPCLearningHistory.php b/components/ILIAS/LearningHistory/classes/class.ilPCLearningHistory.php index 2dfdf0f05aff..e9156b569567 100644 --- a/components/ILIAS/LearningHistory/classes/class.ilPCLearningHistory.php +++ b/components/ILIAS/LearningHistory/classes/class.ilPCLearningHistory.php @@ -184,7 +184,7 @@ protected function getPresentation( } } if ($user_id > 0) { - $tpl = new ilTemplate("tpl.pc_lhist.html", true, true, "Services/LearningHistory"); + $tpl = new ilTemplate("tpl.pc_lhist.html", true, true, "components/ILIAS/LearningHistory"); $hist_gui = new ilLearningHistoryGUI(); $hist_gui->setUserId($user_id); $from_unix = ($from != "") diff --git a/components/ILIAS/LearningHistory/interfaces/class.ilAbstractLearningHistoryProvider.php b/components/ILIAS/LearningHistory/interfaces/class.ilAbstractLearningHistoryProvider.php index 8883e2041f23..3e9b32059837 100644 --- a/components/ILIAS/LearningHistory/interfaces/class.ilAbstractLearningHistoryProvider.php +++ b/components/ILIAS/LearningHistory/interfaces/class.ilAbstractLearningHistoryProvider.php @@ -42,7 +42,7 @@ public function __construct( 'tpl.emphasized_title.php', true, true, - 'Services/LearningHistory' + 'components/ILIAS/LearningHistory' ); } $this->template = $template; diff --git a/components/ILIAS/LearningHistory/test/ilServicesLearningHistorySuite.php b/components/ILIAS/LearningHistory/test/ilServicesLearningHistorySuite.php index f17a39c7f7bc..c2c7c7ec9d20 100644 --- a/components/ILIAS/LearningHistory/test/ilServicesLearningHistorySuite.php +++ b/components/ILIAS/LearningHistory/test/ilServicesLearningHistorySuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/LearningHistory/test/LearningHistoryStandardGUIRequestTest.php"); + require_once("./components/ILIAS/LearningHistory/test/LearningHistoryStandardGUIRequestTest.php"); $suite->addTestSuite("LearningHistoryStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/LearningModule/Export/class.LMHtmlExport.php b/components/ILIAS/LearningModule/Export/class.LMHtmlExport.php index 4bbbf3e04604..151c3d9e9fa6 100644 --- a/components/ILIAS/LearningModule/Export/class.LMHtmlExport.php +++ b/components/ILIAS/LearningModule/Export/class.LMHtmlExport.php @@ -28,7 +28,7 @@ */ class LMHtmlExport { - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; protected \ilLogger $log; protected string $target_dir = ""; protected string $sub_dir = ""; @@ -85,7 +85,7 @@ public function __construct( $this->initial_current_user_language = $this->user->getCurrentLanguage(); $this->global_screen = $DIC->globalScreen(); - $this->export_util = new \ILIAS\Services\Export\HTML\Util($export_dir, $sub_dir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($export_dir, $sub_dir); $this->setAdditionalContextData(\ilLMEditGSToolProvider::SHOW_TREE, false); } @@ -243,7 +243,7 @@ public function exportHTML(bool $zip = true): void // keep this for some time for reference... /* - $services_dir = $a_target_dir."/Services"; + $services_dir = $a_target_dir."/components/ILIAS"; ilUtil::makeDir($services_dir); $media_service_dir = $services_dir."/MediaObjects"; ilUtil::makeDir($media_service_dir); @@ -343,10 +343,10 @@ protected function getSupplyingExportFiles(string $a_target_dir = "."): array array("source" => \ilYuiUtil::getLocalPath('animation/animation-min.js'), "target" => $a_target_dir . '/js/yahoo/animation-min.js', "type" => "js"), - array("source" => './Services/Accordion/js/accordion.js', + array("source" => './components/ILIAS/Accordion/js/accordion.js', "target" => $a_target_dir . '/js/accordion.js', "type" => "js"), - array("source" => './Services/Accordion/css/accordion.css', + array("source" => './components/ILIAS/Accordion/css/accordion.css', "target" => $a_target_dir . '/css/accordion.css', "type" => "css"), array("source" => './components/ILIAS/Scorm2004/scripts/questions/pure.js', diff --git a/components/ILIAS/LearningModule/Export/class.ilContObjectExport.php b/components/ILIAS/LearningModule/Export/class.ilContObjectExport.php index e3c418f9d510..337a2600dfb7 100644 --- a/components/ILIAS/LearningModule/Export/class.ilContObjectExport.php +++ b/components/ILIAS/LearningModule/Export/class.ilContObjectExport.php @@ -161,7 +161,7 @@ public function buildExportFileXML( "help", $this->cont_obj->getId(), "4.3.0", - "Services/Help", + "components/ILIAS/Help", "OnlineHelp", $this->export_dir . "/" . $this->subdir ); diff --git a/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php b/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php index 10bbebc18eee..1e574198ba24 100644 --- a/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php +++ b/components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php @@ -645,7 +645,7 @@ protected function addResourceFiles(): void } // from main menu - // $this->tpl->addJavascript("./Services/JavaScript/js/Basic.js"); + // $this->tpl->addJavascript("./components/ILIAS/JavaScript/js/Basic.js"); ilYuiUtil::initConnection($this->tpl); } } diff --git a/components/ILIAS/LearningModule/classes/class.ilLMMenuGUI.php b/components/ILIAS/LearningModule/classes/class.ilLMMenuGUI.php index ae1069906af2..e602942dacb5 100644 --- a/components/ILIAS/LearningModule/classes/class.ilLMMenuGUI.php +++ b/components/ILIAS/LearningModule/classes/class.ilLMMenuGUI.php @@ -64,7 +64,7 @@ public function getEntries(): array // print selection if ($this->lm->isActivePrintView() && $access->checkAccess("read", "", $this->lm->getRefId())) { if (!$this->offline) { - $ui->mainTemplate()->addJavaScript("./Services/Form/js/Form.js"); + $ui->mainTemplate()->addJavaScript("./components/ILIAS/Form/js/Form.js"); $modal = $ui->factory()->modal()->roundtrip( $lng->txt("cont_print_view"), $ui->factory()->legacy('some modal') diff --git a/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php b/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php index 3114d5f1f3bf..ea14b9b2d571 100644 --- a/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php +++ b/components/ILIAS/LearningModule/classes/class.ilLearningModuleDataSet.php @@ -434,7 +434,7 @@ public function importRecord( return; } - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjLearningModule(); @@ -484,9 +484,9 @@ public function importRecord( $a_mapping->addMapping("components/ILIAS/LearningModule", "lm", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping("components/ILIAS/LearningModule", "lm_style", $newObj->getId(), $a_rec["StyleId"]); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["Id"] . ":0:lm", $newObj->getId() . ":0:lm" @@ -513,7 +513,7 @@ public function importRecord( $st_obj->getId() ); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["LmId"] . ":" . $a_rec["Child"] . ":st", $this->current_obj->getId() . ":" . $st_obj->getId() . ":st" @@ -539,13 +539,13 @@ public function importRecord( $a_mapping->addMapping("components/ILIAS/LearningModule", "pg", $a_rec["Child"], $pg_obj->getId()); $this->lm_log->debug("add pg map (1), old : " . $a_rec["Child"] . ", new: " . $pg_obj->getId()); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "lm:" . $a_rec["Child"], "lm:" . $pg_obj->getId() ); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["LmId"] . ":" . $a_rec["Child"] . ":pg", $this->current_obj->getId() . ":" . $pg_obj->getId() . ":pg" @@ -570,13 +570,13 @@ public function importRecord( $a_mapping->addMapping("components/ILIAS/LearningModule", "pg", $a_rec["Child"], $pg_obj->getId()); $this->lm_log->debug("add pg map (2), old : " . $a_rec["Child"] . ", new: " . $pg_obj->getId()); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "lm:" . $a_rec["Child"], "lm:" . $pg_obj->getId() ); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["LmId"] . ":" . $a_rec["Child"] . ":pg", $this->current_obj->getId() . ":" . $pg_obj->getId() . ":pg" @@ -629,7 +629,7 @@ public function importRecord( $a_rec["ImportId"] ); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "lm:" . $a_rec["Child"], "lm:" . $pg_id diff --git a/components/ILIAS/LearningModule/classes/class.ilLearningModuleExporter.php b/components/ILIAS/LearningModule/classes/class.ilLearningModuleExporter.php index 18db23380bac..285dce897641 100644 --- a/components/ILIAS/LearningModule/classes/class.ilLearningModuleExporter.php +++ b/components/ILIAS/LearningModule/classes/class.ilLearningModuleExporter.php @@ -36,7 +36,7 @@ public function init(): void $this->ds->setDSPrefix("ds"); $this->config = $this->getExport()->getConfig("components/ILIAS/LearningModule"); if ($this->config->getMasterLanguageOnly()) { - $conf = $this->getExport()->getConfig("Services/COPage"); + $conf = $this->getExport()->getConfig("components/ILIAS/COPage"); $conf->setMasterLanguageOnly(true, $this->config->getIncludeMedia()); $this->ds->setMasterLanguageOnly(true); } @@ -81,32 +81,32 @@ public function getXmlExportTailDependencies( $deps = array( array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids), array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids), ); if (!$this->config->getMasterLanguageOnly()) { $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "transl", "ids" => $md_ids); $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "transl_entry", "ids" => $a_ids); } $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "tile", "ids" => $a_ids); $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "service_settings", "ids" => $a_ids); @@ -114,7 +114,7 @@ public function getXmlExportTailDependencies( foreach ($a_ids as $id) { if (ilObjContentObject::isOnlineHelpModule($id, true)) { $deps[] = array( - "component" => "Services/Help", + "component" => "components/ILIAS/Help", "entity" => "help", "ids" => array($id)); } @@ -125,7 +125,7 @@ public function getXmlExportTailDependencies( $style_id = $this->content_style_domain->styleForObjId($id)->getStyleId(); if ($style_id > 0) { $deps[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "sty", "ids" => $style_id ); diff --git a/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php b/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php index 4a5247ee3b40..8db537c03ff7 100644 --- a/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php +++ b/components/ILIAS/LearningModule/classes/class.ilLearningModuleImporter.php @@ -44,13 +44,13 @@ public function init(): void $this->config->getTranslationLM(), $this->config->getTranslationLang() ); - $cop_config = $this->getImport()->getConfig("Services/COPage"); + $cop_config = $this->getImport()->getConfig("components/ILIAS/COPage"); $cop_config->setUpdateIfExists(true); $cop_config->setForceLanguage($this->config->getTranslationLang()); $cop_config->setReuseOriginallyExportedMedia(true); $cop_config->setSkipInternalLinkResolve(true); - $mob_config = $this->getImport()->getConfig("Services/MediaObjects"); + $mob_config = $this->getImport()->getConfig("components/ILIAS/MediaObjects"); $mob_config->setUsePreviousImportIds(true); } $this->reading_time_manager = new ReadingTimeManager(); @@ -65,7 +65,7 @@ public function importXmlRepresentation( $this->log->debug("import XML Representation"); // case i container - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); $newObj->createLMTree(); $this->log->debug("got mapping, new id is: " . $new_id); @@ -144,7 +144,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void $link_map = $a_mapping->getMappingsOfEntity("components/ILIAS/LearningModule", "link"); - $pages = $a_mapping->getMappingsOfEntity("Services/COPage", "pgl"); + $pages = $a_mapping->getMappingsOfEntity("components/ILIAS/COPage", "pgl"); foreach ($pages as $p) { $id = explode(":", $p); if (count($id) == 3) { @@ -175,7 +175,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void /* $alls_map = $a_mapping->getMappingsOfEntity("components/ILIAS/LearningModule", "lm_style"); foreach ($alls_map as $new_lm_id => $old_style_id) { - $new_style_id = (int) $a_mapping->getMapping("Services/Style", "sty", $old_style_id); + $new_style_id = (int) $a_mapping->getMapping("components/ILIAS/Style", "sty", $old_style_id); if ($new_lm_id > 0 && $new_style_id > 0) { $lm = new ilObjLearningModule($new_lm_id, false); $lm->writeStyleSheetId($new_style_id); @@ -183,7 +183,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void }*/ // menu item ref ids - $ref_mapping = $a_mapping->getMappingsOfEntity('Services/Container', 'refs'); + $ref_mapping = $a_mapping->getMappingsOfEntity('components/ILIAS/Container', 'refs'); $lm_map = $a_mapping->getMappingsOfEntity("components/ILIAS/LearningModule", "lm"); foreach ($lm_map as $old_lm_id => $new_lm_id) { ilLMMenuEditor::fixImportMenuItems($new_lm_id, $ref_mapping); diff --git a/components/ILIAS/LearningModule/templates/default/tpl.blank.html b/components/ILIAS/LearningModule/templates/default/tpl.blank.html index 446516c23003..d51c2560be3b 100644 --- a/components/ILIAS/LearningModule/templates/default/tpl.blank.html +++ b/components/ILIAS/LearningModule/templates/default/tpl.blank.html @@ -4,7 +4,7 @@ {WINDOW_TITLE} {PAGETITLE} - + diff --git a/components/ILIAS/LearningSequence/classes/class.ilDashboardLearningSequenceGUI.php b/components/ILIAS/LearningSequence/classes/class.ilDashboardLearningSequenceGUI.php index 39131e510d9a..d2cb9330f26a 100644 --- a/components/ILIAS/LearningSequence/classes/class.ilDashboardLearningSequenceGUI.php +++ b/components/ILIAS/LearningSequence/classes/class.ilDashboardLearningSequenceGUI.php @@ -19,7 +19,7 @@ declare(strict_types=1); use ILIAS\UI\Component\Symbol\Icon\Standard; -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; /** * @ilCtrl_IsCalledBy ilDashboardLearningSequenceGUI: ilColumnGUI diff --git a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceAppEventListener.php b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceAppEventListener.php index ca0f5f40e7f2..f8f5ba172bc1 100644 --- a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceAppEventListener.php +++ b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceAppEventListener.php @@ -30,14 +30,14 @@ class ilLearningSequenceAppEventListener public static function handleEvent(string $component, string $event, array $parameter): void { switch ($component) { - case "Services/Tracking": + case "components/ILIAS/Tracking": switch ($event) { case "updateStatus": self::onServiceTrackingUpdateStatus($parameter); break; } break; - case "Services/Object": + case "components/ILIAS/Object": switch ($event) { case "beforeDeletion": self::onObjectDeletion($parameter); diff --git a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceExporter.php b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceExporter.php index 31079417a23a..63b9dc73655f 100644 --- a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceExporter.php +++ b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceExporter.php @@ -81,7 +81,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ { return array( array( - 'component' => 'Services/Container', + 'component' => 'components/ILIAS/Container', 'entity' => 'struct', 'ids' => $a_ids ) @@ -98,7 +98,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($a_entity == "lso") { // service settings $res[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ); diff --git a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php index 603b96594522..2602b903912e 100644 --- a/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php +++ b/components/ILIAS/LearningSequence/classes/class.ilLearningSequenceImporter.php @@ -36,7 +36,7 @@ public function init(): void public function importXmlRepresentation(string $a_entity, string $a_id, string $a_xml, ilImportMapping $a_mapping): void { - if ($new_id = $a_mapping->getMapping("Services/Container", "objs", $a_id)) { + if ($new_id = $a_mapping->getMapping("components/ILIAS/Container", "objs", $a_id)) { $this->obj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $this->obj = new ilObjLearningSequence(); @@ -72,7 +72,7 @@ public function afterContainerImportProcessing(ilImportMapping $mapping): void protected function updateRefId(ilImportMapping $mapping): void { $old_ref_id = $this->data["object"]["ref_id"]; - $new_ref_id = $mapping->getMapping("Services/Container", "refs", $old_ref_id); + $new_ref_id = $mapping->getMapping("components/ILIAS/Container", "refs", $old_ref_id); $this->obj->setRefId((int) $new_ref_id); } @@ -82,7 +82,7 @@ protected function buildLSItems(array $ls_data, ilImportMapping $mapping): void $ls_items = array(); foreach ($ls_data as $data) { $old_ref_id = $data["id"]; - $new_ref_id = $mapping->getMapping("Services/Container", "refs", $old_ref_id); + $new_ref_id = $mapping->getMapping("components/ILIAS/Container", "refs", $old_ref_id); $post_condition = new ilLSPostCondition( (int) $new_ref_id, @@ -140,7 +140,7 @@ protected function buildLPSettings(array $lp_settings, ilImportMapping $mapping) $collection = ilLPCollection::getInstanceByMode($this->obj->getId(), (int) $lp_settings["lp_mode"]); $new_ref_ids = array_map(function ($old_ref_id) use ($mapping) { - return $mapping->getMapping("Services/Container", "refs", $old_ref_id); + return $mapping->getMapping("components/ILIAS/Container", "refs", $old_ref_id); }, $lp_settings["lp_item_ref_ids"]); if (!is_null($collection)) { diff --git a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ModifyFooter.php b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ModifyFooter.php index dd09428b231b..e3b5616c3c9c 100644 --- a/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ModifyFooter.php +++ b/components/ILIAS/LegalDocuments/classes/ConsumerToolbox/ConsumerSlots/ModifyFooter.php @@ -47,7 +47,7 @@ public function __construct( private readonly Closure $render, ?Closure $create_template = null ) { - $this->create_template = $create_template ?? fn(string $name) => new ilTemplate($name, true, true, 'Services/LegalDocuments'); + $this->create_template = $create_template ?? fn(string $name) => new ilTemplate($name, true, true, 'components/ILIAS/LegalDocuments'); } public function __invoke(Footer $footer): Footer diff --git a/components/ILIAS/LegalDocuments/classes/Internal.php b/components/ILIAS/LegalDocuments/classes/Internal.php index cf128bc0e7de..fa055cdead93 100644 --- a/components/ILIAS/LegalDocuments/classes/Internal.php +++ b/components/ILIAS/LegalDocuments/classes/Internal.php @@ -54,6 +54,6 @@ public function get(string $name, string $key) public static function path(): string { - return 'Services/LegalDocuments/artifacts/consumers.php'; + return 'components/ILIAS/LegalDocuments/artifacts/consumers.php'; } } diff --git a/components/ILIAS/LegalDocuments/classes/Legacy/Table.php b/components/ILIAS/LegalDocuments/classes/Legacy/Table.php index d9097a89f679..59e1f59eca5f 100644 --- a/components/ILIAS/LegalDocuments/classes/Legacy/Table.php +++ b/components/ILIAS/LegalDocuments/classes/Legacy/Table.php @@ -54,7 +54,7 @@ public function __construct(?object $gui, string $command, TableInterface $table parent::__construct($gui, $command); $config->flush(); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject(), $command)); - $this->setRowTemplate('legacy-table-row.html', 'Services/LegalDocuments'); + $this->setRowTemplate('legacy-table-row.html', 'components/ILIAS/LegalDocuments'); array_map($apply($this->addColumn(...)), $this->visibleColumns()); $this->setShowRowsSelector(true); $this->setExternalSorting(true); @@ -62,7 +62,7 @@ public function __construct(?object $gui, string $command, TableInterface $table iljQueryUtil::initjQuery($DIC->ui()->mainTemplate()); ilYuiUtil::initPanel(false, $DIC->ui()->mainTemplate()); ilYuiUtil::initOverlay($DIC->ui()->mainTemplate()); - $DIC->ui()->mainTemplate()->addJavaScript('./Services/Form/js/Form.js'); + $DIC->ui()->mainTemplate()->addJavaScript('./components/ILIAS/Form/js/Form.js'); $this->determineOffsetAndOrder(); $this->setData($table->rows($this)); } diff --git a/components/ILIAS/Like/classes/class.ilLikeGUI.php b/components/ILIAS/Like/classes/class.ilLikeGUI.php index e9ebd5fad727..27451c61632c 100644 --- a/components/ILIAS/Like/classes/class.ilLikeGUI.php +++ b/components/ILIAS/Like/classes/class.ilLikeGUI.php @@ -66,7 +66,7 @@ public function __construct( protected function initJavascript(): void { - $this->main_tpl->addJavaScript("./Services/Like/js/Like.js"); + $this->main_tpl->addJavaScript("./components/ILIAS/Like/js/Like.js"); } public function setObject( @@ -109,7 +109,7 @@ public function getHTML(): string $ctrl = $this->ctrl; $lng = $this->lng; - $tpl = new ilTemplate("tpl.like.html", true, true, "Services/Like"); + $tpl = new ilTemplate("tpl.like.html", true, true, "components/ILIAS/Like"); // modal $modal_asyn_url = $ctrl->getLinkTarget($this, "renderModal", "", true, false); @@ -146,7 +146,7 @@ protected function renderEmoCounters( ): string { $ilCtrl = $this->ctrl; - $tpl = new ilTemplate("tpl.emo_counters.html", true, true, "Services/Like"); + $tpl = new ilTemplate("tpl.emo_counters.html", true, true, "components/ILIAS/Like"); $f = $this->ui->factory(); $r = $this->ui->renderer(); @@ -223,7 +223,7 @@ public function renderEmoticons(): void $ilCtrl->saveParameter($this, "modal_show_sig_id"); - $tpl = new ilTemplate("tpl.emoticons.html", true, true, "Services/Like"); + $tpl = new ilTemplate("tpl.emoticons.html", true, true, "components/ILIAS/Like"); $tpl->setVariable("ID", $this->dom_id); $url = $ilCtrl->getLinkTarget($this, "", "", true); diff --git a/components/ILIAS/Like/test/ilServicesLikeSuite.php b/components/ILIAS/Like/test/ilServicesLikeSuite.php index f42d49c985c6..fb45173422ff 100644 --- a/components/ILIAS/Like/test/ilServicesLikeSuite.php +++ b/components/ILIAS/Like/test/ilServicesLikeSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Awareness/test/AwarenessSessionRepositoryTest.php"); + require_once("./components/ILIAS/Awareness/test/AwarenessSessionRepositoryTest.php"); $suite->addTestSuite("AwarenessSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/Link/classes/class.ilInternalLinkGUI.php b/components/ILIAS/Link/classes/class.ilInternalLinkGUI.php index d0fd5de49601..c11da58a953f 100644 --- a/components/ILIAS/Link/classes/class.ilInternalLinkGUI.php +++ b/components/ILIAS/Link/classes/class.ilInternalLinkGUI.php @@ -275,7 +275,7 @@ public function showLinkHelp(): void } } if ($ilCtrl->isAsynch()) { - $tpl = new ilGlobalTemplate("tpl.link_help_asynch.html", true, true, "Services/Link"); + $tpl = new ilGlobalTemplate("tpl.link_help_asynch.html", true, true, "components/ILIAS/Link"); $tpl->setVariable("NEW_LINK_URL", $this->ctrl->getLinkTarget( $this, "", @@ -284,7 +284,7 @@ public function showLinkHelp(): void false )); } else { - $tpl = new ilGlobalTemplate("tpl.link_help.html", true, true, "Services/Link"); + $tpl = new ilGlobalTemplate("tpl.link_help.html", true, true, "components/ILIAS/Link"); $tpl->setVariable("LOCATION_STYLESHEET", ilUtil::getStyleSheetLocation()); } @@ -676,7 +676,7 @@ public function getFileLinkHTML(): string $lng = $this->lng; $ilCtrl = $this->ctrl; - $tpl = new ilTemplate("tpl.link_file.html", true, true, "Services/Link"); + $tpl = new ilTemplate("tpl.link_file.html", true, true, "components/ILIAS/Link"); if (!is_object($this->uploaded_file)) { $tpl->setCurrentBlock("form"); $tpl->setVariable( @@ -841,7 +841,7 @@ public function changeTargetObject( $ilCtrl->setParameter($this, "link_type", $this->link_type); - $tpl = new ilTemplate("tpl.link_help_explorer.html", true, true, "Services/Link"); + $tpl = new ilTemplate("tpl.link_help_explorer.html", true, true, "components/ILIAS/Link"); $output = $this->getTargetExplorer(); @@ -924,12 +924,12 @@ public static function getInitHTML(string $a_url): string $lng->loadLanguageModule("link"); - $tpl->addJavaScript("./Services/UIComponent/Explorer/js/ilExplorer.js"); + $tpl->addJavaScript("./components/ILIAS/UIComponent/Explorer/js/ilExplorer.js"); ilExplorerBaseGUI::init(); - $tpl->addJavascript("./Services/Link/js/ilIntLink.js"); + $tpl->addJavascript("./components/ILIAS/Link/js/ilIntLink.js"); // #18721 - $tpl->addJavaScript("Services/Form/js/Form.js"); + $tpl->addJavaScript("components/ILIAS/Form/js/Form.js"); $modal = ilModalGUI::getInstance(); $modal->setHeading($lng->txt("link_link")); diff --git a/components/ILIAS/Link/classes/class.ilLinkifyUtil.php b/components/ILIAS/Link/classes/class.ilLinkifyUtil.php index 46e5992d172c..5519bb68c8ca 100644 --- a/components/ILIAS/Link/classes/class.ilLinkifyUtil.php +++ b/components/ILIAS/Link/classes/class.ilLinkifyUtil.php @@ -51,7 +51,7 @@ public static function getLocalJsPaths(): array return [ "./node_modules/linkifyjs/dist/linkify.min.js", "./node_modules/linkifyjs/dist/linkify-jquery.min.js", - "./Services/Link/js/ilExtLink.js" + "./components/ILIAS/Link/js/ilExtLink.js" ]; } } diff --git a/components/ILIAS/Link/test/ilServicesLinkSuite.php b/components/ILIAS/Link/test/ilServicesLinkSuite.php index fcd31f53d5f5..d5252b555dba 100644 --- a/components/ILIAS/Link/test/ilServicesLinkSuite.php +++ b/components/ILIAS/Link/test/ilServicesLinkSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Link/test/LinkStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Link/test/LinkStandardGUIRequestTest.php"); $suite->addTestSuite("LinkStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/Locator/classes/class.ilLocatorGUI.php b/components/ILIAS/Locator/classes/class.ilLocatorGUI.php index 416616454bd2..8c4341f12862 100644 --- a/components/ILIAS/Locator/classes/class.ilLocatorGUI.php +++ b/components/ILIAS/Locator/classes/class.ilLocatorGUI.php @@ -296,9 +296,9 @@ public function getHTML(): string $icon_path = ""; if ($this->getTextOnly()) { - $loc_tpl = new ilTemplate("tpl.locator_text_only.html", true, true, "Services/Locator"); + $loc_tpl = new ilTemplate("tpl.locator_text_only.html", true, true, "components/ILIAS/Locator"); } else { - $loc_tpl = new ilTemplate("tpl.locator.html", true, true, "Services/Locator"); + $loc_tpl = new ilTemplate("tpl.locator.html", true, true, "components/ILIAS/Locator"); } $items = $this->getItems(); diff --git a/components/ILIAS/Locator/test/ilServicesLocatorSuite.php b/components/ILIAS/Locator/test/ilServicesLocatorSuite.php index a968729b8e38..2146aac43f73 100644 --- a/components/ILIAS/Locator/test/ilServicesLocatorSuite.php +++ b/components/ILIAS/Locator/test/ilServicesLocatorSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Locator/test/LocatorGUITest.php"); + require_once("./components/ILIAS/Locator/test/LocatorGUITest.php"); $suite->addTestSuite("LocatorGUITest"); return $suite; diff --git a/components/ILIAS/Logging/classes/NullLogger.php b/components/ILIAS/Logging/classes/NullLogger.php index 89d8a1a72b61..532f8715bf18 100644 --- a/components/ILIAS/Logging/classes/NullLogger.php +++ b/components/ILIAS/Logging/classes/NullLogger.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\Logging; +namespace ILIAS\components\Logging; use ilLogger; use ilLogLevel; diff --git a/components/ILIAS/Logging/classes/class.ilLogComponentTableGUI.php b/components/ILIAS/Logging/classes/class.ilLogComponentTableGUI.php index c9e3dcf35985..ce9735b87e1b 100644 --- a/components/ILIAS/Logging/classes/class.ilLogComponentTableGUI.php +++ b/components/ILIAS/Logging/classes/class.ilLogComponentTableGUI.php @@ -46,7 +46,7 @@ public function init(): void $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); $this->settings = ilLoggingDBSettings::getInstance(); - $this->setRowTemplate('tpl.log_component_row.html', 'Services/Logging'); + $this->setRowTemplate('tpl.log_component_row.html', 'components/ILIAS/Logging'); $this->addColumn($this->lng->txt('log_component_col_component'), 'component_sortable'); $this->addColumn($this->lng->txt('log_component_col_level'), 'level'); diff --git a/components/ILIAS/Logging/test/ilServicesLoggingSuite.php b/components/ILIAS/Logging/test/ilServicesLoggingSuite.php index 3fbaad02d1b2..1ca4838c48ef 100644 --- a/components/ILIAS/Logging/test/ilServicesLoggingSuite.php +++ b/components/ILIAS/Logging/test/ilServicesLoggingSuite.php @@ -25,7 +25,7 @@ class ilServicesLoggingSuite extends TestSuite public static function suite(): self { $suite = new ilServicesLoggingSuite(); - include_once('./Services/Logging/test/ilLogComponentLevelTest.php'); + include_once('./components/ILIAS/Logging/test/ilLogComponentLevelTest.php'); $suite->addTestSuite(ilLogComponentLevelTest::class); return $suite; } diff --git a/components/ILIAS/Mail/README.md b/components/ILIAS/Mail/README.md index cfe44c09fc3b..43bfab74ee02 100644 --- a/components/ILIAS/Mail/README.md +++ b/components/ILIAS/Mail/README.md @@ -71,7 +71,7 @@ Text emails sent to an **external** email address can be displayed in a HTML frame. The HTML template is part of the skin: - ./Services/Mail/templates/default/tpl.html_mail_template.html + ./components/ILIAS/Mail/templates/default/tpl.html_mail_template.html There are no advanced formatting options, except the global format given in the HTML file itself. @@ -198,7 +198,7 @@ ILIAS is enabled to use standards compliant email addresses. `\ilMail` and the underlying address parsers support RFC 822 compliant address lists as specified in [RFC0822.txt](http://www.ietf.org/rfc/rfc0822.txt). -The address parser below *./Services/Mail/classes/Address* could +The address parser below *./components/ILIAS/Mail/classes/Address* could be considered as a separate service. To get an address parser you can simply use an instance of `ilMailRfc822AddressParserFactory` and pass a comma separated string of recipients. diff --git a/components/ILIAS/Mail/classes/Error/class.ilMailErrorFormatter.php b/components/ILIAS/Mail/classes/Error/class.ilMailErrorFormatter.php index 5b0349f92a77..adc538088719 100644 --- a/components/ILIAS/Mail/classes/Error/class.ilMailErrorFormatter.php +++ b/components/ILIAS/Mail/classes/Error/class.ilMailErrorFormatter.php @@ -65,7 +65,7 @@ public function format(array $errors): string 'tpl.mail_new_submission_errors.html', true, true, - 'Services/Mail' + 'components/ILIAS/Mail' ); if (1 === count($errorsToDisplay)) { $tpl->setCurrentBlock('single_error'); diff --git a/components/ILIAS/Mail/classes/Form/class.ilMailQuickFilterInputGUI.php b/components/ILIAS/Mail/classes/Form/class.ilMailQuickFilterInputGUI.php index 854c2199da05..a55ac826c476 100644 --- a/components/ILIAS/Mail/classes/Form/class.ilMailQuickFilterInputGUI.php +++ b/components/ILIAS/Mail/classes/Form/class.ilMailQuickFilterInputGUI.php @@ -71,7 +71,7 @@ public function render(string $a_mode = ''): string 'tpl.prop_mail_quick_filter_input.html', true, true, - 'Services/Mail' + 'components/ILIAS/Mail' ); if ($this->getValue() !== '') { $tpl->setCurrentBlock('prop_text_propval'); diff --git a/components/ILIAS/Mail/classes/Form/class.ilMailTemplateSelectInputGUI.php b/components/ILIAS/Mail/classes/Form/class.ilMailTemplateSelectInputGUI.php index 4fcc14edf3ca..da53c5ec977a 100644 --- a/components/ILIAS/Mail/classes/Form/class.ilMailTemplateSelectInputGUI.php +++ b/components/ILIAS/Mail/classes/Form/class.ilMailTemplateSelectInputGUI.php @@ -36,7 +36,7 @@ public function render($a_mode = ''): string 'tpl.prop_template_select_container.html', true, true, - 'Services/Mail' + 'components/ILIAS/Mail' ); $tpl->setVariable('CONTENT', $html); $tpl->setVariable('FIELDS', json_encode($this->fields, JSON_THROW_ON_ERROR)); diff --git a/components/ILIAS/Mail/classes/Form/class.ilManualPlaceholderInputGUI.php b/components/ILIAS/Mail/classes/Form/class.ilManualPlaceholderInputGUI.php index 5c2480082945..661741f7db80 100644 --- a/components/ILIAS/Mail/classes/Form/class.ilManualPlaceholderInputGUI.php +++ b/components/ILIAS/Mail/classes/Form/class.ilManualPlaceholderInputGUI.php @@ -49,7 +49,7 @@ public function __construct(string $label, protected string $dependencyElementId parent::__construct($label); - $this->tpl->addJavaScript('Services/Mail/js/ilMailComposeFunctions.js'); + $this->tpl->addJavaScript('components/ILIAS/Mail/js/ilMailComposeFunctions.js'); } public function getRerenderUrl(): ?string @@ -109,7 +109,7 @@ public function render(bool $ajax = false): string 'tpl.mail_manual_placeholders.html', true, true, - 'Services/Mail' + 'components/ILIAS/Mail' ); $subtpl->setVariable('TXT_USE_PLACEHOLDERS', $this->lng->txt('mail_nacc_use_placeholder')); $subtpl->setVariable('DEPENDENCY_ELM_ID_OUTER', $this->dependencyElementId); diff --git a/components/ILIAS/Mail/classes/Mime/Transport/class.ilMailMimeTransportBase.php b/components/ILIAS/Mail/classes/Mime/Transport/class.ilMailMimeTransportBase.php index 1611c21e792c..31a4ce0903c0 100644 --- a/components/ILIAS/Mail/classes/Mime/Transport/class.ilMailMimeTransportBase.php +++ b/components/ILIAS/Mail/classes/Mime/Transport/class.ilMailMimeTransportBase.php @@ -182,7 +182,7 @@ final public function send(ilMimeMail $mail): bool )); } - $this->eventHandler->raise('Services/Mail', 'externalEmailDelegated', [ + $this->eventHandler->raise('components/ILIAS/Mail', 'externalEmailDelegated', [ 'mail' => $mail, 'result' => $result, ]); diff --git a/components/ILIAS/Mail/classes/class.ilMail.php b/components/ILIAS/Mail/classes/class.ilMail.php index 2c063d86393a..b83a83d832f1 100644 --- a/components/ILIAS/Mail/classes/class.ilMail.php +++ b/components/ILIAS/Mail/classes/class.ilMail.php @@ -533,7 +533,7 @@ private function sendInternalMail( $raise_event = !$sender_equals_reveiver || !$is_sent_folder_of_sender; if ($raise_event) { - $this->event_handler->raise('Services/Mail', 'sentInternalMail', [ + $this->event_handler->raise('components/ILIAS/Mail', 'sentInternalMail', [ 'id' => $nextId, 'subject' => $subject, 'body' => $message, diff --git a/components/ILIAS/Mail/classes/class.ilMailAppEventListener.php b/components/ILIAS/Mail/classes/class.ilMailAppEventListener.php index a32c5453bf7e..99977ffec06b 100644 --- a/components/ILIAS/Mail/classes/class.ilMailAppEventListener.php +++ b/components/ILIAS/Mail/classes/class.ilMailAppEventListener.php @@ -19,7 +19,7 @@ declare(strict_types=1); use ILIAS\DI\Container; -use ILIAS\Services\User\ChangedUserFieldAttribute; +use ILIAS\components\User\ChangedUserFieldAttribute; /** * Class ilMailAppEventListener @@ -68,7 +68,7 @@ public function withParameters(array $parameters): self private function isRelevantEvent(): bool { - return $this->component === 'Services/User' + return $this->component === 'components/ILIAS/User' && $this->event === 'onUserFieldAttributesChanged'; } diff --git a/components/ILIAS/Mail/classes/class.ilMailAttachmentTableGUI.php b/components/ILIAS/Mail/classes/class.ilMailAttachmentTableGUI.php index 2ac3ae04483d..d477db630338 100644 --- a/components/ILIAS/Mail/classes/class.ilMailAttachmentTableGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailAttachmentTableGUI.php @@ -40,7 +40,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd) $this->setSelectAllCheckbox('filename[]'); - $this->setRowTemplate('tpl.mail_attachment_row.html', 'Services/Mail'); + $this->setRowTemplate('tpl.mail_attachment_row.html', 'components/ILIAS/Mail'); $this->addMultiCommand('saveAttachments', $this->lng->txt('adopt')); $this->addMultiCommand('deleteAttachments', $this->lng->txt('delete')); diff --git a/components/ILIAS/Mail/classes/class.ilMailFolderGUI.php b/components/ILIAS/Mail/classes/class.ilMailFolderGUI.php index afd53dda4de4..748a2edeaec6 100644 --- a/components/ILIAS/Mail/classes/class.ilMailFolderGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailFolderGUI.php @@ -230,7 +230,7 @@ protected function addSubFolderCommands(bool $isUserSubFolder = false): void protected function showFolder(bool $oneConfirmationDialogueRendered = false): void { - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail.html', 'Services/Mail'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.mail.html', 'components/ILIAS/Mail'); $this->tpl->setTitle($this->lng->txt('mail')); $isTrashFolder = $this->currentFolderId === $this->mbox->getTrashFolder(); @@ -883,7 +883,7 @@ protected function showMail(): void protected function printMail(): void { - $tplprint = new ilTemplate('tpl.mail_print.html', true, true, 'Services/Mail'); + $tplprint = new ilTemplate('tpl.mail_print.html', true, true, 'components/ILIAS/Mail'); $mailId = 0; if ($this->http->wrapper()->query()->has('mail_id')) { diff --git a/components/ILIAS/Mail/classes/class.ilMailFolderTableGUI.php b/components/ILIAS/Mail/classes/class.ilMailFolderTableGUI.php index 4871df0dff55..4f5835484d96 100644 --- a/components/ILIAS/Mail/classes/class.ilMailFolderTableGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailFolderTableGUI.php @@ -75,7 +75,7 @@ public function __construct( $this->setEnableTitle(true); $this->setSelectAllCheckbox('mail_id[]'); - $this->setRowTemplate('tpl.mail_folder_row.html', 'Services/Mail'); + $this->setRowTemplate('tpl.mail_folder_row.html', 'components/ILIAS/Mail'); $this->setFilterCommand('applyFilter'); $this->setResetCommand('resetFilter'); @@ -573,7 +573,7 @@ protected function setTitleData(string $folderLabel, int $mailCount, int $unread 'tpl.mail_folder_title.html', true, true, - 'Services/Mail' + 'components/ILIAS/Mail' ); $titleTemplate->setVariable('TXT_FOLDER', $folderLabel); $titleTemplate->setVariable('MAIL_COUNT', $mailCount); diff --git a/components/ILIAS/Mail/classes/class.ilMailFormAttachmentPropertyGUI.php b/components/ILIAS/Mail/classes/class.ilMailFormAttachmentPropertyGUI.php index f7856eca63b2..a3ce6a8e7c87 100644 --- a/components/ILIAS/Mail/classes/class.ilMailFormAttachmentPropertyGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailFormAttachmentPropertyGUI.php @@ -41,7 +41,7 @@ public function addItem(string $label): void public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate('tpl.mail_new_attachments.html', true, true, 'Services/Mail'); + $tpl = new ilTemplate('tpl.mail_new_attachments.html', true, true, 'components/ILIAS/Mail'); foreach ($this->items as $item) { $tpl->setCurrentBlock('attachment_list_item'); diff --git a/components/ILIAS/Mail/classes/class.ilMailFormGUI.php b/components/ILIAS/Mail/classes/class.ilMailFormGUI.php index a95802d997e7..2526a972b955 100644 --- a/components/ILIAS/Mail/classes/class.ilMailFormGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailFormGUI.php @@ -503,7 +503,7 @@ public function showForm(): void 'ADM_CONTENT', 'adm_content', 'tpl.mail_new.html', - 'Services/Mail' + 'components/ILIAS/Mail' ); $this->tpl->setTitle($this->lng->txt('mail')); @@ -926,7 +926,7 @@ public function showForm(): void $this->tpl->setVariable('FORM', $form_gui->getHTML()); - $this->tpl->addJavaScript('Services/Mail/js/ilMailComposeFunctions.js'); + $this->tpl->addJavaScript('components/ILIAS/Mail/js/ilMailComposeFunctions.js'); $this->tpl->printToStdout(); } diff --git a/components/ILIAS/Mail/classes/class.ilMailTemplateTableGUI.php b/components/ILIAS/Mail/classes/class.ilMailTemplateTableGUI.php index 8f49f6d6c2db..13d7f411e35a 100644 --- a/components/ILIAS/Mail/classes/class.ilMailTemplateTableGUI.php +++ b/components/ILIAS/Mail/classes/class.ilMailTemplateTableGUI.php @@ -56,7 +56,7 @@ public function __construct( $this->addColumn($this->lng->txt('mail_template_context'), 'context', '20%'); $this->addColumn($this->lng->txt('action'), '', '10%'); - $this->setRowTemplate('tpl.mail_template_row.html', 'Services/Mail'); + $this->setRowTemplate('tpl.mail_template_row.html', 'components/ILIAS/Mail'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj, $a_parent_cmd)); $this->contexts = ilMailTemplateContextService::getTemplateContexts(); diff --git a/components/ILIAS/Mail/classes/class.ilMailUserFieldChangeListener.php b/components/ILIAS/Mail/classes/class.ilMailUserFieldChangeListener.php index 60c4041ba7a0..7cc94d12a940 100644 --- a/components/ILIAS/Mail/classes/class.ilMailUserFieldChangeListener.php +++ b/components/ILIAS/Mail/classes/class.ilMailUserFieldChangeListener.php @@ -18,9 +18,9 @@ declare(strict_types=1); -namespace ILIAS\Services\Mail; +namespace ILIAS\components\Mail; -use ILIAS\Services\User\UserFieldAttributesChangeListener; +use ILIAS\components\User\UserFieldAttributesChangeListener; use ILIAS\DI\Container; /** @@ -50,6 +50,6 @@ public function getDescriptionForField(string $fieldName, string $attribute): ?s public function getComponentName(): string { - return 'Services/Mail'; + return 'components/ILIAS/Mail'; } } diff --git a/components/ILIAS/Mail/classes/class.ilMimeMail.php b/components/ILIAS/Mail/classes/class.ilMimeMail.php index d5a288909919..b31ab2f42788 100644 --- a/components/ILIAS/Mail/classes/class.ilMimeMail.php +++ b/components/ILIAS/Mail/classes/class.ilMimeMail.php @@ -273,13 +273,13 @@ protected function buildBodyMultiParts(string $skin): void protected function getHtmlEnvelope(string $skin): string { - $bracket_path = './Services/Mail/templates/default/tpl.html_mail_template.html'; + $bracket_path = './components/ILIAS/Mail/templates/default/tpl.html_mail_template.html'; if ($skin !== 'default') { - $tplpath = './Customizing/global/skin/' . $skin . '/Services/Mail/tpl.html_mail_template.html'; + $tplpath = './Customizing/global/skin/' . $skin . '/components/ILIAS/Mail/tpl.html_mail_template.html'; if (is_file($tplpath)) { - $bracket_path = './Customizing/global/skin/' . $skin . '/Services/Mail/tpl.html_mail_template.html'; + $bracket_path = './Customizing/global/skin/' . $skin . '/components/ILIAS/Mail/tpl.html_mail_template.html'; } } @@ -288,10 +288,10 @@ protected function getHtmlEnvelope(string $skin): string protected function buildHtmlInlineImages(string $skin): void { - $this->gatherImagesFromDirectory('./Services/Mail/templates/default/img'); + $this->gatherImagesFromDirectory('./components/ILIAS/Mail/templates/default/img'); if ($skin !== 'default') { - $skinDirectory = './Customizing/global/skin/' . $skin . '/Services/Mail/img'; + $skinDirectory = './Customizing/global/skin/' . $skin . '/components/ILIAS/Mail/img'; if (is_dir($skinDirectory) && is_readable($skinDirectory)) { $this->gatherImagesFromDirectory($skinDirectory, true); } diff --git a/components/ILIAS/Mail/classes/class.ilPDMailBlockGUI.php b/components/ILIAS/Mail/classes/class.ilPDMailBlockGUI.php index ac37f246f781..bb503a136cb0 100644 --- a/components/ILIAS/Mail/classes/class.ilPDMailBlockGUI.php +++ b/components/ILIAS/Mail/classes/class.ilPDMailBlockGUI.php @@ -123,7 +123,7 @@ protected function getMails(): void public function fillDataSection(): void { if ($this->mails !== []) { - $this->setRowTemplate("tpl.pd_mail_row.html", "Services/Mail"); + $this->setRowTemplate("tpl.pd_mail_row.html", "components/ILIAS/Mail"); parent::fillDataSection(); } else { $this->setEnableNumInfo(false); diff --git a/components/ILIAS/Mail/classes/class.ilPDMailGUI.php b/components/ILIAS/Mail/classes/class.ilPDMailGUI.php index 1cedac88a1b1..1329eed9bc7e 100644 --- a/components/ILIAS/Mail/classes/class.ilPDMailGUI.php +++ b/components/ILIAS/Mail/classes/class.ilPDMailGUI.php @@ -61,7 +61,7 @@ public function getPDMailHTML(int $a_mail_id, int $a_mobj_id): string $umail->markRead([$a_mail_id]); $mail_data = $umail->getMail($a_mail_id); - $tpl = new ilTemplate('tpl.pd_mail.html', true, true, 'Services/Mail'); + $tpl = new ilTemplate('tpl.pd_mail.html', true, true, 'components/ILIAS/Mail'); if ($mail_data['attachments']) { $mailId = 0; diff --git a/components/ILIAS/MainMenu/classes/Administration/class.ilMMItemTranslationTableGUI.php b/components/ILIAS/MainMenu/classes/Administration/class.ilMMItemTranslationTableGUI.php index 4cef80e45eec..8dd9798d28d2 100644 --- a/components/ILIAS/MainMenu/classes/Administration/class.ilMMItemTranslationTableGUI.php +++ b/components/ILIAS/MainMenu/classes/Administration/class.ilMMItemTranslationTableGUI.php @@ -27,7 +27,7 @@ public function __construct(ilMMItemTranslationGUI $a_parent_obj, ilMMItemFacade $this->setFormName($table_id); parent::__construct($a_parent_obj); $this->ctrl->saveParameter($a_parent_obj, $this->getNavParameter()); - $this->setRowTemplate("tpl.translation_row.html", "Services/MainMenu"); + $this->setRowTemplate("tpl.translation_row.html", "components/ILIAS/MainMenu"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); $this->setExternalSorting(true); $this->setDefaultOrderField("id"); diff --git a/components/ILIAS/MainMenu/classes/Administration/class.ilMMSubItemTableGUI.php b/components/ILIAS/MainMenu/classes/Administration/class.ilMMSubItemTableGUI.php index 54277b65cbe2..8de27a811544 100644 --- a/components/ILIAS/MainMenu/classes/Administration/class.ilMMSubItemTableGUI.php +++ b/components/ILIAS/MainMenu/classes/Administration/class.ilMMSubItemTableGUI.php @@ -65,7 +65,7 @@ public function __construct( $this->addCommandButton(ilMMSubItemGUI::CMD_SAVE_TABLE, $this->lng->txt('button_save')); } $this->initColumns(); - $this->setRowTemplate('tpl.sub_items.html', 'Services/MainMenu'); + $this->setRowTemplate('tpl.sub_items.html', 'components/ILIAS/MainMenu'); } protected function addFilterItems(): void diff --git a/components/ILIAS/MainMenu/classes/Administration/class.ilMMTopItemTableGUI.php b/components/ILIAS/MainMenu/classes/Administration/class.ilMMTopItemTableGUI.php index 38ce85643b80..c11f5856f2c1 100644 --- a/components/ILIAS/MainMenu/classes/Administration/class.ilMMTopItemTableGUI.php +++ b/components/ILIAS/MainMenu/classes/Administration/class.ilMMTopItemTableGUI.php @@ -53,7 +53,7 @@ public function __construct(ilMMTopItemGUI $a_parent_obj, ilMMItemRepository $it $this->addCommandButton(ilMMTopItemGUI::CMD_SAVE_TABLE, $this->lng->txt('button_save')); } $this->initColumns(); - $this->setRowTemplate('tpl.top_items.html', 'Services/MainMenu'); + $this->setRowTemplate('tpl.top_items.html', 'components/ILIAS/MainMenu'); } private function initColumns(): void diff --git a/components/ILIAS/MainMenu/test/ilServicesMainMenuSuite.php b/components/ILIAS/MainMenu/test/ilServicesMainMenuSuite.php index 8e8eb44545b2..8c0b5fe5a250 100644 --- a/components/ILIAS/MainMenu/test/ilServicesMainMenuSuite.php +++ b/components/ILIAS/MainMenu/test/ilServicesMainMenuSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/MainMenu/test/ilServicesMainMenuTest.php"); + require_once("./components/ILIAS/MainMenu/test/ilServicesMainMenuTest.php"); $suite->addTestSuite("ilServicesMainMenuTest"); return $suite; diff --git a/components/ILIAS/Maps/classes/class.ilGoogleMapGUI.php b/components/ILIAS/Maps/classes/class.ilGoogleMapGUI.php index 3383b31853ae..1f20aff5b0a9 100644 --- a/components/ILIAS/Maps/classes/class.ilGoogleMapGUI.php +++ b/components/ILIAS/Maps/classes/class.ilGoogleMapGUI.php @@ -38,14 +38,14 @@ public function getHtml(): string "tpl.google_map.html", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $js_tpl = new ilTemplate( "tpl.google_map.js", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $this->tpl->addJavaScript("//maps.google.com/maps/api/js?key=" . ilMapUtil::getApiKey(), false); @@ -147,7 +147,7 @@ public function getUserListHtml(): string "tpl.google_map_user_list.html", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $cnt = 0; diff --git a/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php b/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php index 05004e00ebc4..e66c5963cd78 100644 --- a/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php +++ b/components/ILIAS/Maps/classes/class.ilOpenLayersMapGUI.php @@ -50,20 +50,20 @@ public function getHtml(): string "tpl.openlayers_map.html", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $js_tpl = new ilTemplate( "tpl.openlayers_map.js", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $this->lng->loadLanguageModule("maps"); $this->tpl->addCss("node_modules/ol/ol.css"); - $this->tpl->addCss("Services/Maps/css/service_openlayers.css"); - $this->tpl->addJavaScript("Services/Maps/js/dist/ServiceOpenLayers.js"); + $this->tpl->addCss("components/ILIAS/Maps/css/service_openlayers.css"); + $this->tpl->addJavaScript("components/ILIAS/Maps/js/dist/ServiceOpenLayers.js"); // add user markers $cnt = 0; @@ -166,7 +166,7 @@ public function getUserListHtml(): string "tpl.openlayers_map_user_list.html", true, true, - "Services/Maps" + "components/ILIAS/Maps" ); $cnt = 0; diff --git a/components/ILIAS/Maps/js/dist/ServiceOpenLayers.js b/components/ILIAS/Maps/js/dist/ServiceOpenLayers.js index ac8b11cd78cd..d41b6a937e66 100644 --- a/components/ILIAS/Maps/js/dist/ServiceOpenLayers.js +++ b/components/ILIAS/Maps/js/dist/ServiceOpenLayers.js @@ -21442,7 +21442,7 @@ class ServiceOpenLayers { marker.setPosition(pos); this.map.addOverlay(marker); - element.innerHTML = ""; + element.innerHTML = ""; } /** diff --git a/components/ILIAS/Maps/js/src/ServiceOpenLayers.js b/components/ILIAS/Maps/js/src/ServiceOpenLayers.js index 4b61ffa91fe3..53f2501139ff 100644 --- a/components/ILIAS/Maps/js/src/ServiceOpenLayers.js +++ b/components/ILIAS/Maps/js/src/ServiceOpenLayers.js @@ -248,7 +248,7 @@ export default class ServiceOpenLayers { marker.setPosition(pos); this.map.addOverlay(marker); - element.innerHTML = ""; + element.innerHTML = ""; } /** diff --git a/components/ILIAS/Maps/templates/default/tpl.google_map.js b/components/ILIAS/Maps/templates/default/tpl.google_map.js index 7e8e80d7cd89..ce39bf71dca4 100644 --- a/components/ILIAS/Maps/templates/default/tpl.google_map.js +++ b/components/ILIAS/Maps/templates/default/tpl.google_map.js @@ -12,13 +12,13 @@ ilMapUserMarker["{UMAP_ID}"][{CNT}] = new Array({ULAT},{ULONG}, "
addTestSuite(ilMathTest::class); - require_once 'Services/Math/test/ilMathPhpAdapterTest.php'; + require_once 'components/ILIAS/Math/test/ilMathPhpAdapterTest.php'; $suite->addTestSuite(ilMathPhpAdapterTest::class); - require_once 'Services/Math/test/ilMathBCAdapterTest.php'; + require_once 'components/ILIAS/Math/test/ilMathBCAdapterTest.php'; $suite->addTestSuite(ilMathBCAdapterTest::class); return $suite; diff --git a/components/ILIAS/MathJax/classes/class.ilMathJaxSettingsGUI.php b/components/ILIAS/MathJax/classes/class.ilMathJaxSettingsGUI.php index 35e20bc0860e..b3c9e20a7cdb 100644 --- a/components/ILIAS/MathJax/classes/class.ilMathJaxSettingsGUI.php +++ b/components/ILIAS/MathJax/classes/class.ilMathJaxSettingsGUI.php @@ -195,7 +195,7 @@ protected function editSettings(): void ], $this->lng->txt('mathjax_enable_server'), $this->lng->txt('mathjax_enable_server_info') . ' ' . - $this->renderLink('mathjax_server_installation', './Services/MathJax/docs/install-server.md') + $this->renderLink('mathjax_server_installation', './components/ILIAS/MathJax/docs/install-server.md') )->withAdditionalTransformation($checkbox_transformation); diff --git a/components/ILIAS/MediaCast/classes/class.ilMediaCastDataSet.php b/components/ILIAS/MediaCast/classes/class.ilMediaCastDataSet.php index 32df2b1829e7..8861d3ada0db 100644 --- a/components/ILIAS/MediaCast/classes/class.ilMediaCastDataSet.php +++ b/components/ILIAS/MediaCast/classes/class.ilMediaCastDataSet.php @@ -183,7 +183,7 @@ public function importRecord( switch ($a_entity) { case "mcst": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjMediaCast(); @@ -231,7 +231,7 @@ public function importRecord( $this->current_obj = $newObj; $a_mapping->addMapping("components/ILIAS/MediaCast", "mcst", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping( - "Services/News", + "components/ILIAS/News", "news_context", $a_rec["Id"] . ":mcst:0:", $newObj->getId() . ":mcst:0:" diff --git a/components/ILIAS/MediaCast/classes/class.ilMediaCastExporter.php b/components/ILIAS/MediaCast/classes/class.ilMediaCastExporter.php index f84bc3ebe0d1..50ac93a39a45 100644 --- a/components/ILIAS/MediaCast/classes/class.ilMediaCastExporter.php +++ b/components/ILIAS/MediaCast/classes/class.ilMediaCastExporter.php @@ -49,14 +49,14 @@ public function getXmlExportTailDependencies( $deps = []; $deps[] = [ - "component" => "Services/News", + "component" => "components/ILIAS/News", "entity" => "news", "ids" => $news_ids ]; // common object properties $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids); diff --git a/components/ILIAS/MediaCast/classes/class.ilMediaCastImporter.php b/components/ILIAS/MediaCast/classes/class.ilMediaCastImporter.php index 3659a1a95af7..2fd4d3e1b773 100644 --- a/components/ILIAS/MediaCast/classes/class.ilMediaCastImporter.php +++ b/components/ILIAS/MediaCast/classes/class.ilMediaCastImporter.php @@ -54,7 +54,7 @@ public function finalProcessing( foreach ($order as $obj_id => $items) { $map = array(); foreach ($items as $old_id) { - $map[] = $a_mapping->getMapping("Services/News", "news", $old_id); + $map[] = $a_mapping->getMapping("components/ILIAS/News", "news", $old_id); } $mcst = new ilObjMediaCast($obj_id, false); diff --git a/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php b/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php index a08cdcb9a2b8..29227d3f9c1b 100644 --- a/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php +++ b/components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php @@ -226,7 +226,7 @@ protected function creationSelection(): void $this->initPoolSelection() ]; foreach ($forms as $form_type => $cf) { - $htpl = new \ilTemplate("tpl.creation_acc_head.html", true, true, "Services/Object"); + $htpl = new \ilTemplate("tpl.creation_acc_head.html", true, true, "components/ILIAS/Object"); // using custom form titles (used for repository plugins) $form_title = ""; diff --git a/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php b/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php index 51da3a5ed185..af5995efcf2d 100644 --- a/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php +++ b/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php @@ -111,7 +111,7 @@ public function editMapAreas(): string ); $this->handleMapParameters(); - $this->tpl = new ilTemplate("tpl.map_edit.html", true, true, "Services/MediaObjects"); + $this->tpl = new ilTemplate("tpl.map_edit.html", true, true, "components/ILIAS/MediaObjects"); $this->tpl->setVariable("FORMACTION", $ilCtrl->getFormAction($this)); // create/update imagemap work copy @@ -339,7 +339,7 @@ public function editMapArea( $coords = $this->map->getCoords(); $cnt_coords = ilMapArea::countCoords($coords); - $this->tpl = new ilTemplate("tpl.map_edit.html", true, true, "Services/MediaObjects"); + $this->tpl = new ilTemplate("tpl.map_edit.html", true, true, "components/ILIAS/MediaObjects"); $this->tpl->setVariable("FORMACTION", $ilCtrl->getFormAction($this)); diff --git a/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapTableGUI.php b/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapTableGUI.php index b74ff4853baa..1022db0eb530 100644 --- a/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapTableGUI.php +++ b/components/ILIAS/MediaObjects/ImageMap/class.ilImageMapTableGUI.php @@ -49,7 +49,7 @@ public function __construct( $this->initColumns(); $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.image_map_table_row.html", "Services/MediaObjects"); + $this->setRowTemplate("tpl.image_map_table_row.html", "components/ILIAS/MediaObjects"); $this->getItems(); // action commands diff --git a/components/ILIAS/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php b/components/ILIAS/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php index 72eaeb17e184..a7a00510bc36 100644 --- a/components/ILIAS/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php +++ b/components/ILIAS/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php @@ -92,7 +92,7 @@ public function audio( $mcst_settings = ilMediaCastSettings::_getInstance(); $treshold = (int) $mcst_settings->getVideoCompletionThreshold(); - $main_tpl->addJavaScript("./Services/MediaObjects/js/MediaObjectsCompletion.js"); + $main_tpl->addJavaScript("./components/ILIAS/MediaObjects/js/MediaObjectsCompletion.js"); $ctrl->setParameter($this, "mob_tracking_ref_id", $tracking_container_ref_id); $ctrl->setParameter($this, "mob_tracking_mob_id", $mob->getId()); $url = $ctrl->getLinkTarget($this, "saveCompletion"); diff --git a/components/ILIAS/MediaObjects/SubTitles/class.ilMobMultiSrtConfirmationTable2GUI.php b/components/ILIAS/MediaObjects/SubTitles/class.ilMobMultiSrtConfirmationTable2GUI.php index cc91586ea7f9..e9009d66e54a 100644 --- a/components/ILIAS/MediaObjects/SubTitles/class.ilMobMultiSrtConfirmationTable2GUI.php +++ b/components/ILIAS/MediaObjects/SubTitles/class.ilMobMultiSrtConfirmationTable2GUI.php @@ -51,7 +51,7 @@ public function __construct( $this->addColumn($this->lng->txt("mob")); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.mob_multi_srt_confirmation_row.html", "Services/MediaObjects"); + $this->setRowTemplate("tpl.mob_multi_srt_confirmation_row.html", "components/ILIAS/MediaObjects"); $this->addCommandButton("saveMultiSrt", $this->lng->txt("save")); $this->addCommandButton("cancelMultiSrt", $this->lng->txt("cancel")); diff --git a/components/ILIAS/MediaObjects/SubTitles/class.ilMobSubtitleTableGUI.php b/components/ILIAS/MediaObjects/SubTitles/class.ilMobSubtitleTableGUI.php index 1ee7b3ce15d2..b9eb95e842ae 100644 --- a/components/ILIAS/MediaObjects/SubTitles/class.ilMobSubtitleTableGUI.php +++ b/components/ILIAS/MediaObjects/SubTitles/class.ilMobSubtitleTableGUI.php @@ -47,7 +47,7 @@ public function __construct( $this->addColumn($this->lng->txt("mob_language")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.srt_files_row.html", "Services/MediaObjects"); + $this->setRowTemplate("tpl.srt_files_row.html", "components/ILIAS/MediaObjects"); $this->addMultiCommand("confirmSrtDeletion", $lng->txt("delete")); } diff --git a/components/ILIAS/MediaObjects/SubTitles/class.ilMultiSrtConfirmationTable2GUI.php b/components/ILIAS/MediaObjects/SubTitles/class.ilMultiSrtConfirmationTable2GUI.php index a89032d089db..a38f702cd9da 100644 --- a/components/ILIAS/MediaObjects/SubTitles/class.ilMultiSrtConfirmationTable2GUI.php +++ b/components/ILIAS/MediaObjects/SubTitles/class.ilMultiSrtConfirmationTable2GUI.php @@ -55,7 +55,7 @@ public function __construct( $this->addColumn($this->lng->txt("language"), "language"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.multi_srt_confirmation_row.html", "Services/MediaObjects"); + $this->setRowTemplate("tpl.multi_srt_confirmation_row.html", "components/ILIAS/MediaObjects"); $this->addCommandButton("saveMultiSrt", $lng->txt("save")); $this->addCommandButton("cancelMultiSrt", $lng->txt("cancel")); diff --git a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectDataSet.php b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectDataSet.php index 6d93e5702322..e3236f82f1c4 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectDataSet.php +++ b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectDataSet.php @@ -333,9 +333,9 @@ public function importRecord( ilMediaSvgSanitizer::sanitizeDir($target_dir); // see #20339 } - $a_mapping->addMapping("Services/MediaObjects", "mob", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/MediaObjects", "mob", $a_rec["Id"], $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", "0:" . $a_rec["Id"] . ":mob", "0:" . $newObj->getId() . ":mob" @@ -345,7 +345,7 @@ public function importRecord( case "mob_media_item": // determine parent mob - $mob_id = (int) $a_mapping->getMapping("Services/MediaObjects", "mob", $a_rec["MobId"]); + $mob_id = (int) $a_mapping->getMapping("components/ILIAS/MediaObjects", "mob", $a_rec["MobId"]); if (is_object($this->current_mob) && $this->current_mob->getId() == $mob_id) { $mob = $this->current_mob; } else { @@ -366,14 +366,14 @@ public function importRecord( $newObj->create(); $this->current_media_item = $newObj; - $a_mapping->addMapping("Services/MediaObjects", "mob_media_item", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/MediaObjects", "mob_media_item", $a_rec["Id"], $newObj->getId()); break; case "mob_mi_parameter": // get media item - $med_id = (int) $a_mapping->getMapping("Services/MediaObjects", "mob_media_item", $a_rec["MiId"]); + $med_id = (int) $a_mapping->getMapping("components/ILIAS/MediaObjects", "mob_media_item", $a_rec["MiId"]); if (is_object($this->current_media_item) && $this->current_media_item->getId() == $med_id) { $med = $this->current_media_item; } else { @@ -385,7 +385,7 @@ public function importRecord( case "mob_mi_map_area": // get media item - $med_id = (int) $a_mapping->getMapping("Services/MediaObjects", "mob_media_item", $a_rec["MiId"]); + $med_id = (int) $a_mapping->getMapping("components/ILIAS/MediaObjects", "mob_media_item", $a_rec["MiId"]); if (is_object($this->current_media_item) && $this->current_media_item->getId() == $med_id) { $med = $this->current_media_item; } else { diff --git a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectUsagesTableGUI.php b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectUsagesTableGUI.php index 4ac1bc68a784..7eeae2722656 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectUsagesTableGUI.php +++ b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectUsagesTableGUI.php @@ -51,7 +51,7 @@ public function __construct( $this->addColumn($this->lng->txt("type")); $this->addColumn($this->lng->txt("cont_versions")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.mob_usage_row.html", "Services/MediaObjects"); + $this->setRowTemplate("tpl.mob_usage_row.html", "components/ILIAS/MediaObjects"); $this->getItems(); $this->setTitle($lng->txt("cont_mob_usages")); } diff --git a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsExporter.php b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsExporter.php index 2c97b529a2ad..2f32c55afcfa 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsExporter.php +++ b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsExporter.php @@ -43,7 +43,7 @@ public function getXmlExportTailDependencies( return array( array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids) ); diff --git a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsImporter.php b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsImporter.php index 4a9a88b30e17..087d7d628f89 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsImporter.php +++ b/components/ILIAS/MediaObjects/classes/class.ilMediaObjectsImporter.php @@ -32,7 +32,7 @@ public function init(): void $this->ds->setDSPrefix("ds"); $this->ds->setImportDirectory($this->getImportDirectory()); - $this->config = $this->getImport()->getConfig("Services/MediaObjects"); + $this->config = $this->getImport()->getConfig("components/ILIAS/MediaObjects"); if ($this->config->getUsePreviousImportIds()) { $this->ds->setUsePreviousImportIds(true); } diff --git a/components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php b/components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php index 810cc8a54ca4..d96a5609dc2d 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php +++ b/components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php @@ -308,7 +308,7 @@ public function create(bool $a_create_meta_data = false, bool $a_save_media_item $ilAppEventHandler = $this->app_event_handler; $ilAppEventHandler->raise( - 'Services/MediaObjects', + 'components/ILIAS/MediaObjects', 'create', array('object' => $this, 'obj_type' => 'mob', @@ -347,7 +347,7 @@ public function update(bool $a_upload = false): bool self::handleQuotaUpdate($this); $ilAppEventHandler = $this->app_event_handler; $ilAppEventHandler->raise( - 'Services/MediaObjects', + 'components/ILIAS/MediaObjects', 'update', array('object' => $this, 'obj_type' => 'mob', diff --git a/components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectGUI.php b/components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectGUI.php index c33a7a7dd0d4..45e371d41315 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectGUI.php +++ b/components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectGUI.php @@ -1392,7 +1392,7 @@ public static function _getMediaInfoHTML( $lng = $DIC->language(); - $tpl = new ilTemplate("tpl.media_info.html", true, true, "Services/MediaObjects"); + $tpl = new ilTemplate("tpl.media_info.html", true, true, "components/ILIAS/MediaObjects"); $types = array("Standard", "Fullscreen"); foreach ($types as $type) { if ($type == "Fullscreen" && !$a_mob->hasFullscreenItem()) { @@ -1583,7 +1583,7 @@ public static function includePresentationJS( iljQueryUtil::initjQuery($a_tpl); $a_tpl->addJavaScript(iljQueryUtil::getLocalMaphilightPath()); - $a_tpl->addJavaScript("./Services/COPage/js/ilCOPagePres.js"); + $a_tpl->addJavaScript("./components/ILIAS/COPage/js/ilCOPagePres.js"); ilPlayerUtil::initMediaElementJs($a_tpl); } diff --git a/components/ILIAS/MediaObjects/classes/class.ilWidthHeightInputGUI.php b/components/ILIAS/MediaObjects/classes/class.ilWidthHeightInputGUI.php index 34da0aff2042..c1eb34313ef3 100644 --- a/components/ILIAS/MediaObjects/classes/class.ilWidthHeightInputGUI.php +++ b/components/ILIAS/MediaObjects/classes/class.ilWidthHeightInputGUI.php @@ -97,7 +97,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $tpl = new ilTemplate("tpl.prop_width_height.html", true, true, "Services/MediaObjects"); + $tpl = new ilTemplate("tpl.prop_width_height.html", true, true, "components/ILIAS/MediaObjects"); $tpl->setVariable("VAL_WIDTH", strtolower(trim((string) $this->getWidth()))); $tpl->setVariable("VAL_HEIGHT", strtolower(trim((string) $this->getHeight()))); @@ -118,7 +118,7 @@ public function insert(ilTemplate $a_tpl): void $a_tpl->parseCurrentBlock(); $this->main_tpl - ->addJavaScript("./Services/MediaObjects/js/ServiceMediaObjectPropWidthHeight.js"); + ->addJavaScript("./components/ILIAS/MediaObjects/js/ServiceMediaObjectPropWidthHeight.js"); $this->main_tpl->addOnLoadCode( 'prop_width_height["prop_' . $this->getPostVar() . '"] = ' . $ratio . ';' ); diff --git a/components/ILIAS/MediaObjects/test/ilServicesMediaObjectsSuite.php b/components/ILIAS/MediaObjects/test/ilServicesMediaObjectsSuite.php index 0e37a7b9a45e..abfa34f0945d 100644 --- a/components/ILIAS/MediaObjects/test/ilServicesMediaObjectsSuite.php +++ b/components/ILIAS/MediaObjects/test/ilServicesMediaObjectsSuite.php @@ -31,10 +31,10 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/MediaObjects/test/ImageMapEditSessionRepositoryTest.php"); + require_once("./components/ILIAS/MediaObjects/test/ImageMapEditSessionRepositoryTest.php"); $suite->addTestSuite("ImageMapEditSessionRepositoryTest"); - require_once("./Services/MediaObjects/test/MediaTypeManagerTest.php"); + require_once("./components/ILIAS/MediaObjects/test/MediaTypeManagerTest.php"); $suite->addTestSuite("MediaTypeManagerTest"); return $suite; diff --git a/components/ILIAS/MediaPool/Clipboard/class.ilEditClipboardGUI.php b/components/ILIAS/MediaPool/Clipboard/class.ilEditClipboardGUI.php index 5b14c2763e57..4210c2f558ba 100644 --- a/components/ILIAS/MediaPool/Clipboard/class.ilEditClipboardGUI.php +++ b/components/ILIAS/MediaPool/Clipboard/class.ilEditClipboardGUI.php @@ -197,7 +197,7 @@ public function remove(): void $id = explode(":", $obj_id); if ($id[0] === "mob") { $ilUser->removeObjectFromClipboard($id[1], "mob"); - include_once("./Services/MediaObjects/classes/class.ilObjMediaObject.php"); + include_once("./components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php"); $mob = new ilObjMediaObject($id[1]); $mob->delete(); // this method don't delete, if mob is used elsewhere } diff --git a/components/ILIAS/MediaPool/classes/class.MediaPoolRepository.php b/components/ILIAS/MediaPool/classes/class.MediaPoolRepository.php index 259087f73d78..be84b2466028 100644 --- a/components/ILIAS/MediaPool/classes/class.MediaPoolRepository.php +++ b/components/ILIAS/MediaPool/classes/class.MediaPoolRepository.php @@ -141,7 +141,7 @@ protected function getContentSnippets( // Keyword filter if ($keyword_filter) { - include_once './Services/MetaData/classes/class.ilMDKeyword.php'; + include_once './components/ILIAS/MetaData/classes/class.ilMDKeyword.php'; $res = \ilMDKeyword::_searchKeywords($keyword_filter, 'mpg', $pool_id); foreach ($objs as $obj) { if (in_array($obj['obj_id'], $res)) { diff --git a/components/ILIAS/MediaPool/classes/class.ilMediaPoolAppEventListener.php b/components/ILIAS/MediaPool/classes/class.ilMediaPoolAppEventListener.php index 81874cfe33b8..537ef9ed339b 100644 --- a/components/ILIAS/MediaPool/classes/class.ilMediaPoolAppEventListener.php +++ b/components/ILIAS/MediaPool/classes/class.ilMediaPoolAppEventListener.php @@ -26,7 +26,7 @@ class ilMediaPoolAppEventListener /** * Handle an event in a listener. * - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ @@ -36,7 +36,7 @@ public static function handleEvent( array $a_parameter ): void { switch ($a_component) { - case "Services/Object": + case "components/ILIAS/Object": switch ($a_event) { case "update": if ($a_parameter["obj_type"] === "mob") { diff --git a/components/ILIAS/MediaPool/classes/class.ilMediaPoolDataSet.php b/components/ILIAS/MediaPool/classes/class.ilMediaPoolDataSet.php index 907ab2aeed31..9b0cf4ee0c6e 100644 --- a/components/ILIAS/MediaPool/classes/class.ilMediaPoolDataSet.php +++ b/components/ILIAS/MediaPool/classes/class.ilMediaPoolDataSet.php @@ -257,7 +257,7 @@ public function importRecord( return; } - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjMediaPool(); @@ -274,7 +274,7 @@ public function importRecord( $this->current_obj = $newObj; $a_mapping->addMapping("components/ILIAS/MediaPool", "mep", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); break; case "mep_tree": @@ -294,7 +294,7 @@ public function importRecord( case "mob": $parent = (int) $a_mapping->getMapping("components/ILIAS/MediaPool", "mep_tree", $a_rec["Parent"]); - $mob_id = (int) $a_mapping->getMapping("Services/MediaObjects", "mob", $a_rec["ForeignId"]); + $mob_id = (int) $a_mapping->getMapping("components/ILIAS/MediaObjects", "mob", $a_rec["ForeignId"]); $item = new ilMediaPoolItem(); $item->setType("mob"); $item->setForeignId($mob_id); @@ -319,7 +319,7 @@ public function importRecord( $item->create(); $a_mapping->addMapping("components/ILIAS/MediaPool", "pg", $a_rec["Child"], $item->getId()); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "mep:" . $a_rec["Child"], "mep:" . $item->getId() @@ -344,7 +344,7 @@ public function importRecord( if ($pool == $this->getTranslationMep()->getId()) { $a_mapping->addMapping("components/ILIAS/MediaPool", "pg", $a_rec["Child"], $pg_id); $a_mapping->addMapping( - "Services/COPage", + "components/ILIAS/COPage", "pg", "mep:" . $a_rec["Child"], "mep:" . $pg_id diff --git a/components/ILIAS/MediaPool/classes/class.ilMediaPoolExporter.php b/components/ILIAS/MediaPool/classes/class.ilMediaPoolExporter.php index cc2deff92f98..824823415842 100644 --- a/components/ILIAS/MediaPool/classes/class.ilMediaPoolExporter.php +++ b/components/ILIAS/MediaPool/classes/class.ilMediaPoolExporter.php @@ -33,7 +33,7 @@ public function init(): void $this->ds->setDSPrefix("ds"); $this->config = $this->getExport()->getConfig("components/ILIAS/MediaPool"); if ($this->config->getMasterLanguageOnly()) { - $conf = $this->getExport()->getConfig("Services/COPage"); + $conf = $this->getExport()->getConfig("components/ILIAS/COPage"); $conf->setMasterLanguageOnly(true, $this->config->getIncludeMedia()); $this->ds->setMasterLanguageOnly(true); } @@ -59,7 +59,7 @@ public function getXmlExportHeadDependencies( return array( array( - "component" => "Services/MediaObjects", + "component" => "components/ILIAS/MediaObjects", "entity" => "mob", "ids" => $mob_ids) ); @@ -81,24 +81,24 @@ public function getXmlExportTailDependencies( $deps = array( array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids) ); if (!$this->config->getMasterLanguageOnly()) { $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "transl", "ids" => $a_ids); $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "transl_entry", "ids" => $a_ids); } $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "tile", "ids" => $a_ids); diff --git a/components/ILIAS/MediaPool/classes/class.ilMediaPoolImporter.php b/components/ILIAS/MediaPool/classes/class.ilMediaPoolImporter.php index 71e79cc1b901..b6dfe18b57bf 100644 --- a/components/ILIAS/MediaPool/classes/class.ilMediaPoolImporter.php +++ b/components/ILIAS/MediaPool/classes/class.ilMediaPoolImporter.php @@ -37,13 +37,13 @@ public function init(): void $this->config->getTranslationMep(), $this->config->getTranslationLang() ); - $cop_config = $this->getImport()->getConfig("Services/COPage"); + $cop_config = $this->getImport()->getConfig("components/ILIAS/COPage"); $cop_config->setUpdateIfExists(true); $cop_config->setForceLanguage($this->config->getTranslationLang()); $cop_config->setReuseOriginallyExportedMedia(true); $cop_config->setSkipInternalLinkResolve(true); - $mob_config = $this->getImport()->getConfig("Services/MediaObjects"); + $mob_config = $this->getImport()->getConfig("components/ILIAS/MediaObjects"); $mob_config->setUsePreviousImportIds(true); } } diff --git a/components/ILIAS/MediaPool/classes/class.ilObjMediaPoolGUI.php b/components/ILIAS/MediaPool/classes/class.ilObjMediaPoolGUI.php index 149c385a71da..9d5d51da6279 100644 --- a/components/ILIAS/MediaPool/classes/class.ilObjMediaPoolGUI.php +++ b/components/ILIAS/MediaPool/classes/class.ilObjMediaPoolGUI.php @@ -809,7 +809,7 @@ protected function showMedia(): void $item = new ilMediaPoolItem($this->mep_item_id); $mob_id = $item->getForeignId(); - $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "Services/COPage"); + $this->tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "components/ILIAS/COPage"); $this->tpl->setVariable("LOCATION_STYLESHEET", ilUtil::getStyleSheetLocation()); $this->tpl->setVariable( "LOCATION_CONTENT_STYLESHEET", @@ -858,7 +858,7 @@ protected function showMedia(): void public function showPage(): void { //$tpl = new \ilGlobalPageTemplate($DIC->globalScreen(), $DIC->ui(), $DIC->http()); - $tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "Services/COPage"); + $tpl = new ilGlobalTemplate("tpl.fullscreen.html", true, true, "components/ILIAS/COPage"); $tpl->addCss(ilUtil::getStyleSheetLocation()); $tpl->addCss(ilObjStyleSheet::getContentStylePath(0)); diff --git a/components/ILIAS/Membership/classes/Export/class.ilMemberExportFileTableGUI.php b/components/ILIAS/Membership/classes/Export/class.ilMemberExportFileTableGUI.php index d1b447f785d7..851ce5282cd1 100644 --- a/components/ILIAS/Membership/classes/Export/class.ilMemberExportFileTableGUI.php +++ b/components/ILIAS/Membership/classes/Export/class.ilMemberExportFileTableGUI.php @@ -40,7 +40,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, ilFileSy $this->setDefaultOrderField('date'); $this->setDefaultOrderDirection('desc'); - $this->setRowTemplate('tpl.mem_export_file_row.html', 'Services/Membership'); + $this->setRowTemplate('tpl.mem_export_file_row.html', 'components/ILIAS/Membership'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject(), $this->getParentCmd())); $this->addMultiCommand('confirmDeleteExportFile', $this->lng->txt('delete')); $this->setSelectAllCheckbox('id[]'); diff --git a/components/ILIAS/Membership/classes/class.ilAttendanceList.php b/components/ILIAS/Membership/classes/class.ilAttendanceList.php index 64ce95d0682d..88cfd9284245 100644 --- a/components/ILIAS/Membership/classes/class.ilAttendanceList.php +++ b/components/ILIAS/Membership/classes/class.ilAttendanceList.php @@ -551,7 +551,7 @@ public function getFullscreenHTML(): void */ public function getHTML(): string { - $tpl = new ilTemplate('tpl.attendance_list_print.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.attendance_list_print.html', true, true, 'components/ILIAS/Membership'); ilDatePresentation::setUseRelativeDates(false); $time = ilDatePresentation::formatDate(new ilDateTime(time(), IL_CAL_UNIX)); diff --git a/components/ILIAS/Membership/classes/class.ilMemberAgreementGUI.php b/components/ILIAS/Membership/classes/class.ilMemberAgreementGUI.php index 88172d2e86f6..6d43af26cd83 100644 --- a/components/ILIAS/Membership/classes/class.ilMemberAgreementGUI.php +++ b/components/ILIAS/Membership/classes/class.ilMemberAgreementGUI.php @@ -130,7 +130,7 @@ public static function addExportFieldInfo( $fields_info = ilExportFieldsInfo::_getInstanceByType(ilObject::_lookupType($a_obj_id)); $fields = new ilCustomInputGUI($lng->txt($a_type . '_user_agreement'), ''); - $tpl = new ilTemplate('tpl.agreement_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.agreement_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('TXT_INFO_AGREEMENT', $lng->txt($a_type . '_info_agreement')); foreach ($fields_info->getExportableFields() as $field) { $tpl->setCurrentBlock('field_item'); diff --git a/components/ILIAS/Membership/classes/class.ilObjectCustomUserFieldsTableGUI.php b/components/ILIAS/Membership/classes/class.ilObjectCustomUserFieldsTableGUI.php index 03fd8d64ec92..10f08d97608a 100644 --- a/components/ILIAS/Membership/classes/class.ilObjectCustomUserFieldsTableGUI.php +++ b/components/ILIAS/Membership/classes/class.ilObjectCustomUserFieldsTableGUI.php @@ -55,7 +55,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->enable('numinfo'); $this->enable('select_all'); - $this->setRowTemplate('tpl.mem_cust_user_data_table_row.html', 'Services/Membership'); + $this->setRowTemplate('tpl.mem_cust_user_data_table_row.html', 'components/ILIAS/Membership'); } /** diff --git a/components/ILIAS/Membership/classes/class.ilRegistrationGUI.php b/components/ILIAS/Membership/classes/class.ilRegistrationGUI.php index 8c48bd7642b4..9ee2a6254d2d 100644 --- a/components/ILIAS/Membership/classes/class.ilRegistrationGUI.php +++ b/components/ILIAS/Membership/classes/class.ilRegistrationGUI.php @@ -171,7 +171,7 @@ protected function fillMembershipLimitation(): void return; } $mem = new ilCustomInputGUI($this->lng->txt('groupings')); - $tpl = new ilTemplate('tpl.membership_limitation_form.html', true, true, 'Services/Membership'); + $tpl = new ilTemplate('tpl.membership_limitation_form.html', true, true, 'components/ILIAS/Membership'); $tpl->setVariable('LIMIT_INTRO', $this->lng->txt($this->type . '_grp_info_reg')); foreach ($items as $ref_id) { $obj_id = ilObject::_lookupObjId($ref_id); diff --git a/components/ILIAS/Membership/classes/class.ilSubscriberTableGUI.php b/components/ILIAS/Membership/classes/class.ilSubscriberTableGUI.php index 1f2dff87083b..4fc9ac5e71ba 100644 --- a/components/ILIAS/Membership/classes/class.ilSubscriberTableGUI.php +++ b/components/ILIAS/Membership/classes/class.ilSubscriberTableGUI.php @@ -90,7 +90,7 @@ public function __construct( $this->setPrefix('subscribers'); $this->setSelectAllCheckbox('subscribers', true); - $this->setRowTemplate("tpl.show_subscribers_row.html", "Services/Membership"); + $this->setRowTemplate("tpl.show_subscribers_row.html", "components/ILIAS/Membership"); if ($show_content) { $this->enable('sort'); diff --git a/components/ILIAS/Membership/classes/class.ilWaitingListTableGUI.php b/components/ILIAS/Membership/classes/class.ilWaitingListTableGUI.php index 09c46c360e02..7fe2f395f656 100644 --- a/components/ILIAS/Membership/classes/class.ilWaitingListTableGUI.php +++ b/components/ILIAS/Membership/classes/class.ilWaitingListTableGUI.php @@ -91,7 +91,7 @@ public function __construct( $this->setPrefix('waiting'); $this->setSelectAllCheckbox('waiting', true); - $this->setRowTemplate("tpl.show_waiting_list_row.html", "Services/Membership"); + $this->setRowTemplate("tpl.show_waiting_list_row.html", "components/ILIAS/Membership"); $this->enable('sort'); $this->enable('header'); diff --git a/components/ILIAS/Membership/test/ilServicesMembershipSuite.php b/components/ILIAS/Membership/test/ilServicesMembershipSuite.php index 09b004669bb3..b6eae40866a0 100644 --- a/components/ILIAS/Membership/test/ilServicesMembershipSuite.php +++ b/components/ILIAS/Membership/test/ilServicesMembershipSuite.php @@ -25,7 +25,7 @@ class ilServicesMembershipSuite extends TestSuite public static function suite(): ilServicesMembershipSuite { /** @noRector */ - require_once("./Services/Membership/test/ilWaitingListTest.php"); + require_once("./components/ILIAS/Membership/test/ilWaitingListTest.php"); $suite = new ilServicesMembershipSuite(); $suite->addTestSuite("ilWaitingListTest"); diff --git a/components/ILIAS/MetaData/classes/Editor/Digest/ContentAssembler.php b/components/ILIAS/MetaData/classes/Editor/Digest/ContentAssembler.php index 1b6bfd0521fd..347fd685924a 100644 --- a/components/ILIAS/MetaData/classes/Editor/Digest/ContentAssembler.php +++ b/components/ILIAS/MetaData/classes/Editor/Digest/ContentAssembler.php @@ -250,7 +250,7 @@ protected function getCopyrightContent( $signal = $modal->getShowSignal(); yield ContentType::MODAL => $modal; - yield ContentType::JS_SOURCE => 'Services/MetaData/js/ilMetaCopyrightListener.js'; + yield ContentType::JS_SOURCE => 'components/ILIAS/MetaData/js/ilMetaCopyrightListener.js'; yield ContentType::FORM => $this->getCopyrightSection($set, $signal); } diff --git a/components/ILIAS/MetaData/classes/Editor/Full/Services/Tables/TableBuilder.php b/components/ILIAS/MetaData/classes/Editor/Full/Services/Tables/TableBuilder.php index fbd4cc6ea250..c30926c86f7c 100644 --- a/components/ILIAS/MetaData/classes/Editor/Full/Services/Tables/TableBuilder.php +++ b/components/ILIAS/MetaData/classes/Editor/Full/Services/Tables/TableBuilder.php @@ -109,7 +109,7 @@ protected function init(): Table $table = new Table(); $table->setRowTemplate( 'tpl.full_editor_row.html', - 'Services/MetaData' + 'components/ILIAS/MetaData' ); $table->setTitle($this->presenter->elements()->nameWithParents( $this->template_element, diff --git a/components/ILIAS/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageTableGUI.php b/components/ILIAS/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageTableGUI.php index 44c297715576..65c41267f49f 100644 --- a/components/ILIAS/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageTableGUI.php +++ b/components/ILIAS/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageTableGUI.php @@ -64,7 +64,7 @@ public function init(): void $this->addColumn($this->lng->txt('meta_copyright_sub_items'), 'subitems'); $this->addColumn($this->lng->txt('owner'), 'owner'); - $this->setRowTemplate("tpl.show_copyright_usages_row.html", "Services/MetaData"); + $this->setRowTemplate("tpl.show_copyright_usages_row.html", "components/ILIAS/MetaData"); $this->setFormAction($this->ctrl->getFormAction( $this->getParentObject(), $this->getParentCmd() diff --git a/components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightTableGUI.php b/components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightTableGUI.php index 5d9c719f7341..3f38bb3f2f23 100644 --- a/components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightTableGUI.php +++ b/components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightTableGUI.php @@ -72,7 +72,7 @@ public function __construct( } $this->setFormAction($this->ctrl->getFormAction($parent_obj)); - $this->setRowTemplate("tpl.show_copyright_row.html", "Services/MetaData"); + $this->setRowTemplate("tpl.show_copyright_row.html", "components/ILIAS/MetaData"); $this->setDefaultOrderField("order"); $this->setDefaultOrderDirection("asc"); } diff --git a/components/ILIAS/MetaData/classes/class.ilMetaDataImporter.php b/components/ILIAS/MetaData/classes/class.ilMetaDataImporter.php index 0c1caf89a253..8a21197df775 100644 --- a/components/ILIAS/MetaData/classes/class.ilMetaDataImporter.php +++ b/components/ILIAS/MetaData/classes/class.ilMetaDataImporter.php @@ -17,7 +17,7 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - $new_id = $a_mapping->getMapping("Services/MetaData", "md", $a_id); + $new_id = $a_mapping->getMapping("components/ILIAS/MetaData", "md", $a_id); if (is_string($new_id) && $new_id !== "") { $id = explode(":", $new_id); diff --git a/components/ILIAS/Migration/DBUpdate_3560/classes/class.ilDBUpdateNewObjectType.php b/components/ILIAS/Migration/DBUpdate_3560/classes/class.ilDBUpdateNewObjectType.php index 6c6aeee399be..4b05f168fa8d 100644 --- a/components/ILIAS/Migration/DBUpdate_3560/classes/class.ilDBUpdateNewObjectType.php +++ b/components/ILIAS/Migration/DBUpdate_3560/classes/class.ilDBUpdateNewObjectType.php @@ -457,7 +457,7 @@ public static function addAdminNode(string $obj_type, string $title): void $ilDB->insert("object_reference", $values); // put in tree - require_once("Services/Tree/classes/class.ilTree.php"); + require_once("components/ILIAS/Tree/classes/class.ilTree.php"); $tree = new ilTree(ROOT_FOLDER_ID); $tree->insertNode($ref_id, SYSTEM_FOLDER_ID); diff --git a/components/ILIAS/Multilingualism/classes/class.ilMultilingualismTableGUI.php b/components/ILIAS/Multilingualism/classes/class.ilMultilingualismTableGUI.php index b87bfbbbec22..2c5be0b5c295 100644 --- a/components/ILIAS/Multilingualism/classes/class.ilMultilingualismTableGUI.php +++ b/components/ILIAS/Multilingualism/classes/class.ilMultilingualismTableGUI.php @@ -61,7 +61,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.obj_translation2_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_translation2_row.html", "components/ILIAS/Object"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Multilingualism/test/ilServicesMultilingualismSuite.php b/components/ILIAS/Multilingualism/test/ilServicesMultilingualismSuite.php index 8f2ef64f1051..33152ca8fc78 100644 --- a/components/ILIAS/Multilingualism/test/ilServicesMultilingualismSuite.php +++ b/components/ILIAS/Multilingualism/test/ilServicesMultilingualismSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Multilingualism/test/MultilingualismStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Multilingualism/test/MultilingualismStandardGUIRequestTest.php"); $suite->addTestSuite("MultilingualismStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/MyStaff/classes/ListCertificates/class.ilMStListCertificatesTableGUI.php b/components/ILIAS/MyStaff/classes/ListCertificates/class.ilMStListCertificatesTableGUI.php index 0f38c1bb36af..ad0884e83c3c 100644 --- a/components/ILIAS/MyStaff/classes/ListCertificates/class.ilMStListCertificatesTableGUI.php +++ b/components/ILIAS/MyStaff/classes/ListCertificates/class.ilMStListCertificatesTableGUI.php @@ -48,7 +48,7 @@ public function __construct(\ilMStListCertificatesGUI $parent_obj, $parent_cmd = parent::__construct($parent_obj, $parent_cmd, ''); - $this->setRowTemplate('tpl.list_courses_row.html', "Services/MyStaff"); + $this->setRowTemplate('tpl.list_courses_row.html', "components/ILIAS/MyStaff"); $this->setFormAction($DIC->ctrl()->getFormAction($parent_obj)); $this->setDefaultOrderDirection('desc'); diff --git a/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php b/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php index 5f52ba47b454..59de4b8f7ab1 100644 --- a/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php +++ b/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkills.php @@ -18,7 +18,7 @@ use ILIAS\DI\Container; use ILIAS\MyStaff\ilMyStaffAccess; -use ILIAS\Services\MyStaff\Utils\ListFetcherResult; +use ILIAS\components\MyStaff\Utils\ListFetcherResult; /** * Class ilMStListCompetencesSkills diff --git a/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsTableGUI.php b/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsTableGUI.php index bfa8982fa05e..765dc50187da 100644 --- a/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsTableGUI.php +++ b/components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsTableGUI.php @@ -48,7 +48,7 @@ public function __construct(\ilMStListCompetencesSkillsGUI $parent_obj, string $ parent::__construct($parent_obj, $parent_cmd, ''); - $this->setRowTemplate('tpl.list_skills_row.html', "Services/MyStaff"); + $this->setRowTemplate('tpl.list_skills_row.html', "components/ILIAS/MyStaff"); $this->setFormAction($this->dic->ctrl()->getFormAction($parent_obj)); $this->setDefaultOrderDirection('desc'); diff --git a/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCourses.php b/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCourses.php index 3080983207a4..c1f4ec5dc691 100644 --- a/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCourses.php +++ b/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCourses.php @@ -23,7 +23,7 @@ use ILIAS\MyStaff\ilMyStaffAccess; use ilLPStatus; use ilOrgUnitOperation; -use ILIAS\Services\MyStaff\Utils\ListFetcherResult; +use ILIAS\components\MyStaff\Utils\ListFetcherResult; /** * Class ilMStListCourses diff --git a/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php b/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php index 933ff0bf9b55..0469281d8077 100644 --- a/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php +++ b/components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php @@ -52,7 +52,7 @@ public function __construct(ilMStListCoursesGUI $parent_obj, $parent_cmd = ilMSt parent::__construct($parent_obj, $parent_cmd, ''); - $this->setRowTemplate('tpl.list_courses_row.html', "Services/MyStaff"); + $this->setRowTemplate('tpl.list_courses_row.html', "components/ILIAS/MyStaff"); $this->setFormAction($DIC->ctrl()->getFormAction($parent_obj)); $this->setDefaultOrderDirection('desc'); diff --git a/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsers.php b/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsers.php index 4c528be3a308..5a5a5222c607 100644 --- a/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsers.php +++ b/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsers.php @@ -20,7 +20,7 @@ namespace ILIAS\MyStaff\ListUsers; use ILIAS\DI\Container; -use ILIAS\Services\MyStaff\Utils\ListFetcherResult; +use ILIAS\components\MyStaff\Utils\ListFetcherResult; /** * Class ilListUser diff --git a/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsersTableGUI.php b/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsersTableGUI.php index 6cf67f9dd095..97333513928d 100644 --- a/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsersTableGUI.php +++ b/components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsersTableGUI.php @@ -56,7 +56,7 @@ public function __construct(\ilMStListUsersGUI $parent_obj, $parent_cmd = \ilMSt $this->uiRenderer = $DIC->ui()->renderer(); $this->language = $DIC->language(); - $this->setRowTemplate('tpl.list_users_row.html', "Services/MyStaff"); + $this->setRowTemplate('tpl.list_users_row.html', "components/ILIAS/MyStaff"); $this->setFormAction($DIC->ctrl()->getFormAction($parent_obj)); $this->setDefaultOrderDirection('desc'); diff --git a/components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php b/components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php index f09fb96a01de..7bef17f8a3e8 100644 --- a/components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php +++ b/components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php @@ -56,7 +56,7 @@ public function __construct(ilMStShowUserCoursesGUI $parent_obj, $parent_cmd = i $this->setId('myst_su'); parent::__construct($parent_obj, $parent_cmd, ''); - $this->setRowTemplate('tpl.list_user_courses_row.html', "Services/MyStaff"); + $this->setRowTemplate('tpl.list_user_courses_row.html', "components/ILIAS/MyStaff"); $this->setFormAction($DIC->ctrl()->getFormAction($parent_obj)); ; $this->setDefaultOrderDirection('desc'); diff --git a/components/ILIAS/MyStaff/classes/Utils/ListFetcherResult.php b/components/ILIAS/MyStaff/classes/Utils/ListFetcherResult.php index d3756c578f67..038ce74a1b69 100644 --- a/components/ILIAS/MyStaff/classes/Utils/ListFetcherResult.php +++ b/components/ILIAS/MyStaff/classes/Utils/ListFetcherResult.php @@ -17,7 +17,7 @@ */ declare(strict_types=1); -namespace ILIAS\Services\MyStaff\Utils; +namespace ILIAS\components\MyStaff\Utils; final class ListFetcherResult { diff --git a/components/ILIAS/News/Timeline/class.ilTimelineGUI.php b/components/ILIAS/News/Timeline/class.ilTimelineGUI.php index b46a4d10c96d..f6b12d6d8ebf 100644 --- a/components/ILIAS/News/Timeline/class.ilTimelineGUI.php +++ b/components/ILIAS/News/Timeline/class.ilTimelineGUI.php @@ -49,10 +49,10 @@ public function addItem(ilTimelineItemInt $a_item): void public function render( bool $a_items_only = false ): string { - $this->tpl->addJavaScript("./Services/News/Timeline/js/Timeline.js"); - $this->tpl->addJavaScript("./Services/News/Timeline/libs/jquery-dynamic-max-height-master/src/jquery.dynamicmaxheight.js"); + $this->tpl->addJavaScript("./components/ILIAS/News/Timeline/js/Timeline.js"); + $this->tpl->addJavaScript("./components/ILIAS/News/Timeline/libs/jquery-dynamic-max-height-master/src/jquery.dynamicmaxheight.js"); - $t = new ilTemplate("tpl.timeline.html", true, true, "Services/News/Timeline"); + $t = new ilTemplate("tpl.timeline.html", true, true, "components/ILIAS/News/Timeline"); if (!$a_items_only) { $t->touchBlock("list_start"); $t->touchBlock("list_end"); diff --git a/components/ILIAS/News/classes/class.ilNewsDataSet.php b/components/ILIAS/News/classes/class.ilNewsDataSet.php index 42b68c2ba4e4..f9c3e167d8e5 100644 --- a/components/ILIAS/News/classes/class.ilNewsDataSet.php +++ b/components/ILIAS/News/classes/class.ilNewsDataSet.php @@ -118,11 +118,11 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI case "news": $mob_id = null; if ($a_rec["MobId"] > 0) { - $mob_id = $a_mapping->getMapping("Services/MediaObjects", "mob", $a_rec["MobId"]); + $mob_id = $a_mapping->getMapping("components/ILIAS/MediaObjects", "mob", $a_rec["MobId"]); } $c = (int) $a_rec["ContextObjId"] . ":" . $a_rec["ContextObjType"] . ":" . (int) $a_rec["ContextSubObjId"] . ":" . $a_rec["ContextSubObjType"]; - $context = $a_mapping->getMapping("Services/News", "news_context", $c); + $context = $a_mapping->getMapping("components/ILIAS/News", "news_context", $c); $context = explode(":", $context); $newObj = new ilNewsItem(); @@ -140,7 +140,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI $newObj->setMobId((int) $mob_id); $newObj->setPlaytime($a_rec["Playtime"]); $newObj->create(); - $a_mapping->addMapping("Services/News", "news", $a_rec["Id"], (string) $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/News", "news", $a_rec["Id"], (string) $newObj->getId()); break; case "news_settings": diff --git a/components/ILIAS/News/classes/class.ilNewsExporter.php b/components/ILIAS/News/classes/class.ilNewsExporter.php index 722315eace6a..f19977b6cad4 100644 --- a/components/ILIAS/News/classes/class.ilNewsExporter.php +++ b/components/ILIAS/News/classes/class.ilNewsExporter.php @@ -48,7 +48,7 @@ public function getXmlExportHeadDependencies(string $a_entity, string $a_target_ return [ [ - "component" => "Services/MediaObjects", + "component" => "components/ILIAS/MediaObjects", "entity" => "mob", "ids" => $mob_ids ] diff --git a/components/ILIAS/News/classes/class.ilNewsForContextBlockGUI.php b/components/ILIAS/News/classes/class.ilNewsForContextBlockGUI.php index 600e5e05493f..58b24cbf4764 100644 --- a/components/ILIAS/News/classes/class.ilNewsForContextBlockGUI.php +++ b/components/ILIAS/News/classes/class.ilNewsForContextBlockGUI.php @@ -104,7 +104,7 @@ public function __construct() } $this->setTitle($lng->txt("news_internal_news")); - $this->setRowTemplate("tpl.block_row_news_for_context.html", "Services/News"); + $this->setRowTemplate("tpl.block_row_news_for_context.html", "components/ILIAS/News"); $this->setData($data); $this->allow_moving = false; $this->handleView(); @@ -488,7 +488,7 @@ public function showNews(): string $enable_internal_rss = $news_set->get("enable_rss_for_internal"); - $tpl = new ilTemplate("tpl.show_news.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.show_news.html", true, true, "components/ILIAS/News"); // get current item in data set $previous = ""; @@ -1215,7 +1215,7 @@ public function showFeedUrl(): string $title = ilObject::_lookupTitle((int) $this->block_id); - $tpl = new ilTemplate("tpl.show_feed_url.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.show_feed_url.html", true, true, "components/ILIAS/News"); $tpl->setVariable( "TXT_TITLE", sprintf($lng->txt("news_feed_url_for"), $title) @@ -1288,7 +1288,7 @@ public function getDynamicReload(): string "block_" . $this->getBlockType() . "_" . $this->getBlockId() ); - $rel_tpl = new ilTemplate("tpl.dynamic_reload.html", true, true, "Services/News"); + $rel_tpl = new ilTemplate("tpl.dynamic_reload.html", true, true, "components/ILIAS/News"); $rel_tpl->setVariable("TXT_LOADING", $lng->txt("news_loading_news")); $rel_tpl->setVariable("BLOCK_ID", "block_" . $this->getBlockType() . "_" . $this->getBlockId()); $rel_tpl->setVariable( @@ -1316,7 +1316,7 @@ public function getJSEnabler(): string "block_" . $this->getBlockType() . "_" . $this->getBlockId() ); //echo "hh"; - $rel_tpl = new ilTemplate("tpl.js_enabler.html", true, true, "Services/News"); + $rel_tpl = new ilTemplate("tpl.js_enabler.html", true, true, "components/ILIAS/News"); $rel_tpl->setVariable("BLOCK_ID", "block_" . $this->getBlockType() . "_" . $this->getBlockId()); $rel_tpl->setVariable( "TARGET", diff --git a/components/ILIAS/News/classes/class.ilNewsForContextTableGUI.php b/components/ILIAS/News/classes/class.ilNewsForContextTableGUI.php index 56202b651ba9..063bf87e37c5 100644 --- a/components/ILIAS/News/classes/class.ilNewsForContextTableGUI.php +++ b/components/ILIAS/News/classes/class.ilNewsForContextTableGUI.php @@ -54,7 +54,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.table_row_news_for_context.html", - "Services/News" + "components/ILIAS/News" ); } diff --git a/components/ILIAS/News/classes/class.ilNewsItem.php b/components/ILIAS/News/classes/class.ilNewsItem.php index b41cf91f25a3..a8d736e15183 100644 --- a/components/ILIAS/News/classes/class.ilNewsItem.php +++ b/components/ILIAS/News/classes/class.ilNewsItem.php @@ -1330,7 +1330,7 @@ public static function _setRead( ); $ilAppEventHandler->raise( - "Services/News", + "components/ILIAS/News", "readNews", ["user_id" => $a_user_id, "news_ids" => [$a_news_id]] ); @@ -1354,7 +1354,7 @@ public static function _setUnread( " AND news_id = " . $ilDB->quote($a_news_id, "integer")); $ilAppEventHandler->raise( - "Services/News", + "components/ILIAS/News", "unreadNews", ["user_id" => $a_user_id, "news_ids" => [$a_news_id]] ); diff --git a/components/ILIAS/News/classes/class.ilNewsItemGUI.php b/components/ILIAS/News/classes/class.ilNewsItemGUI.php index 97e46ee24a67..7aac9f21562f 100644 --- a/components/ILIAS/News/classes/class.ilNewsItemGUI.php +++ b/components/ILIAS/News/classes/class.ilNewsItemGUI.php @@ -513,7 +513,7 @@ public function getNewsForContextBlock(): string $data = $news_item->queryNewsForContext(); $block_gui->setTitle($lng->txt("news_block_news_for_context")); - $block_gui->setRowTemplate("tpl.block_row_news_for_context.html", "Services/News"); + $block_gui->setRowTemplate("tpl.block_row_news_for_context.html", "components/ILIAS/News"); $block_gui->setData($data); return $block_gui->getHTML(); @@ -560,7 +560,7 @@ public function getNewsForContextTable(): string $table_gui = new ilNewsForContextTableGUI($this, "getNewsForContextTable", $perm_ref_id); $table_gui->setTitle($lng->txt("news_table_news_for_context")); - $table_gui->setRowTemplate("tpl.table_row_news_for_context.html", "Services/News"); + $table_gui->setRowTemplate("tpl.table_row_news_for_context.html", "components/ILIAS/News"); $table_gui->setData($data); $table_gui->setDefaultOrderField("creation_date"); diff --git a/components/ILIAS/News/classes/class.ilNewsTimelineGUI.php b/components/ILIAS/News/classes/class.ilNewsTimelineGUI.php index bea2a1c2e8d9..0d56d64fd57f 100644 --- a/components/ILIAS/News/classes/class.ilNewsTimelineGUI.php +++ b/components/ILIAS/News/classes/class.ilNewsTimelineGUI.php @@ -236,7 +236,7 @@ public function getHTML(ilPropertyFormGUI $form = null): string $this->tpl->addOnLoadCode("il.News.setAjaxUrl('" . $this->ctrl->getLinkTarget($this, "", "", true) . "');"); if (count($this->news_data) > 0) { - $ttpl = new ilTemplate("tpl.news_timeline.html", true, true, "Services/News"); + $ttpl = new ilTemplate("tpl.news_timeline.html", true, true, "components/ILIAS/News"); $ttpl->setVariable("NEWS", $timeline->render()); $ttpl->setVariable("EDIT_MODAL", $this->getEditModal($form)); //$ttpl->setVariable("DELETE_MODAL", $this->getDeleteModal()); @@ -262,7 +262,7 @@ public function getHTML(ilPropertyFormGUI $form = null): string $this->lng->toJS("update"); $this->lng->toJS("save"); - $this->tpl->addJavaScript("./Services/News/js/News.js"); + $this->tpl->addJavaScript("./components/ILIAS/News/js/News.js"); return $html; } diff --git a/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php b/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php index 19ee90852d41..4c81b09a133f 100644 --- a/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php +++ b/components/ILIAS/News/classes/class.ilNewsTimelineItemGUI.php @@ -106,7 +106,7 @@ public function getDateTime(): ilDateTime public function render(): string { $i = $this->getNewsItem(); - $tpl = new ilTemplate("tpl.timeline_item.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.timeline_item.html", true, true, "components/ILIAS/News"); $ui_factory = $this->gui->ui()->factory(); $ui_renderer = $this->gui->ui()->renderer(); @@ -213,7 +213,7 @@ protected function renderMedia(ilNewsItem $i): string $title = basename($media_path); $image = $ui_renderer->render($ui_factory->image()->responsive($media_path, $title)); - $img_tpl = new ilTemplate("tpl.news_timeline_image_file.html", true, true, "Services/News"); + $img_tpl = new ilTemplate("tpl.news_timeline_image_file.html", true, true, "components/ILIAS/News"); $img_tpl->setVariable("ITEM_ID", $item_id); $img_tpl->setVariable("IMAGE", $image); diff --git a/components/ILIAS/News/classes/class.ilPDNewsBlockGUI.php b/components/ILIAS/News/classes/class.ilPDNewsBlockGUI.php index 42d3c96ad402..e310f43741bd 100644 --- a/components/ILIAS/News/classes/class.ilPDNewsBlockGUI.php +++ b/components/ILIAS/News/classes/class.ilPDNewsBlockGUI.php @@ -78,7 +78,7 @@ public function __construct() } $this->setTitle($lng->txt("news_internal_news")); - $this->setRowTemplate("tpl.block_row_news_for_context.html", "Services/News"); + $this->setRowTemplate("tpl.block_row_news_for_context.html", "components/ILIAS/News"); $this->setData($data); @@ -208,7 +208,7 @@ public function showFeedUrl(): string $news_set = new ilSetting("news"); if ($news_set->get("enable_private_feed")) { - $tpl = new ilTemplate("tpl.show_priv_feed_url.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.show_priv_feed_url.html", true, true, "components/ILIAS/News"); $tpl->setVariable("TXT_PRIV_TITLE", $lng->txt("news_get_priv_feed_title")); @@ -232,7 +232,7 @@ public function showFeedUrl(): string $tpl->setVariable("EDIT_SETTINGS_TXT", $lng->txt("news_edit_news_settings")); } } else { - $tpl = new ilTemplate("tpl.show_feed_url.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.show_feed_url.html", true, true, "components/ILIAS/News"); } $tpl->setVariable("TXT_TITLE", $lng->txt("news_get_feed_title")); $tpl->setVariable("TXT_INFO", $lng->txt("news_get_feed_info")); diff --git a/components/ILIAS/News/classes/class.ilPDNewsTableGUI.php b/components/ILIAS/News/classes/class.ilPDNewsTableGUI.php index 674883fc0bdd..aac6dc09d30c 100644 --- a/components/ILIAS/News/classes/class.ilPDNewsTableGUI.php +++ b/components/ILIAS/News/classes/class.ilPDNewsTableGUI.php @@ -58,7 +58,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.table_row_pd_news.html", - "Services/News" + "components/ILIAS/News" ); $this->setDefaultOrderField("update_date"); $this->setDefaultOrderDirection("desc"); diff --git a/components/ILIAS/News/classes/class.ilRSSButtonGUI.php b/components/ILIAS/News/classes/class.ilRSSButtonGUI.php index 7bf516826a75..f243f484d792 100644 --- a/components/ILIAS/News/classes/class.ilRSSButtonGUI.php +++ b/components/ILIAS/News/classes/class.ilRSSButtonGUI.php @@ -40,7 +40,7 @@ public static function get( string $a_type, string $a_href = "" ): string { - $tpl = new ilTemplate("tpl.rss_icon.html", true, true, "Services/News"); + $tpl = new ilTemplate("tpl.rss_icon.html", true, true, "components/ILIAS/News"); if ($a_href !== "") { $tpl->setCurrentBlock("a_start"); diff --git a/components/ILIAS/News/test/ilServicesNewsSuite.php b/components/ILIAS/News/test/ilServicesNewsSuite.php index 8f4aa95b844f..97bed930ef4b 100644 --- a/components/ILIAS/News/test/ilServicesNewsSuite.php +++ b/components/ILIAS/News/test/ilServicesNewsSuite.php @@ -32,7 +32,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/News/test/NewsContextTest.php"); + require_once("./components/ILIAS/News/test/NewsContextTest.php"); $suite->addTestSuite("NewsContextTest"); return $suite; diff --git a/components/ILIAS/Notes/Export/class.NotesHtmlExport.php b/components/ILIAS/Notes/Export/class.NotesHtmlExport.php index 04c7a7d95dba..9f50fb71dada 100644 --- a/components/ILIAS/Notes/Export/class.NotesHtmlExport.php +++ b/components/ILIAS/Notes/Export/class.NotesHtmlExport.php @@ -40,7 +40,7 @@ class NotesHtmlExport protected string $sub_dir; protected string $target_dir; protected \ILIAS\GlobalScreen\Services $global_screen; - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; public function __construct( int $type, @@ -63,7 +63,7 @@ public function __construct( $this->target_dir = $exp_dir . "/" . $sub_dir; $this->global_screen = $DIC->globalScreen(); - $this->export_util = new \ILIAS\Services\Export\HTML\Util($exp_dir, $sub_dir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($exp_dir, $sub_dir); if (!self::$export_key_set) { self::$export_key_set = true; $this->global_screen->tool()->context()->current()->addAdditionalData( diff --git a/components/ILIAS/Notes/Export/class.ilNotesDataSet.php b/components/ILIAS/Notes/Export/class.ilNotesDataSet.php index 05b70fd81805..80ebbe753a43 100644 --- a/components/ILIAS/Notes/Export/class.ilNotesDataSet.php +++ b/components/ILIAS/Notes/Export/class.ilNotesDataSet.php @@ -107,7 +107,7 @@ public function importRecord( ): void { switch ($a_entity) { case "user_notes": - $usr_id = $a_mapping->getMapping("Services/User", "usr", $a_rec["Author"]); + $usr_id = $a_mapping->getMapping("components/ILIAS/User", "usr", $a_rec["Author"]); if ($usr_id > 0) { // only import real user (assigned to personal desktop) notes // here. diff --git a/components/ILIAS/Notes/Note/class.ilNoteGUI.php b/components/ILIAS/Notes/Note/class.ilNoteGUI.php index 372a79f7f59e..422c89814c8a 100644 --- a/components/ILIAS/Notes/Note/class.ilNoteGUI.php +++ b/components/ILIAS/Notes/Note/class.ilNoteGUI.php @@ -377,7 +377,7 @@ public function getNoteListHTML( $notes = $this->getNotes(); - $tpl = new ilTemplate("tpl.notes_list.html", true, true, "Services/Notes"); + $tpl = new ilTemplate("tpl.notes_list.html", true, true, "components/ILIAS/Notes"); // show counter if notes are hidden $cnt_str = (count($notes) > 0) @@ -1047,7 +1047,7 @@ public function renderContent(string $content): string "tpl.notes_and_comments.html", true, true, - "Services/Notes" + "components/ILIAS/Notes" ); if (!$ctrl->isAsynch()) { @@ -1475,7 +1475,7 @@ public function getWidget(): string $cnt[$this->rep_obj_id][$this->note_type] = $this->manager->getNrOfNotesForContext($context, $this->note_type); $cnt = $cnt[$this->rep_obj_id][$this->note_type] ?? 0; - $tpl = new ilTemplate("tpl.note_widget_header.html", true, true, "Services/Notes"); + $tpl = new ilTemplate("tpl.note_widget_header.html", true, true, "components/ILIAS/Notes"); $widget_el_id = "notew_" . str_replace(";", "_", $hash); $ctrl->setParameter($this, "hash", $hash); $update_url = $ctrl->getLinkTarget($this, "updateWidget", "", true, false); diff --git a/components/ILIAS/Notes/Service/class.InternalGUIService.php b/components/ILIAS/Notes/Service/class.InternalGUIService.php index 27d26649a5f4..508808a0d761 100644 --- a/components/ILIAS/Notes/Service/class.InternalGUIService.php +++ b/components/ILIAS/Notes/Service/class.InternalGUIService.php @@ -77,7 +77,7 @@ public function initJavascript( \ilModalGUI::initJS($tpl); $lng->toJS(array("private_notes", "notes_public_comments", "cancel", "notes_messages"), $tpl); - $tpl->addJavaScript("./Services/Notes/js/ilNotes.js"); + $tpl->addJavaScript("./components/ILIAS/Notes/js/ilNotes.js"); $tpl->addOnLoadCode("ilNotes.setAjaxUrl('" . $ajax_url . "');"); } diff --git a/components/ILIAS/Notes/test/ilServicesNotesSuite.php b/components/ILIAS/Notes/test/ilServicesNotesSuite.php index 6e64143ad7f1..c44a79627d79 100644 --- a/components/ILIAS/Notes/test/ilServicesNotesSuite.php +++ b/components/ILIAS/Notes/test/ilServicesNotesSuite.php @@ -32,7 +32,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Notes/test/NotesSessionRepositoryTest.php"); + require_once("./components/ILIAS/Notes/test/NotesSessionRepositoryTest.php"); $suite->addTestSuite("NotesSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/Notification/classes/class.ilNotificationAppEventListener.php b/components/ILIAS/Notification/classes/class.ilNotificationAppEventListener.php index a94775329b7f..fa4790503dd5 100644 --- a/components/ILIAS/Notification/classes/class.ilNotificationAppEventListener.php +++ b/components/ILIAS/Notification/classes/class.ilNotificationAppEventListener.php @@ -23,7 +23,7 @@ public static function handleEvent( string $a_event, array $a_parameter ): void { - if ($a_component === 'Services/Object' && $a_event === 'delete') { + if ($a_component === 'components/ILIAS/Object' && $a_event === 'delete') { if ($a_parameter['obj_id'] > 0) { $set = new ilObjNotificationSettings($a_parameter['obj_id']); $set->delete(); diff --git a/components/ILIAS/Notification/test/ilServicesNotificationSuite.php b/components/ILIAS/Notification/test/ilServicesNotificationSuite.php index c5c2deda7d4f..821d2a60720c 100644 --- a/components/ILIAS/Notification/test/ilServicesNotificationSuite.php +++ b/components/ILIAS/Notification/test/ilServicesNotificationSuite.php @@ -28,7 +28,7 @@ public static function suite(): \ilServicesNotificationSuite { $suite = new self(); - require_once("./Services/Notification/test/NotificationTest.php"); + require_once("./components/ILIAS/Notification/test/NotificationTest.php"); $suite->addTestSuite("NotificationTest"); return $suite; diff --git a/components/ILIAS/Notifications/classes/Setup/ilNotificationSetupHelper.php b/components/ILIAS/Notifications/classes/Setup/ilNotificationSetupHelper.php index 70dbd970d013..53f40b879e1b 100644 --- a/components/ILIAS/Notifications/classes/Setup/ilNotificationSetupHelper.php +++ b/components/ILIAS/Notifications/classes/Setup/ilNotificationSetupHelper.php @@ -119,7 +119,7 @@ public static function setupTables(): void 'mail', 'mail_desc', 'ilNotificationMailHandler', - 'Services/Notifications/classes/class.ilNotificationMailHandler.php' + 'components/ILIAS/Notifications/classes/class.ilNotificationMailHandler.php' ); self::registerChannel( $ilDB, @@ -127,7 +127,7 @@ public static function setupTables(): void 'osd', 'osd_desc', 'ilNotificationOSDHandler', - 'Services/Notifications/classes/class.ilNotificationOSDHandler.php' + 'components/ILIAS/Notifications/classes/class.ilNotificationOSDHandler.php' ); } diff --git a/components/ILIAS/Notifications/classes/ilNotificationOSDGUI.php b/components/ILIAS/Notifications/classes/ilNotificationOSDGUI.php index 4fdbe1d7c94c..8d75ac46a941 100644 --- a/components/ILIAS/Notifications/classes/ilNotificationOSDGUI.php +++ b/components/ILIAS/Notifications/classes/ilNotificationOSDGUI.php @@ -52,7 +52,7 @@ public function populatePage(): void $notificationSettings = new ilSetting('notifications'); - $osdTemplate = new ilTemplate('tpl.osd_notifications.js', true, true, 'Services/Notifications'); + $osdTemplate = new ilTemplate('tpl.osd_notifications.js', true, true, 'components/ILIAS/Notifications'); $osdTemplate->setVariable( 'OSD_INTERVAL', @@ -66,8 +66,8 @@ public function populatePage(): void iljQueryUtil::initjQuery($this->page); ilPlayerUtil::initMediaElementJs($this->page); - $this->page->addJavaScript('Services/Notifications/templates/default/notifications.js'); - $this->page->addCSS('Services/Notifications/templates/default/osd.css'); + $this->page->addJavaScript('components/ILIAS/Notifications/templates/default/notifications.js'); + $this->page->addCSS('components/ILIAS/Notifications/templates/default/osd.css'); $this->page->addOnLoadCode($osdTemplate->get()); } } diff --git a/components/ILIAS/Notifications/classes/ilNotificationSettingsTable.php b/components/ILIAS/Notifications/classes/ilNotificationSettingsTable.php index 8e6c70557248..22e374773220 100644 --- a/components/ILIAS/Notifications/classes/ilNotificationSettingsTable.php +++ b/components/ILIAS/Notifications/classes/ilNotificationSettingsTable.php @@ -72,7 +72,7 @@ public function __construct( ); } - $this->setRowTemplate('tpl.type_line.html', 'Services/Notifications'); + $this->setRowTemplate('tpl.type_line.html', 'components/ILIAS/Notifications'); $this->setSelectAllCheckbox(''); } diff --git a/components/ILIAS/Object/classes/Properties/ObjectTypeSpecificProperties/ilObjectTypeSpecificPropertiesArtifactObjective.php b/components/ILIAS/Object/classes/Properties/ObjectTypeSpecificProperties/ilObjectTypeSpecificPropertiesArtifactObjective.php index 561ce26cbfc0..bc446b3875fe 100644 --- a/components/ILIAS/Object/classes/Properties/ObjectTypeSpecificProperties/ilObjectTypeSpecificPropertiesArtifactObjective.php +++ b/components/ILIAS/Object/classes/Properties/ObjectTypeSpecificProperties/ilObjectTypeSpecificPropertiesArtifactObjective.php @@ -29,7 +29,7 @@ class ilObjectTypeSpecificPropertiesArtifactObjective extends BuildArtifactObjective { - public const PATH = './Services/Object/artifacts/object_specific_properties.php'; + public const PATH = './components/ILIAS/Object/artifacts/object_specific_properties.php'; public function getArtifactPath(): string { diff --git a/components/ILIAS/Object/classes/Setup/class.ilObjectDBUpdateSteps.php b/components/ILIAS/Object/classes/Setup/class.ilObjectDBUpdateSteps.php index 224a34ca4b8d..fde0ad035934 100644 --- a/components/ILIAS/Object/classes/Setup/class.ilObjectDBUpdateSteps.php +++ b/components/ILIAS/Object/classes/Setup/class.ilObjectDBUpdateSteps.php @@ -52,4 +52,24 @@ public function step_2(): void $this->db->manipulate($query); } } + + public function step_3(): void + { + $query = "UPDATE il_object_def SET " . PHP_EOL + . " component = REPLACE(component, 'Services', 'components/ILIAS'), " . PHP_EOL + . " location = REPLACE(location, 'Services', 'components/ILIAS')" . PHP_EOL + . " WHERE component LIKE ('Services/%')"; + + $this->db->manipulate($query); + } + + public function step_4(): void + { + $query = "UPDATE il_object_def SET " . PHP_EOL + . " component = REPLACE(component, 'Language', 'Language_'), " . PHP_EOL + . " location = REPLACE(location, '/classes', '_/classes')" . PHP_EOL + . " WHERE component LIKE ('%Language')"; + + $this->db->manipulate($query); + } } diff --git a/components/ILIAS/Object/classes/Setup/class.ilObjectSetupAgent.php b/components/ILIAS/Object/classes/Setup/class.ilObjectSetupAgent.php index c53669b3034c..e50ce7e8dad6 100644 --- a/components/ILIAS/Object/classes/Setup/class.ilObjectSetupAgent.php +++ b/components/ILIAS/Object/classes/Setup/class.ilObjectSetupAgent.php @@ -44,7 +44,7 @@ public function getUpdateObjective(Config $config = null): Objective public function getStatusObjective(Metrics\Storage $storage): Objective { return new ObjectiveCollection( - 'Services/Object', + 'components/ILIAS/Object', true, new \ilDatabaseUpdateStepsMetricsCollectedObjective( $storage, diff --git a/components/ILIAS/Object/classes/Translation/class.ilObjectTranslation2TableGUI.php b/components/ILIAS/Object/classes/Translation/class.ilObjectTranslation2TableGUI.php index 4123f3d25cbb..1fad3372d158 100644 --- a/components/ILIAS/Object/classes/Translation/class.ilObjectTranslation2TableGUI.php +++ b/components/ILIAS/Object/classes/Translation/class.ilObjectTranslation2TableGUI.php @@ -70,7 +70,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($parent_obj)); - $this->setRowTemplate("tpl.obj_translation2_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_translation2_row.html", "components/ILIAS/Object"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Object/classes/Translation/class.ilObjectTranslationTableGUI.php b/components/ILIAS/Object/classes/Translation/class.ilObjectTranslationTableGUI.php index e0ffe759f4d7..e101959f90b4 100644 --- a/components/ILIAS/Object/classes/Translation/class.ilObjectTranslationTableGUI.php +++ b/components/ILIAS/Object/classes/Translation/class.ilObjectTranslationTableGUI.php @@ -56,7 +56,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($parent_obj)); - $this->setRowTemplate("tpl.obj_translation_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_translation_row.html", "components/ILIAS/Object"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Object/classes/class.ilObjClipboardTableGUI.php b/components/ILIAS/Object/classes/class.ilObjClipboardTableGUI.php index ea0649fb87c9..f26becc56b21 100644 --- a/components/ILIAS/Object/classes/class.ilObjClipboardTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjClipboardTableGUI.php @@ -36,7 +36,7 @@ public function __construct(?object $parent_obj, string $parent_cmd) $this->addColumn($this->lng->txt("action")); $this->setFormAction($this->ctrl->getFormAction($parent_obj)); - $this->setRowTemplate("tpl.obj_cliboard_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_cliboard_row.html", "components/ILIAS/Object"); } protected function fillRow(array $set): void diff --git a/components/ILIAS/Object/classes/class.ilObject.php b/components/ILIAS/Object/classes/class.ilObject.php index 45b533aabdf8..e75a03ebc2ff 100644 --- a/components/ILIAS/Object/classes/class.ilObject.php +++ b/components/ILIAS/Object/classes/class.ilObject.php @@ -588,7 +588,7 @@ public function create(): int )); $this->app_event_handler->raise( - 'Services/Object', + 'components/ILIAS/Object', 'create', [ 'obj_id' => $this->id, @@ -651,7 +651,7 @@ public function update(): bool } $this->app_event_handler->raise( - 'Services/Object', + 'components/ILIAS/Object', 'update', [ 'obj_id' => $this->getId(), @@ -676,7 +676,7 @@ final public function MDUpdateListener(string $element): void { if ($this->beforeMDUpdateListener($element)) { $this->app_event_handler->raise( - 'Services/Object', + 'components/ILIAS/Object', 'update', ['obj_id' => $this->getId(), 'obj_type' => $this->getType(), @@ -1209,7 +1209,7 @@ public function putInTree(int $parent_ref_id): void $this->log->write($log_entry); $this->app_event_handler->raise( - 'Services/Object', + 'components/ILIAS/Object', 'putObjectInTree', [ 'object' => $this, @@ -1329,7 +1329,7 @@ public function delete(): bool ); } - $this->app_event_handler->raise('Services/Object', 'beforeDeletion', ['object' => $this]); + $this->app_event_handler->raise('components/ILIAS/Object', 'beforeDeletion', ['object' => $this]); $sql = "DELETE FROM " . self::TABLE_OBJECT_DATA . PHP_EOL @@ -1391,7 +1391,7 @@ public function delete(): bool if ($this->referenced) { ilObjectActivation::deleteAllEntries($this->getRefId()); - $this->app_event_handler->raise('Services/Object', 'deleteReference', ['ref_id' => $this->getRefId()]); + $this->app_event_handler->raise('components/ILIAS/Object', 'deleteReference', ['ref_id' => $this->getRefId()]); $sql = "DELETE FROM object_reference" . PHP_EOL @@ -1665,7 +1665,7 @@ public function cloneObject(int $target_id, int $copy_id = 0, bool $omit_tree = $tile_image->cloneFor($new_obj->getId()); $this->app_event_handler->raise( - 'Services/Object', + 'components/ILIAS/Object', 'cloneObject', [ 'object' => $new_obj, diff --git a/components/ILIAS/Object/classes/class.ilObjectAppEventListener.php b/components/ILIAS/Object/classes/class.ilObjectAppEventListener.php index e4fe0c2e934a..494c5a086bb8 100644 --- a/components/ILIAS/Object/classes/class.ilObjectAppEventListener.php +++ b/components/ILIAS/Object/classes/class.ilObjectAppEventListener.php @@ -31,7 +31,7 @@ public static function handleEvent(string $component, string $event, array $para { global $DIC; - if ('Services/Object' === $component && 'beforeDeletion' === $event) { + if ('components/ILIAS/Object' === $component && 'beforeDeletion' === $event) { $customIconFactory = $DIC['object.customicons.factory']; $customIcon = $customIconFactory->getByObjId( $parameter['object']->getId(), diff --git a/components/ILIAS/Object/classes/class.ilObjectCopyGUI.php b/components/ILIAS/Object/classes/class.ilObjectCopyGUI.php index a2f1fa7a1d67..f714cf59c487 100644 --- a/components/ILIAS/Object/classes/class.ilObjectCopyGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectCopyGUI.php @@ -404,7 +404,7 @@ protected function showSourceSelectionTree(): void 'ADM_CONTENT', 'adm_content', 'tpl.paste_into_multiple_objects.html', - "Services/Object" + "components/ILIAS/Object" ); $this->tpl->setOnScreenMessage('info', $this->lng->txt('msg_copy_clipboard_source')); @@ -809,7 +809,7 @@ protected function showItemSelection(bool $copy_page = false): void $this->log->debug('Target(s): ' . print_r($this->getTargets(), true)); $this->tpl->setOnScreenMessage('info', $this->lng->txt($this->getType() . '_copy_threads_info')); - $this->tpl->addJavaScript('./Services/CopyWizard/js/ilContainer.js'); + $this->tpl->addJavaScript('./components/ILIAS/CopyWizard/js/ilContainer.js'); $this->tpl->setVariable('BODY_ATTRIBUTES', 'onload="ilDisableChilds(\'cmd\');"'); $table = new ilObjectCopySelectionTableGUI($this, 'showItemSelection', $this->getType(), $copy_page); diff --git a/components/ILIAS/Object/classes/class.ilObjectCopyProgressTableGUI.php b/components/ILIAS/Object/classes/class.ilObjectCopyProgressTableGUI.php index ae76f27db10e..8d2ed4e60a58 100644 --- a/components/ILIAS/Object/classes/class.ilObjectCopyProgressTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectCopyProgressTableGUI.php @@ -50,12 +50,12 @@ public function setRedirectionUrl(?string $url): void public function init(): void { - $this->main_tpl->addJavaScript('./Services/CopyWizard/js/ilCopyRedirection.js'); + $this->main_tpl->addJavaScript('./components/ILIAS/CopyWizard/js/ilCopyRedirection.js'); $this->main_tpl->addOnLoadCode('il.CopyRedirection.checkDone()'); $this->setExternalSorting(true); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); - $this->setRowTemplate('tpl.object_copy_progress_table_row.html', 'Services/Object'); + $this->setRowTemplate('tpl.object_copy_progress_table_row.html', 'components/ILIAS/Object'); $this->addColumn($this->lng->txt('obj_target_location')); $this->addColumn($this->lng->txt('obj_copy_progress')); diff --git a/components/ILIAS/Object/classes/class.ilObjectCopySearchResultTableGUI.php b/components/ILIAS/Object/classes/class.ilObjectCopySearchResultTableGUI.php index ea11e7f3b000..d71b2e92c8a8 100644 --- a/components/ILIAS/Object/classes/class.ilObjectCopySearchResultTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectCopySearchResultTableGUI.php @@ -56,7 +56,7 @@ public function __construct(?object $parent_class, string $parent_cmd, string $t $this->addColumn($this->lng->txt('search_title_description'), 'title', '99%'); $this->setEnableHeader(true); - $this->setRowTemplate("tpl.obj_copy_search_result_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_copy_search_result_row.html", "components/ILIAS/Object"); $this->setEnableTitle(true); $this->setEnableNumInfo(true); $this->setDefaultOrderField('title'); diff --git a/components/ILIAS/Object/classes/class.ilObjectCopySelectionTableGUI.php b/components/ILIAS/Object/classes/class.ilObjectCopySelectionTableGUI.php index 0bcce9c4e46b..5608cfbcd6f8 100644 --- a/components/ILIAS/Object/classes/class.ilObjectCopySelectionTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectCopySelectionTableGUI.php @@ -52,7 +52,7 @@ public function __construct(?object $parent_class, string $parent_cmd, string $t $this->addColumn($this->lng->txt('omit'), '', '15%'); $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); - $this->setRowTemplate("tpl.obj_copy_selection_row.html", "Services/Object"); + $this->setRowTemplate("tpl.obj_copy_selection_row.html", "components/ILIAS/Object"); $this->setEnableTitle(true); $this->setEnableNumInfo(true); $this->setLimit(999999); diff --git a/components/ILIAS/Object/classes/class.ilObjectDataSet.php b/components/ILIAS/Object/classes/class.ilObjectDataSet.php index 13774bef592f..20838303d8a2 100644 --- a/components/ILIAS/Object/classes/class.ilObjectDataSet.php +++ b/components/ILIAS/Object/classes/class.ilObjectDataSet.php @@ -372,12 +372,12 @@ public function getNewObjId(ilImportMapping $mapping, string $old_id): int /** @var ilObjectDefinition $objDefinition */ $objDefinition = $DIC["objDefinition"]; - $new_id = $mapping->getMapping('Services/Container', 'objs', $old_id); + $new_id = $mapping->getMapping('components/ILIAS/Container', 'objs', $old_id); if (!$new_id) { - $new_id = $mapping->getMapping('Services/Object', 'objs', $old_id); + $new_id = $mapping->getMapping('components/ILIAS/Object', 'objs', $old_id); } if (!$new_id) { - $new_id = $mapping->getMapping('Services/Object', 'obj', $old_id); + $new_id = $mapping->getMapping('components/ILIAS/Object', 'obj', $old_id); } if (!$new_id) { foreach ($mapping->getAllMappings() as $k => $m) { diff --git a/components/ILIAS/Object/classes/class.ilObjectGUI.php b/components/ILIAS/Object/classes/class.ilObjectGUI.php index fc948d16f665..b3a64c732e65 100644 --- a/components/ILIAS/Object/classes/class.ilObjectGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectGUI.php @@ -674,7 +674,7 @@ protected function getCreationFormsHTML(array $forms): string $acc->setBehaviour(ilAccordionGUI::FIRST_OPEN); $cnt = 1; foreach ($forms as $form_type => $cf) { - $htpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "Services/Object"); + $htpl = new ilTemplate("tpl.creation_acc_head.html", true, true, "components/ILIAS/Object"); // using custom form titles (used for repository plugins) $form_title = ""; diff --git a/components/ILIAS/Object/classes/class.ilObjectListGUI.php b/components/ILIAS/Object/classes/class.ilObjectListGUI.php index 1192a18b49f2..1d31a5d7f165 100644 --- a/components/ILIAS/Object/classes/class.ilObjectListGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectListGUI.php @@ -67,7 +67,7 @@ class ilObjectListGUI protected static bool $preload_done = false; protected static int $js_unique_id = 0; protected static string $tpl_file_name = 'tpl.container_list_item.html'; - protected static string $tpl_component = 'Services/Container'; + protected static string $tpl_component = 'components/ILIAS/Container'; private \ILIAS\Notes\Service $notes_service; protected bool $force_rate_parent = false; @@ -2318,7 +2318,7 @@ public function getHeaderAction(ilGlobalTemplateInterface $main_tpl = null): str $main_tpl = $this->main_tpl; } - $htpl = new ilTemplate('tpl.header_action.html', true, true, 'Services/Repository'); + $htpl = new ilTemplate('tpl.header_action.html', true, true, 'components/ILIAS/Repository'); $redraw_js = 'il.Object.redrawActionHeader();'; diff --git a/components/ILIAS/Object/classes/class.ilObjectMetaDataBlockGUI.php b/components/ILIAS/Object/classes/class.ilObjectMetaDataBlockGUI.php index 27f8693cfb49..d20e906304da 100644 --- a/components/ILIAS/Object/classes/class.ilObjectMetaDataBlockGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectMetaDataBlockGUI.php @@ -119,7 +119,7 @@ public function fillDataSection(): void */ protected function getLegacyContent(): string { - $btpl = new ilTemplate("tpl.advmd_block.html", true, true, "Services/Object"); + $btpl = new ilTemplate("tpl.advmd_block.html", true, true, "components/ILIAS/Object"); // see ilAdvancedMDRecordGUI::parseInfoPage() diff --git a/components/ILIAS/Object/classes/class.ilObjectOwnershipManagementTableGUI.php b/components/ILIAS/Object/classes/class.ilObjectOwnershipManagementTableGUI.php index 5b9c6bab6d15..ee2d90713d53 100644 --- a/components/ILIAS/Object/classes/class.ilObjectOwnershipManagementTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectOwnershipManagementTableGUI.php @@ -54,7 +54,7 @@ public function __construct(?object $parent_obj, string $parent_cmd, int $user_i $this->addColumn($this->lng->txt('action')); $this->setFormAction($this->ctrl->getFormAction($parent_obj, $parent_cmd)); - $this->setRowTemplate('tpl.obj_ownership_row.html', 'Services/Object'); + $this->setRowTemplate('tpl.obj_ownership_row.html', 'components/ILIAS/Object'); $this->setDisableFilterHiding(); $this->setDefaultOrderField('title'); diff --git a/components/ILIAS/Object/classes/class.ilObjectTableGUI.php b/components/ILIAS/Object/classes/class.ilObjectTableGUI.php index 2d0e2404799f..36d2ae922c2b 100644 --- a/components/ILIAS/Object/classes/class.ilObjectTableGUI.php +++ b/components/ILIAS/Object/classes/class.ilObjectTableGUI.php @@ -99,7 +99,7 @@ public function init(): void $this->addColumn($this->lng->txt('title'), 'title'); $this->setOrderColumn('title'); - $this->setRowTemplate('tpl.object_table_row.html', 'Services/Object'); + $this->setRowTemplate('tpl.object_table_row.html', 'components/ILIAS/Object'); } protected function fillRow(array $set): void diff --git a/components/ILIAS/Object/classes/class.ilSubItemListGUI.php b/components/ILIAS/Object/classes/class.ilSubItemListGUI.php index 563e2e18d187..0c66e2c9d953 100644 --- a/components/ILIAS/Object/classes/class.ilSubItemListGUI.php +++ b/components/ILIAS/Object/classes/class.ilSubItemListGUI.php @@ -124,7 +124,7 @@ public function getItemListGUI(): ?ilObjectListGUI public function init(ilObjectListGUI $item_list_gui, int $ref_id, array $subitem_ids): void { - $this->tpl = new ilTemplate('tpl.subitem_list.html', true, true, 'Services/Object'); + $this->tpl = new ilTemplate('tpl.subitem_list.html', true, true, 'components/ILIAS/Object'); $this->item_list_gui = $item_list_gui; $this->ref_id = $ref_id; $this->obj_id = ilObject::_lookupObjId($this->getRefId()); diff --git a/components/ILIAS/Object/test/ilServicesObjectSuite.php b/components/ILIAS/Object/test/ilServicesObjectSuite.php index 61d535e31f8c..199f95eacedf 100644 --- a/components/ILIAS/Object/test/ilServicesObjectSuite.php +++ b/components/ILIAS/Object/test/ilServicesObjectSuite.php @@ -26,7 +26,7 @@ public static function suite(): self { $suite = new ilServicesObjectSuite(); - include_once("./Services/Object/test/ilObjectTest.php"); + include_once("./components/ILIAS/Object/test/ilObjectTest.php"); $suite->addTestSuite("ilObjectTest"); return $suite; diff --git a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php index d18434aa5556..f3f71e2947fa 100644 --- a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php +++ b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php @@ -176,7 +176,7 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void $renderer = $DIC->ui()->renderer(); $factory = $DIC->ui()->factory(); - $chatWindowTemplate = new ilTemplate('tpl.chat-window.html', false, false, 'Services/OnScreenChat'); + $chatWindowTemplate = new ilTemplate('tpl.chat-window.html', false, false, 'components/ILIAS/OnScreenChat'); $chatWindowTemplate->setVariable('SUBMIT_ACTION', $renderer->render( $factory->button()->standard($DIC->language()->txt('chat_osc_send'), 'onscreenchat-submit') )); @@ -196,13 +196,13 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void 'tpl.chat-message.html', false, false, - 'Services/OnScreenChat' + 'components/ILIAS/OnScreenChat' ))->get(), 'modalTemplate' => (new ilTemplate( 'tpl.chat-add-user.html', false, false, - 'Services/OnScreenChat' + 'components/ILIAS/OnScreenChat' ))->get(), 'userId' => $DIC->user()->getId(), 'username' => $DIC->user()->getLogin(), @@ -290,14 +290,14 @@ public static function initializeFrontend(ilGlobalTemplateInterface $page): void $page->addJavaScript('./node_modules/jquery-outside-events/jquery.ba-outside-events.js'); $page->addJavaScript('./node_modules/@andxor/jquery-ui-touch-punch-fix/jquery.ui.touch-punch.js'); - $page->addJavascript('./Services/UIComponent/Modal/js/Modal.js'); + $page->addJavascript('./components/ILIAS/UIComponent/Modal/js/Modal.js'); $page->addJavascript('./node_modules/moment/min/moment-with-locales.min.js'); - $page->addJavascript('./Services/Notifications/js/browser_notifications.js'); - $page->addJavascript('./Services/OnScreenChat/js/onscreenchat-notifications.js'); - $page->addJavascript('./Services/OnScreenChat/js/moment.js'); + $page->addJavascript('./components/ILIAS/Notifications/js/browser_notifications.js'); + $page->addJavascript('./components/ILIAS/OnScreenChat/js/onscreenchat-notifications.js'); + $page->addJavascript('./components/ILIAS/OnScreenChat/js/moment.js'); $page->addJavascript('./components/ILIAS/Chatroom/chat/node_modules/socket.io-client/dist/socket.io.js'); - $page->addJavascript('./Services/OnScreenChat/js/chat.js'); - $page->addJavascript('./Services/OnScreenChat/js/onscreenchat.js'); + $page->addJavascript('./components/ILIAS/OnScreenChat/js/chat.js'); + $page->addJavascript('./components/ILIAS/OnScreenChat/js/onscreenchat.js'); $page->addOnLoadCode("il.Chat.setConfig(" . json_encode($chatConfig, JSON_THROW_ON_ERROR) . ");"); $page->addOnLoadCode("il.OnScreenChat.setConfig(" . json_encode($guiConfig, JSON_THROW_ON_ERROR) . ");"); $page->addOnLoadCode("il.OnScreenChat.init();"); diff --git a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatUserUserAutoComplete.php b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatUserUserAutoComplete.php index 72e3def6c0a5..b1297c3b9d3e 100644 --- a/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatUserUserAutoComplete.php +++ b/components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatUserUserAutoComplete.php @@ -18,7 +18,7 @@ declare(strict_types=1); -require_once 'Services/User/classes/class.ilUserAutoComplete.php'; +require_once 'components/ILIAS/User/classes/class.ilUserAutoComplete.php'; /** * Class ilOnScreenChatUserUserAutoComplete diff --git a/components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectAppEventListener.php b/components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectAppEventListener.php index 285f285bfd27..93f09f5a08ce 100644 --- a/components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectAppEventListener.php +++ b/components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectAppEventListener.php @@ -38,7 +38,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { global $DIC; $DIC->logger()->auth()->debug($a_component . ' : ' . $a_event); - if (($a_component === 'Services/Authentication') && $a_event === 'beforeLogout') { + if (($a_component === 'components/ILIAS/Authentication') && $a_event === 'beforeLogout') { $listener = new self(); $listener->handleLogoutFor($a_parameter['user_id']); } diff --git a/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php b/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php index 4d4577535406..86ef4e8bfa91 100644 --- a/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php +++ b/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php @@ -17,7 +17,7 @@ */ declare(strict_types=1); -require_once("./Services/Form/classes/class.ilFormPropertyGUI.php"); +require_once("./components/ILIAS/Form/classes/class.ilFormPropertyGUI.php"); /** * Class ilDclGenericMultiInputGUI diff --git a/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitDefaultPermissionTableGUI.php b/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitDefaultPermissionTableGUI.php index cea664a25eb1..4d2f6be92104 100644 --- a/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitDefaultPermissionTableGUI.php +++ b/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitDefaultPermissionTableGUI.php @@ -44,7 +44,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, ilOrgUni $this->dic() ->ui() ->mainTemplate() - ->addJavaScript('./Services/AccessControl/js/ilPermSelect.js'); + ->addJavaScript('./components/ILIAS/AccessControl/js/ilPermSelect.js'); $this->setTitle( $this->dic()->language()->txt('orgu_permission_settings_' diff --git a/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitPermissionTableGUI.php b/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitPermissionTableGUI.php index 3f74a8e9c3c0..39aaeb97ef3a 100644 --- a/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitPermissionTableGUI.php +++ b/components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitPermissionTableGUI.php @@ -45,7 +45,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd, int $a_r $this->setId('objpositionperm_' . $this->ref_id); - $tpl->addJavaScript('./Services/AccessControl/js/ilPermSelect.js'); + $tpl->addJavaScript('./components/ILIAS/AccessControl/js/ilPermSelect.js'); $this->setTitle($this->lng->txt('org_permission_settings')); $this->setEnableHeader(true); diff --git a/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php b/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php index 0e2fc7318f5f..d40b47a1e97e 100644 --- a/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php +++ b/components/ILIAS/OrgUnit/classes/Webservices/SOAP/Base.php @@ -19,7 +19,7 @@ namespace ILIAS\OrgUnit\Webservices\SOAP; require_once('./components/ILIAS/soap/classes/class.ilSoapAdministration.php'); -require_once('./Services/WebServices/SOAP/classes/class.ilSoapPluginException.php'); +require_once('./components/ILIAS/WebServices/SOAP/classes/class.ilSoapPluginException.php'); use ilOrgUnitSOAPServicesPlugin; use ilSoapAdministration; diff --git a/components/ILIAS/OrgUnit/classes/class.ilOrgUnitAppEventListener.php b/components/ILIAS/OrgUnit/classes/class.ilOrgUnitAppEventListener.php index 2ee1c151ab32..6192472f6c78 100644 --- a/components/ILIAS/OrgUnit/classes/class.ilOrgUnitAppEventListener.php +++ b/components/ILIAS/OrgUnit/classes/class.ilOrgUnitAppEventListener.php @@ -26,14 +26,14 @@ class ilOrgUnitAppEventListener /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { switch ($a_component) { - case 'Services/Tree': + case 'components/ILIAS/Tree': switch ($a_event) { case 'moveTree': $moved_ref_id = $a_parameter['source_id']; diff --git a/components/ILIAS/OrgUnit/classes/class.ilOrgUnitImporter.php b/components/ILIAS/OrgUnit/classes/class.ilOrgUnitImporter.php index 417cdb2dc637..be0d38b7f157 100644 --- a/components/ILIAS/OrgUnit/classes/class.ilOrgUnitImporter.php +++ b/components/ILIAS/OrgUnit/classes/class.ilOrgUnitImporter.php @@ -141,7 +141,7 @@ public function importXmlRepresentation( string $a_xml, ilImportMapping $a_mapping ): void { - $container_mappings = $a_mapping->getMappingsOfEntity("Services/Container", "objs"); + $container_mappings = $a_mapping->getMappingsOfEntity("components/ILIAS/Container", "objs"); foreach ($container_mappings as $old => $new) { if (ilObject2::_lookupType($new) === 'orgu') { $a_mapping->addMapping('components/ILIAS/OrgUnit', 'orgu', $old, $new); diff --git a/components/ILIAS/OrgUnit/exceptions/class.ilObjOrgUnitException.php b/components/ILIAS/OrgUnit/exceptions/class.ilObjOrgUnitException.php index f0d1810dad00..801b8464f078 100644 --- a/components/ILIAS/OrgUnit/exceptions/class.ilObjOrgUnitException.php +++ b/components/ILIAS/OrgUnit/exceptions/class.ilObjOrgUnitException.php @@ -1,6 +1,6 @@ setDefaultOrderDirection("asc"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.access_row.html", "Services/PersonalWorkspace"); + $this->setRowTemplate("tpl.access_row.html", "components/ILIAS/PersonalWorkspace"); $this->importData(); } diff --git a/components/ILIAS/PersonalWorkspace/classes/class.ilWorkspaceShareTableGUI.php b/components/ILIAS/PersonalWorkspace/classes/class.ilWorkspaceShareTableGUI.php index a2c4c680c980..370628d52a4e 100644 --- a/components/ILIAS/PersonalWorkspace/classes/class.ilWorkspaceShareTableGUI.php +++ b/components/ILIAS/PersonalWorkspace/classes/class.ilWorkspaceShareTableGUI.php @@ -98,7 +98,7 @@ public function __construct( $this->setDefaultOrderDirection("desc"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.shared_row.html", "Services/PersonalWorkspace"); + $this->setRowTemplate("tpl.shared_row.html", "components/ILIAS/PersonalWorkspace"); $this->setDisableFilterHiding(true); $this->setResetCommand("resetsharefilter", $this->lng->txt("wsp_shared_filter_reset_button")); diff --git a/components/ILIAS/PersonalWorkspace/test/ilServicesPersonalWorkspaceSuite.php b/components/ILIAS/PersonalWorkspace/test/ilServicesPersonalWorkspaceSuite.php index 333e9e40c551..f2d5d1fb5d3e 100644 --- a/components/ILIAS/PersonalWorkspace/test/ilServicesPersonalWorkspaceSuite.php +++ b/components/ILIAS/PersonalWorkspace/test/ilServicesPersonalWorkspaceSuite.php @@ -32,7 +32,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/PersonalWorkspace/test/PWspStandardGUIRequestTest.php"); + require_once("./components/ILIAS/PersonalWorkspace/test/PWspStandardGUIRequestTest.php"); $suite->addTestSuite("PWspStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/Poll/classes/class.ilPollDataSet.php b/components/ILIAS/Poll/classes/class.ilPollDataSet.php index a81210fe8105..7a1bc8e74fee 100644 --- a/components/ILIAS/Poll/classes/class.ilPollDataSet.php +++ b/components/ILIAS/Poll/classes/class.ilPollDataSet.php @@ -183,7 +183,7 @@ public function importRecord( switch ($a_entity) { case "poll": // container copy - if ($new_id = $a_mapping->getMapping("Services/Container", "objs", (string) ($a_rec["Id"] ?? "0"))) { + if ($new_id = $a_mapping->getMapping("components/ILIAS/Container", "objs", (string) ($a_rec["Id"] ?? "0"))) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); } else { $newObj = new ilObjPoll(); diff --git a/components/ILIAS/Portfolio/Export/PortfolioHtmlExport.php b/components/ILIAS/Portfolio/Export/PortfolioHtmlExport.php index a9efd8ce1b73..885df50b6868 100644 --- a/components/ILIAS/Portfolio/Export/PortfolioHtmlExport.php +++ b/components/ILIAS/Portfolio/Export/PortfolioHtmlExport.php @@ -34,7 +34,7 @@ class PortfolioHtmlExport protected string $sub_dir = ""; protected string $target_dir = ""; protected \ILIAS\GlobalScreen\Services $global_screen; - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; protected \ilCOPageHTMLExport $co_page_html_export; protected \ilLanguage $lng; protected array $tabs = []; @@ -76,7 +76,7 @@ protected function init(): void $this->sub_dir .= "print"; } $this->target_dir = $this->export_dir . "/" . $this->sub_dir; - $this->export_util = new \ILIAS\Services\Export\HTML\Util($this->export_dir, $this->sub_dir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($this->export_dir, $this->sub_dir); $this->co_page_html_export = new \ilCOPageHTMLExport($this->target_dir); } diff --git a/components/ILIAS/Portfolio/Export/class.ilPortfolioDataSet.php b/components/ILIAS/Portfolio/Export/class.ilPortfolioDataSet.php index fcd451e3302a..271bbd7fc6be 100644 --- a/components/ILIAS/Portfolio/Export/class.ilPortfolioDataSet.php +++ b/components/ILIAS/Portfolio/Export/class.ilPortfolioDataSet.php @@ -169,7 +169,7 @@ public function importRecord( case "prtt": // container copy - if ($new_id = $a_mapping->getMapping("Services/Container", "objs", $a_rec["Id"])) { + if ($new_id = $a_mapping->getMapping("components/ILIAS/Container", "objs", $a_rec["Id"])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjPortfolioTemplate(); @@ -196,7 +196,7 @@ public function importRecord( } $a_mapping->addMapping("components/ILIAS/Portfolio", "prtt", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); break; case "portfolio_page": @@ -209,7 +209,7 @@ public function importRecord( $newObj->setOrderNr($a_rec["OrderNr"]); $newObj->create(true); - $a_mapping->addMapping("Services/COPage", "pg", "prtt:" . $a_rec["Id"], "prtt:" . $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/COPage", "pg", "prtt:" . $a_rec["Id"], "prtt:" . $newObj->getId()); } break; } diff --git a/components/ILIAS/Portfolio/Export/class.ilPortfolioExporter.php b/components/ILIAS/Portfolio/Export/class.ilPortfolioExporter.php index 1a1c5329ad4b..b79b836df921 100644 --- a/components/ILIAS/Portfolio/Export/class.ilPortfolioExporter.php +++ b/components/ILIAS/Portfolio/Export/class.ilPortfolioExporter.php @@ -45,7 +45,7 @@ public function getXmlExportTailDependencies( $deps[] = array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids); @@ -54,14 +54,14 @@ public function getXmlExportTailDependencies( ? $a_ids : array($a_ids); $deps[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "object_style", "ids" => $obj_ids ); // common object properties $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ); diff --git a/components/ILIAS/Portfolio/Export/class.ilPortfolioImporter.php b/components/ILIAS/Portfolio/Export/class.ilPortfolioImporter.php index edc28115adc6..59b1a77adc2d 100644 --- a/components/ILIAS/Portfolio/Export/class.ilPortfolioImporter.php +++ b/components/ILIAS/Portfolio/Export/class.ilPortfolioImporter.php @@ -50,7 +50,7 @@ public function importXmlRepresentation( public function finalProcessing( ilImportMapping $a_mapping ): void { - $prttpg_map = $a_mapping->getMappingsOfEntity("Services/COPage", "pg"); + $prttpg_map = $a_mapping->getMappingsOfEntity("components/ILIAS/COPage", "pg"); foreach ($prttpg_map as $prttpg_id) { $prttpg_id = substr($prttpg_id, 5); $prtt_id = ilPortfolioTemplatePage::findPortfolioForPage($prttpg_id); diff --git a/components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php b/components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php index 887d60461d96..98d74f8678e4 100644 --- a/components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php +++ b/components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php @@ -658,7 +658,7 @@ protected function renderConsultationHours( $filter = new ilCalendarScheduleFilterBookings($user_id, $a_group_ids); $month_gui->addScheduleFilter($filter); - $this->tpl->addCss(ilUtil::getStyleSheetLocation('filesystem', 'delos.css', 'Services/Calendar')); + $this->tpl->addCss(ilUtil::getStyleSheetLocation('filesystem', 'delos.css', 'components/ILIAS/Calendar')); $this->lng->loadLanguageModule("dateplaner"); return '

' . $this->lng->txt("app_consultation_hours") . '

' . diff --git a/components/ILIAS/Portfolio/classes/class.ilPortfolioAppEventListener.php b/components/ILIAS/Portfolio/classes/class.ilPortfolioAppEventListener.php index 58ca07d6c1af..2ae3f6128d88 100644 --- a/components/ILIAS/Portfolio/classes/class.ilPortfolioAppEventListener.php +++ b/components/ILIAS/Portfolio/classes/class.ilPortfolioAppEventListener.php @@ -28,14 +28,14 @@ public static function handleEvent( array $parameter ): void { switch ($component) { - case "Services/Object": + case "components/ILIAS/Object": switch ($event) { case "beforeDeletion": self::beforeDeletion($parameter); break; } break; - case "Services/User": + case "components/ILIAS/User": switch ($event) { case "firstLogin": self::firstLogin($parameter); diff --git a/components/ILIAS/PrivacySecurity/classes/class.ilPrivacySettings.php b/components/ILIAS/PrivacySecurity/classes/class.ilPrivacySettings.php index 2007151554f0..df2821d3ce02 100644 --- a/components/ILIAS/PrivacySecurity/classes/class.ilPrivacySettings.php +++ b/components/ILIAS/PrivacySecurity/classes/class.ilPrivacySettings.php @@ -21,7 +21,7 @@ /** * Singleton class that stores all privacy settings * @author Stefan Meyer - * @ingroup Services/PrivacySecurity + * @ingroup components/ILIAS/PrivacySecurity */ class ilPrivacySettings { diff --git a/components/ILIAS/PrivacySecurity/classes/class.ilSecuritySettings.php b/components/ILIAS/PrivacySecurity/classes/class.ilSecuritySettings.php index 98d66019960c..94813429a48e 100644 --- a/components/ILIAS/PrivacySecurity/classes/class.ilSecuritySettings.php +++ b/components/ILIAS/PrivacySecurity/classes/class.ilSecuritySettings.php @@ -19,7 +19,7 @@ * Singleton class that stores all security settings * @author Roland Küstermann * @author Stefan Meyer - * @ingroup Services/PrivacySecurity + * @ingroup components/ILIAS/PrivacySecurity */ class ilSecuritySettings { diff --git a/components/ILIAS/PrivacySecurity/test/ilServicesPrivacySecuritySuite.php b/components/ILIAS/PrivacySecurity/test/ilServicesPrivacySecuritySuite.php index 14be6fc959e2..e5877a5e2227 100644 --- a/components/ILIAS/PrivacySecurity/test/ilServicesPrivacySecuritySuite.php +++ b/components/ILIAS/PrivacySecurity/test/ilServicesPrivacySecuritySuite.php @@ -12,7 +12,7 @@ public static function suite(): ilServicesPrivacySecuritySuite { $suite = new ilServicesPrivacySecuritySuite(); - include_once("./Services/PrivacySecurity/test/ilPrivacySettingsTest.php"); + include_once("./components/ILIAS/PrivacySecurity/test/ilPrivacySettingsTest.php"); $suite->addTestSuite(ilPrivacySettingsTest::class); return $suite; } diff --git a/components/ILIAS/RTE/classes/class.ilRTEGlobalTemplate.php b/components/ILIAS/RTE/classes/class.ilRTEGlobalTemplate.php index 45328fdeec59..8c09361c3ad6 100644 --- a/components/ILIAS/RTE/classes/class.ilRTEGlobalTemplate.php +++ b/components/ILIAS/RTE/classes/class.ilRTEGlobalTemplate.php @@ -35,19 +35,19 @@ class ilRTEGlobalTemplate implements ilGlobalTemplateInterface * List of JS-Files that should be included. * @var array */ - protected array $js_files = [0 => './Services/JavaScript/js/Basic.js']; + protected array $js_files = [0 => './components/ILIAS/JavaScript/js/Basic.js']; /** * Stores if a version parameter should be appended to the js-file to force reloading. * @var array */ - protected array $js_files_vp = ['./Services/JavaScript/js/Basic.js' => true]; + protected array $js_files_vp = ['./components/ILIAS/JavaScript/js/Basic.js' => true]; /** * Stores the order in which js-files should be included. * @var array */ - protected array $js_files_batch = ['./Services/JavaScript/js/Basic.js' => 1]; + protected array $js_files_batch = ['./components/ILIAS/JavaScript/js/Basic.js' => 1]; public function __construct( string $file, @@ -84,7 +84,7 @@ public function addJavaScript(string $a_js_file, bool $a_add_version_parameter = // ensure jquery files being loaded first if ( - is_int(strpos($a_js_file, 'Services/jQuery')) || + is_int(strpos($a_js_file, 'components/ILIAS/jQuery')) || is_int(strpos($a_js_file, '/jquery.js')) || is_int(strpos($a_js_file, '/jquery-min.js')) ) { diff --git a/components/ILIAS/RTE/classes/class.ilTinyMCE.php b/components/ILIAS/RTE/classes/class.ilTinyMCE.php index ec16b1f06f93..271509f49765 100644 --- a/components/ILIAS/RTE/classes/class.ilTinyMCE.php +++ b/components/ILIAS/RTE/classes/class.ilTinyMCE.php @@ -180,7 +180,7 @@ public function addRTESupport( ($cfg_template ?? "tpl.tinymce.js"), true, true, - "Services/RTE" + "components/ILIAS/RTE" ); $this->handleImgContextMenuItem($tpl); $tags = ilObjAdvancedEditing::_getUsedHTMLTags($a_module); @@ -270,7 +270,7 @@ public function addCustomRTESupport(int $obj_id, string $obj_type, array $tags): { $this->handleImagePluginsBeforeRendering($tags); - $tpl = new ilTemplate('tpl.tinymce.js', true, true, 'Services/RTE'); + $tpl = new ilTemplate('tpl.tinymce.js', true, true, 'components/ILIAS/RTE'); $this->handleImgContextMenuItem($tpl); $tpl->setCurrentBlock('tinymce'); @@ -317,7 +317,7 @@ public function addUserTextEditor(string $editor_selector): void $validtags = ["strong", "em", "p", "br", "div", "span"]; $buttontags = ['strong', 'em']; - $template = new ilTemplate('tpl.usereditor.js', true, true, 'Services/RTE'); + $template = new ilTemplate('tpl.usereditor.js', true, true, 'components/ILIAS/RTE'); $this->handleImgContextMenuItem($template); $template->setCurrentBlock('tinymce'); diff --git a/components/ILIAS/RTE/test/ilTinyMCETest.php b/components/ILIAS/RTE/test/ilTinyMCETest.php index f0dd008f00df..8642d5e8cd0f 100644 --- a/components/ILIAS/RTE/test/ilTinyMCETest.php +++ b/components/ILIAS/RTE/test/ilTinyMCETest.php @@ -36,8 +36,8 @@ public function testAddPlugin(): void public function testTiny3xCodeHasbeenRemoved(): void { - $this->assertDirectoryDoesNotExist('./Services/RTE/tiny_mce_3_4_7'); - $this->assertDirectoryDoesNotExist('./Services/RTE/tiny_mce_3_5_11'); + $this->assertDirectoryDoesNotExist('./components/ILIAS/RTE/tiny_mce_3_4_7'); + $this->assertDirectoryDoesNotExist('./components/ILIAS/RTE/tiny_mce_3_5_11'); } public function testRemovePlugin(): void diff --git a/components/ILIAS/Rating/classes/class.ilRatingCategoryTableGUI.php b/components/ILIAS/Rating/classes/class.ilRatingCategoryTableGUI.php index a3ffee1800fd..242daab04a08 100644 --- a/components/ILIAS/Rating/classes/class.ilRatingCategoryTableGUI.php +++ b/components/ILIAS/Rating/classes/class.ilRatingCategoryTableGUI.php @@ -46,7 +46,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj, $a_parent_cmd)); - $this->setRowTemplate("tpl.rating_category_row.html", "Services/Rating"); + $this->setRowTemplate("tpl.rating_category_row.html", "components/ILIAS/Rating"); $this->addCommandButton("updateorder", $lng->txt("rating_update_positions")); diff --git a/components/ILIAS/Rating/classes/class.ilRatingDataSet.php b/components/ILIAS/Rating/classes/class.ilRatingDataSet.php index 7becec8ac8ae..c240ae2a7ddf 100644 --- a/components/ILIAS/Rating/classes/class.ilRatingDataSet.php +++ b/components/ILIAS/Rating/classes/class.ilRatingDataSet.php @@ -99,7 +99,7 @@ public function importRecord( ): void { switch ($a_entity) { case "rating_category": - if ($parent_id = $a_mapping->getMapping('Services/Rating', 'rating_category_parent_id', $a_rec['ParentId'])) { + if ($parent_id = $a_mapping->getMapping('components/ILIAS/Rating', 'rating_category_parent_id', $a_rec['ParentId'])) { $newObj = new ilRatingCategory(); $newObj->setParentId($parent_id); $newObj->save(); diff --git a/components/ILIAS/Rating/classes/class.ilRatingGUI.php b/components/ILIAS/Rating/classes/class.ilRatingGUI.php index b9e963c6d446..149482fec0e8 100644 --- a/components/ILIAS/Rating/classes/class.ilRatingGUI.php +++ b/components/ILIAS/Rating/classes/class.ilRatingGUI.php @@ -160,7 +160,7 @@ protected function renderDetails( $lng = $this->lng; $ilCtrl = $this->ctrl; - $ttpl = new ilTemplate("tpl.rating_details.html", true, true, "Services/Rating"); + $ttpl = new ilTemplate("tpl.rating_details.html", true, true, "components/ILIAS/Rating"); $rate_text = null; if ($this->getYourRatingText() != "#") { @@ -466,7 +466,7 @@ public function getHTML( $has_overlay = true; } - $ttpl = new ilTemplate("tpl.rating_input.html", true, true, "Services/Rating"); + $ttpl = new ilTemplate("tpl.rating_input.html", true, true, "components/ILIAS/Rating"); // user rating $user_rating = 0; diff --git a/components/ILIAS/Rating/test/ilServicesRatingSuite.php b/components/ILIAS/Rating/test/ilServicesRatingSuite.php index 792634a83526..ab1c5470b525 100644 --- a/components/ILIAS/Rating/test/ilServicesRatingSuite.php +++ b/components/ILIAS/Rating/test/ilServicesRatingSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Rating/test/RatingCategoryTest.php"); + require_once("./components/ILIAS/Rating/test/RatingCategoryTest.php"); $suite->addTestSuite("RatingCategoryTest"); return $suite; diff --git a/components/ILIAS/Registration/classes/class.ilAccountRegistrationGUI.php b/components/ILIAS/Registration/classes/class.ilAccountRegistrationGUI.php index 44211f4ed0c4..6b68707bec72 100644 --- a/components/ILIAS/Registration/classes/class.ilAccountRegistrationGUI.php +++ b/components/ILIAS/Registration/classes/class.ilAccountRegistrationGUI.php @@ -100,7 +100,7 @@ public function executeCommand(): void public function displayForm(): ilGlobalTemplateInterface { - $tpl = ilStartUpGUI::initStartUpTemplate(['tpl.usr_registration.html', 'Services/Registration'], true); + $tpl = ilStartUpGUI::initStartUpTemplate(['tpl.usr_registration.html', 'components/ILIAS/Registration'], true); $tpl->setVariable('TXT_PAGEHEADLINE', $this->lng->txt('registration')); if (!$this->form) { @@ -601,7 +601,7 @@ protected function distributeMails(string $password): void public function login(): ilGlobalTemplateInterface { - $tpl = ilStartUpGUI::initStartUpTemplate(['tpl.usr_registered.html', 'Services/Registration'], false); + $tpl = ilStartUpGUI::initStartUpTemplate(['tpl.usr_registered.html', 'components/ILIAS/Registration'], false); $this->tpl->setVariable('TXT_PAGEHEADLINE', $this->lng->txt('registration')); $tpl->setVariable("TXT_WELCOME", $this->lng->txt("welcome") . ", " . $this->userObj->getTitle() . "!"); diff --git a/components/ILIAS/Registration/classes/class.ilRegistrationCodesTableGUI.php b/components/ILIAS/Registration/classes/class.ilRegistrationCodesTableGUI.php index 85c34209c1f1..f568776038ce 100644 --- a/components/ILIAS/Registration/classes/class.ilRegistrationCodesTableGUI.php +++ b/components/ILIAS/Registration/classes/class.ilRegistrationCodesTableGUI.php @@ -59,7 +59,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd) $this->setExternalSegmentation(true); $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($this->parent_obj, "listCodes")); - $this->setRowTemplate("tpl.code_list_row.html", "Services/Registration"); + $this->setRowTemplate("tpl.code_list_row.html", "components/ILIAS/Registration"); $this->setEnableTitle(true); $this->initFilter(); $this->setFilterCommand("applyCodesFilter"); diff --git a/components/ILIAS/Registration/classes/class.ilRegistrationSettingsGUI.php b/components/ILIAS/Registration/classes/class.ilRegistrationSettingsGUI.php index 7e4805df693c..7868bf18f430 100644 --- a/components/ILIAS/Registration/classes/class.ilRegistrationSettingsGUI.php +++ b/components/ILIAS/Registration/classes/class.ilRegistrationSettingsGUI.php @@ -619,7 +619,7 @@ public function saveRoleAccessLimitations(): bool */ private function parseRoleList(array $roles, string $url): string { - $tpl = new ilTemplate('tpl.registration_roles.html', true, true, 'Services/Registration'); + $tpl = new ilTemplate('tpl.registration_roles.html', true, true, 'components/ILIAS/Registration'); $tpl->setVariable("EDIT", $this->lng->txt("edit")); $tpl->setVariable("LINK_EDIT", $url); diff --git a/components/ILIAS/Registration/test/ilServicesRegistrationSuite.php b/components/ILIAS/Registration/test/ilServicesRegistrationSuite.php index bed7fd0f0a62..442f659fd360 100644 --- a/components/ILIAS/Registration/test/ilServicesRegistrationSuite.php +++ b/components/ILIAS/Registration/test/ilServicesRegistrationSuite.php @@ -21,7 +21,7 @@ class ilServicesRegistrationSuite extends TestSuite public static function suite(): self { $suite = new self(); - include_once("./Services/Registration/test/ilRegistrationSettingsTest.php"); + include_once("./components/ILIAS/Registration/test/ilRegistrationSettingsTest.php"); $suite->addTestSuite(ilRegistrationSettingsTest::class); return $suite; } diff --git a/components/ILIAS/Repository/Administration/class.ilAdminSubItemsTableGUI.php b/components/ILIAS/Repository/Administration/class.ilAdminSubItemsTableGUI.php index 3c698171cd77..1b5caba1094e 100644 --- a/components/ILIAS/Repository/Administration/class.ilAdminSubItemsTableGUI.php +++ b/components/ILIAS/Repository/Administration/class.ilAdminSubItemsTableGUI.php @@ -70,7 +70,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.admin_sub_items_row.html", "Services/Repository"); + $this->setRowTemplate("tpl.admin_sub_items_row.html", "components/ILIAS/Repository"); //$this->disable("footer"); $this->setEnableTitle(true); $this->setDefaultOrderField("title"); diff --git a/components/ILIAS/Repository/Administration/class.ilModulesTableGUI.php b/components/ILIAS/Repository/Administration/class.ilModulesTableGUI.php index 631eb5f9585e..a60aef394b18 100644 --- a/components/ILIAS/Repository/Administration/class.ilModulesTableGUI.php +++ b/components/ILIAS/Repository/Administration/class.ilModulesTableGUI.php @@ -65,7 +65,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.table_row_module.html", - "Services/Repository/Administration" + "components/ILIAS/Repository/Administration" ); $this->setLimit(10000); $this->setExternalSorting(true); diff --git a/components/ILIAS/Repository/Administration/class.ilNewItemGroupTableGUI.php b/components/ILIAS/Repository/Administration/class.ilNewItemGroupTableGUI.php index a8e6c74bfda9..d12c158b2713 100644 --- a/components/ILIAS/Repository/Administration/class.ilNewItemGroupTableGUI.php +++ b/components/ILIAS/Repository/Administration/class.ilNewItemGroupTableGUI.php @@ -65,7 +65,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.table_row_new_item_group.html", "Services/Repository/Administration"); + $this->setRowTemplate("tpl.table_row_new_item_group.html", "components/ILIAS/Repository/Administration"); $this->setLimit(10000); $this->setExternalSorting(true); diff --git a/components/ILIAS/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php b/components/ILIAS/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php index 8587bf8f0ea0..90f826922aca 100644 --- a/components/ILIAS/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php +++ b/components/ILIAS/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php @@ -18,7 +18,7 @@ declare(strict_types=1); -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; class ilDashboardRecommendedContentGUI extends ilDashboardBlockGUI { diff --git a/components/ILIAS/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleTableGUI.php b/components/ILIAS/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleTableGUI.php index c1a3a69a6383..2000d1f1c987 100644 --- a/components/ILIAS/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleTableGUI.php +++ b/components/ILIAS/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleTableGUI.php @@ -56,7 +56,7 @@ public function __construct( $this->setRowTemplate( "tpl.rec_content_list_role.html", - "Services/Repository/RecommendedContent" + "components/ILIAS/Repository/RecommendedContent" ); $this->setDefaultOrderField('title'); diff --git a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php index 70bdb891b112..03c3f062dad7 100644 --- a/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php +++ b/components/ILIAS/Repository/Service/Form/class.FormAdapterGUI.php @@ -107,7 +107,7 @@ public static function initJavascript(): void $r = $DIC->ui()->renderer(); if (!self::$initialised) { $main_tpl = $DIC->ui()->mainTemplate(); - $main_tpl->addJavaScript("./Services/Repository/js/repository.js"); + $main_tpl->addJavaScript("./components/ILIAS/Repository/js/repository.js"); $main_tpl->addOnLoadCode(self::getOnLoadCode()); // render dummy components to load the necessary .js needed for async processing diff --git a/components/ILIAS/Repository/Trash/class.ilRepDependenciesTableGUI.php b/components/ILIAS/Repository/Trash/class.ilRepDependenciesTableGUI.php index 574e87bef3b5..bcc8c08c3021 100644 --- a/components/ILIAS/Repository/Trash/class.ilRepDependenciesTableGUI.php +++ b/components/ILIAS/Repository/Trash/class.ilRepDependenciesTableGUI.php @@ -50,7 +50,7 @@ public function __construct(array $a_deps) //$this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); $this->setRowTemplate( "tpl.rep_dep_row.html", - "Services/Repository/Trash" + "components/ILIAS/Repository/Trash" ); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Repository/Trash/class.ilRepUtil.php b/components/ILIAS/Repository/Trash/class.ilRepUtil.php index b34324809715..0e2d6a2831d1 100644 --- a/components/ILIAS/Repository/Trash/class.ilRepUtil.php +++ b/components/ILIAS/Repository/Trash/class.ilRepUtil.php @@ -152,7 +152,7 @@ public static function deleteObjects( // send global events foreach ($affected_ids as $aid) { $ilAppEventHandler->raise( - "Services/Object", + "components/ILIAS/Object", "toTrash", [ "obj_id" => ilObject::_lookupObjId($aid), @@ -276,7 +276,7 @@ public static function removeObjectsFromSystem( // send global events foreach ($affected_ids as $aid) { $ilAppEventHandler->raise( - "Services/Object", + "components/ILIAS/Object", "delete", [ "obj_id" => $aid["obj_id"], @@ -423,7 +423,7 @@ public static function restoreObjects( foreach ($affected_ids as $id) { // send global event $ilAppEventHandler->raise( - "Services/Object", + "components/ILIAS/Object", "undelete", ["obj_id" => ilObject::_lookupObjId($id), "ref_id" => $id] ); diff --git a/components/ILIAS/Repository/Trash/class.ilRepositoryTrashGUI.php b/components/ILIAS/Repository/Trash/class.ilRepositoryTrashGUI.php index 723a1a351242..3c78a63d78e2 100644 --- a/components/ILIAS/Repository/Trash/class.ilRepositoryTrashGUI.php +++ b/components/ILIAS/Repository/Trash/class.ilRepositoryTrashGUI.php @@ -283,7 +283,7 @@ public function handleMultiReferences( // render - $tpl = new ilTemplate("tpl.rep_multi_ref.html", true, true, "Services/Repository/Trash"); + $tpl = new ilTemplate("tpl.rep_multi_ref.html", true, true, "components/ILIAS/Repository/Trash"); $tpl->setVariable("TXT_INTRO", $lng->txt("rep_multiple_reference_deletion_intro")); diff --git a/components/ILIAS/Repository/Trash/class.ilTrashTableGUI.php b/components/ILIAS/Repository/Trash/class.ilTrashTableGUI.php index 08018f43e428..89420b06614b 100644 --- a/components/ILIAS/Repository/Trash/class.ilTrashTableGUI.php +++ b/components/ILIAS/Repository/Trash/class.ilTrashTableGUI.php @@ -78,7 +78,7 @@ public function init(): void $this->setRowTemplate( 'tpl.trash_list_row.html', - 'Services/Repository/Trash' + 'components/ILIAS/Repository/Trash' ); $this->setSelectAllCheckbox('trash_id'); diff --git a/components/ILIAS/Repository/classes/class.ilRepositoryAppEventListener.php b/components/ILIAS/Repository/classes/class.ilRepositoryAppEventListener.php index d6b21c844c7f..d7ddcfa4c286 100644 --- a/components/ILIAS/Repository/classes/class.ilRepositoryAppEventListener.php +++ b/components/ILIAS/Repository/classes/class.ilRepositoryAppEventListener.php @@ -31,7 +31,7 @@ class ilRepositoryAppEventListener implements ilAppEventListener public static function handleEvent(string $a_component, string $a_event, array $a_parameter): void { switch ($a_component) { - case "Services/Object": + case "components/ILIAS/Object": switch ($a_event) { case "deleteReference": // remove recommended content diff --git a/components/ILIAS/Repository/test/ilServicesRepositorySuite.php b/components/ILIAS/Repository/test/ilServicesRepositorySuite.php index b979a929536e..a7eda42bc4a6 100644 --- a/components/ILIAS/Repository/test/ilServicesRepositorySuite.php +++ b/components/ILIAS/Repository/test/ilServicesRepositorySuite.php @@ -31,10 +31,10 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Repository/test/ClipboardSessionRepositoryTest.php"); + require_once("./components/ILIAS/Repository/test/ClipboardSessionRepositoryTest.php"); $suite->addTestSuite("ClipboardSessionRepositoryTest"); - require_once("./Services/Repository/test/LastVisited/NavigationSessionRepositoryTest.php"); + require_once("./components/ILIAS/Repository/test/LastVisited/NavigationSessionRepositoryTest.php"); $suite->addTestSuite("NavigationSessionRepositoryTest"); return $suite; diff --git a/components/ILIAS/ResourceStorage/MIGRATIONS.md b/components/ILIAS/ResourceStorage_/MIGRATIONS.md similarity index 100% rename from components/ILIAS/ResourceStorage/MIGRATIONS.md rename to components/ILIAS/ResourceStorage_/MIGRATIONS.md diff --git a/components/ILIAS/ResourceStorage/ROADMAP.md b/components/ILIAS/ResourceStorage_/ROADMAP.md similarity index 100% rename from components/ILIAS/ResourceStorage/ROADMAP.md rename to components/ILIAS/ResourceStorage_/ROADMAP.md diff --git a/components/ILIAS/ResourceStorage/artifacts/flavour_data.php b/components/ILIAS/ResourceStorage_/artifacts/flavour_data.php similarity index 95% rename from components/ILIAS/ResourceStorage/artifacts/flavour_data.php rename to components/ILIAS/ResourceStorage_/artifacts/flavour_data.php index d167771c1963..f2e657b31559 100644 --- a/components/ILIAS/ResourceStorage/artifacts/flavour_data.php +++ b/components/ILIAS/ResourceStorage_/artifacts/flavour_data.php @@ -20,7 +20,7 @@ 'b9b2f16325492412304989a9b3e32479e612957582f60ed667af31e7b36e50ed' => 'FirstPageToTileImageFlavourDefinition', '5ae5cfe34279f9edfade75fdec92ad55757dfe4fc99722a32dc53cc3d7c72fe4' => 'ILIAS\\Object\\Properties\\CoreProperties\\TileImage\\ilObjectTileImageFlavourDefinition', '0fca4b6cf274bd4aac78caef9494f6f19e67366118548d5556f89fda5f683826' => 'ILIAS\\ResourceStorage\\Flavour\\Definition\\CropToRectangle', - 'irc_preview' => 'ILIAS\\Services\\ResourceStorage\\Collections\\View\\PreviewDefinition', + 'irc_preview' => 'ILIAS\\components\\ResourceStorage_\\Collections\\View\\PreviewDefinition', '90ffcb9513daf30de2f5b5de82d7edee162f5dbc9fd16713810cf75326849dc2' => 'ilUserProfilePictureDefinition', ), ); \ No newline at end of file diff --git a/components/ILIAS/ResourceStorage/classes/BinToHexSerializer.php b/components/ILIAS/ResourceStorage_/classes/BinToHexSerializer.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/BinToHexSerializer.php rename to components/ILIAS/ResourceStorage_/classes/BinToHexSerializer.php index 499fed814896..dd4dbb229cca 100644 --- a/components/ILIAS/ResourceStorage/classes/BinToHexSerializer.php +++ b/components/ILIAS/ResourceStorage_/classes/BinToHexSerializer.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage; +namespace ILIAS\components\ResourceStorage_; trait BinToHexSerializer { diff --git a/components/ILIAS/ResourceStorage/classes/CollectionDBRepository.php b/components/ILIAS/ResourceStorage_/classes/CollectionDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/CollectionDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/CollectionDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/Collections/DataProvider/TableDataProvider.php b/components/ILIAS/ResourceStorage_/classes/Collections/DataProvider/TableDataProvider.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Collections/DataProvider/TableDataProvider.php rename to components/ILIAS/ResourceStorage_/classes/Collections/DataProvider/TableDataProvider.php index dfe8a036a073..3ec35479791d 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/DataProvider/TableDataProvider.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/DataProvider/TableDataProvider.php @@ -18,10 +18,10 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\DataProvider; +namespace ILIAS\components\ResourceStorage_\Collections\DataProvider; use ILIAS\ResourceStorage\Identification\ResourceIdentification; -use ILIAS\Services\ResourceStorage\Collections\View\Request; +use ILIAS\components\ResourceStorage_\Collections\View\Request; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/ActionBuilder.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/ActionBuilder.php similarity index 97% rename from components/ILIAS/ResourceStorage/classes/Collections/View/ActionBuilder.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/ActionBuilder.php index bcf78e357dc8..cd339611c2d3 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/ActionBuilder.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/ActionBuilder.php @@ -18,13 +18,13 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; use ILIAS\Data\URI; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\UI\Component\Signal; -use ILIAS\Services\ResourceStorage\BinToHexSerializer; +use ILIAS\components\ResourceStorage_\BinToHexSerializer; use ILIAS\ResourceStorage\Services; use ILIAS\UI\Component\Modal\Modal; use ILIAS\UI\URLBuilder; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/Configuration.php similarity index 96% rename from components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/Configuration.php index 7d9d562819b6..69981f097de4 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/Configuration.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/Configuration.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\ResourceStorage\Collection\ResourceCollection; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Formatter.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/Formatter.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Collections/View/Formatter.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/Formatter.php index ca7f5c6aae99..3747c0465da2 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/Formatter.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/Formatter.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\Data\DataSize; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Mode.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/Mode.php similarity index 92% rename from components/ILIAS/ResourceStorage/classes/Collections/View/Mode.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/Mode.php index 379898c04477..b5bec457e95e 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/Mode.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/Mode.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/PreviewDefinition.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/PreviewDefinition.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Collections/View/PreviewDefinition.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/PreviewDefinition.php index 6f8d05a30ab1..2550f560151f 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/PreviewDefinition.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/PreviewDefinition.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\ResourceStorage\Flavour\Definition\PagesToExtract; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RIDHelper.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RIDHelper.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RIDHelper.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RIDHelper.php index fba836598596..06218b5faff1 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RIDHelper.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RIDHelper.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Information\Information; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/Request.php similarity index 98% rename from components/ILIAS/ResourceStorage/classes/Collections/View/Request.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/Request.php index f81cf7a4205a..8da4bd832f0e 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/Request.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/Request.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\ResourceStorage\Collection\ResourceCollection; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToComponents.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToComponents.php similarity index 88% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RequestToComponents.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToComponents.php index b17e8c91ed18..f97ebbe4cf9e 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToComponents.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToComponents.php @@ -18,10 +18,10 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; use ILIAS\HTTP\Services; /** diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDataTable.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDataTable.php similarity index 95% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDataTable.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDataTable.php index 668e6bd3ec3c..312627b496b0 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDataTable.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDataTable.php @@ -18,14 +18,14 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\DataTableDataProviderAdapter; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\DataTableDataProviderAdapter; use ILIAS\Data\Range; use ILIAS\HTTP\Services; -use ILIAS\Services\ResourceStorage\BinToHexSerializer; +use ILIAS\components\ResourceStorage_\BinToHexSerializer; use ILIAS\Data\Order; use ILIAS\UI\Component\Table\DataRowBuilder; use ILIAS\UI\Component\Table\DataRetrieval; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDeckOfCards.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDeckOfCards.php similarity index 90% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDeckOfCards.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDeckOfCards.php index c0629e533b11..da075162db49 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToDeckOfCards.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToDeckOfCards.php @@ -18,13 +18,13 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\DataTableDataProviderAdapter; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\DataTableDataProviderAdapter; use ILIAS\HTTP\Services; -use ILIAS\Services\ResourceStorage\Resources\UI\RevisionToComponent; +use ILIAS\components\ResourceStorage_\Resources\UI\RevisionToComponent; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToItems.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToItems.php similarity index 88% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RequestToItems.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToItems.php index 9276f74dcd31..22f8a494f1e8 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToItems.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToItems.php @@ -18,13 +18,13 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\DataTableDataProviderAdapter; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\DataTableDataProviderAdapter; use ILIAS\HTTP\Services; -use ILIAS\Services\ResourceStorage\Resources\UI\RevisionToComponent; +use ILIAS\components\ResourceStorage_\Resources\UI\RevisionToComponent; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToPresentationTable.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToPresentationTable.php similarity index 88% rename from components/ILIAS/ResourceStorage/classes/Collections/View/RequestToPresentationTable.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToPresentationTable.php index 9bc33163c1ea..e4113f19fca5 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/RequestToPresentationTable.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/RequestToPresentationTable.php @@ -18,13 +18,13 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\DataTableDataProviderAdapter; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\DataTableDataProviderAdapter; use ILIAS\HTTP\Services; -use ILIAS\Services\ResourceStorage\Resources\UI\RevisionToComponent; +use ILIAS\components\ResourceStorage_\Resources\UI\RevisionToComponent; use ILIAS\UI\Component\Table\PresentationRow; use ILIAS\ResourceStorage\Identification\ResourceIdentification; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/UploadBuilder.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/UploadBuilder.php similarity index 96% rename from components/ILIAS/ResourceStorage/classes/Collections/View/UploadBuilder.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/UploadBuilder.php index 30f286ef8e53..c0b355ff0f47 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/UploadBuilder.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/UploadBuilder.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; use ILIAS\UI\Component\Dropzone\File\File; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/ViewControlBuilder.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/ViewControlBuilder.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Collections/View/ViewControlBuilder.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/ViewControlBuilder.php index 04f95874946e..71ba5d1c6507 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/ViewControlBuilder.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/ViewControlBuilder.php @@ -18,10 +18,10 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; use ILIAS\UI\Component\ViewControl\Pagination; use ILIAS\UI\Component\ViewControl\Sortation; diff --git a/components/ILIAS/ResourceStorage/classes/Collections/View/ViewFactory.php b/components/ILIAS/ResourceStorage_/classes/Collections/View/ViewFactory.php similarity index 92% rename from components/ILIAS/ResourceStorage/classes/Collections/View/ViewFactory.php rename to components/ILIAS/ResourceStorage_/classes/Collections/View/ViewFactory.php index 8fa7c6ef095d..69f4157b1264 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/View/ViewFactory.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/View/ViewFactory.php @@ -18,11 +18,11 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Collections\View; +namespace ILIAS\components\ResourceStorage_\Collections\View; use ILIAS\UI\Factory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\DataTableDataProviderAdapter; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\DataTableDataProviderAdapter; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php b/components/ILIAS/ResourceStorage_/classes/Collections/class.ilResourceCollectionGUI.php similarity index 95% rename from components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php rename to components/ILIAS/ResourceStorage_/classes/Collections/class.ilResourceCollectionGUI.php index cf72f9184187..0c19d9d22768 100644 --- a/components/ILIAS/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php +++ b/components/ILIAS/ResourceStorage_/classes/Collections/class.ilResourceCollectionGUI.php @@ -21,15 +21,15 @@ use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\UI\Component\Input\Field\UploadHandler; use ILIAS\FileUpload\Handler\FileInfoResult; -use ILIAS\Services\ResourceStorage\Collections\View\Configuration; -use ILIAS\Services\ResourceStorage\Collections\View\Request; -use ILIAS\Services\ResourceStorage\Collections\View\ViewFactory; -use ILIAS\Services\ResourceStorage\Collections\DataProvider\TableDataProvider; -use ILIAS\Services\ResourceStorage\BinToHexSerializer; -use ILIAS\Services\ResourceStorage\Collections\View\ActionBuilder; -use ILIAS\Services\ResourceStorage\Collections\View\ViewControlBuilder; -use ILIAS\Services\ResourceStorage\Collections\View\UploadBuilder; -use ILIAS\Services\ResourceStorage\Collections\View\PreviewDefinition; +use ILIAS\components\ResourceStorage_\Collections\View\Configuration; +use ILIAS\components\ResourceStorage_\Collections\View\Request; +use ILIAS\components\ResourceStorage_\Collections\View\ViewFactory; +use ILIAS\components\ResourceStorage_\Collections\DataProvider\TableDataProvider; +use ILIAS\components\ResourceStorage_\BinToHexSerializer; +use ILIAS\components\ResourceStorage_\Collections\View\ActionBuilder; +use ILIAS\components\ResourceStorage_\Collections\View\ViewControlBuilder; +use ILIAS\components\ResourceStorage_\Collections\View\UploadBuilder; +use ILIAS\components\ResourceStorage_\Collections\View\PreviewDefinition; use ILIAS\Filesystem\Util\Archive\UnzipOptions; use ILIAS\Refinery\ConstraintViolationException; diff --git a/components/ILIAS/ResourceStorage/classes/DBRepositoryPreloader.php b/components/ILIAS/ResourceStorage_/classes/DBRepositoryPreloader.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/DBRepositoryPreloader.php rename to components/ILIAS/ResourceStorage_/classes/DBRepositoryPreloader.php diff --git a/components/ILIAS/ResourceStorage/classes/FlavourDBRepository.php b/components/ILIAS/ResourceStorage_/classes/FlavourDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/FlavourDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/FlavourDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/InformationDBRepository.php b/components/ILIAS/ResourceStorage_/classes/InformationDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/InformationDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/InformationDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/ResourceDBRepository.php b/components/ILIAS/ResourceStorage_/classes/ResourceDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/ResourceDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/ResourceDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/AllResourcesDataSource.php b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/AllResourcesDataSource.php similarity index 97% rename from components/ILIAS/ResourceStorage/classes/Resources/DataSource/AllResourcesDataSource.php rename to components/ILIAS/ResourceStorage_/classes/Resources/DataSource/AllResourcesDataSource.php index 1b9f74888a58..098ce188e5c8 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/AllResourcesDataSource.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/AllResourcesDataSource.php @@ -18,11 +18,11 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\DataSource; +namespace ILIAS\components\ResourceStorage_\Resources\DataSource; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\ResourceStorage\Resources\Listing\SortDirection; -use ILIAS\Services\ResourceStorage\Resources\UI\BaseToComponent; +use ILIAS\components\ResourceStorage_\Resources\Listing\SortDirection; +use ILIAS\components\ResourceStorage_\Resources\UI\BaseToComponent; use ILIAS\UI\Factory; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/BaseTableDataSource.php b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/BaseTableDataSource.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Resources/DataSource/BaseTableDataSource.php rename to components/ILIAS/ResourceStorage_/classes/Resources/DataSource/BaseTableDataSource.php index 9ba37b0a853f..62f41d437a9d 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/BaseTableDataSource.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/BaseTableDataSource.php @@ -18,12 +18,12 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\DataSource; +namespace ILIAS\components\ResourceStorage_\Resources\DataSource; use ILIAS\ResourceStorage\Collection\ResourceCollection; use ILIAS\ResourceStorage\Identification\ResourceCollectionIdentification; use ILIAS\ResourceStorage\Services; -use ILIAS\Services\ResourceStorage\Resources\Listing\SortDirection; +use ILIAS\components\ResourceStorage_\Resources\Listing\SortDirection; use ILIAS\UI\Factory; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/CollectionDataSource.php b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/CollectionDataSource.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Resources/DataSource/CollectionDataSource.php rename to components/ILIAS/ResourceStorage_/classes/Resources/DataSource/CollectionDataSource.php index e1047c2e51f3..7ee277c3b8ac 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/CollectionDataSource.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/CollectionDataSource.php @@ -18,9 +18,9 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\DataSource; +namespace ILIAS\components\ResourceStorage_\Resources\DataSource; -use ILIAS\Services\ResourceStorage\Resources\Listing\SortDirection; +use ILIAS\components\ResourceStorage_\Resources\Listing\SortDirection; use ILIAS\UI\Implementation\Component\Input\Container\Filter\Standard; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/TableDataSource.php b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/TableDataSource.php similarity index 95% rename from components/ILIAS/ResourceStorage/classes/Resources/DataSource/TableDataSource.php rename to components/ILIAS/ResourceStorage_/classes/Resources/DataSource/TableDataSource.php index d48e5112fcee..6d097bf94001 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/DataSource/TableDataSource.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/DataSource/TableDataSource.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\DataSource; +namespace ILIAS\components\ResourceStorage_\Resources\DataSource; use ILIAS\UI\Factory; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/Listing/SortDirection.php b/components/ILIAS/ResourceStorage_/classes/Resources/Listing/SortDirection.php similarity index 93% rename from components/ILIAS/ResourceStorage/classes/Resources/Listing/SortDirection.php rename to components/ILIAS/ResourceStorage_/classes/Resources/Listing/SortDirection.php index c3e5f14ada3a..fb7215be4ad5 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/Listing/SortDirection.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/Listing/SortDirection.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\Listing; +namespace ILIAS\components\ResourceStorage_\Resources\Listing; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Resources/Listing/ViewDefinition.php b/components/ILIAS/ResourceStorage_/classes/Resources/Listing/ViewDefinition.php similarity index 97% rename from components/ILIAS/ResourceStorage/classes/Resources/Listing/ViewDefinition.php rename to components/ILIAS/ResourceStorage_/classes/Resources/Listing/ViewDefinition.php index 95f301b99041..3740ce5b67d6 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/Listing/ViewDefinition.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/Listing/ViewDefinition.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\Listing; +namespace ILIAS\components\ResourceStorage_\Resources\Listing; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/ActionGenerator.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/ActionGenerator.php similarity index 92% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/ActionGenerator.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/ActionGenerator.php index a15918579381..83caf76bb27f 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/ActionGenerator.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/ActionGenerator.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI\Actions; +namespace ILIAS\components\ResourceStorage_\Resources\UI\Actions; use ILIAS\ResourceStorage\Revision\Revision; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/NullActionGenerator.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/NullActionGenerator.php similarity index 93% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/NullActionGenerator.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/NullActionGenerator.php index 62dad2a3a4e6..0c4c8898ed98 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/NullActionGenerator.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/NullActionGenerator.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI\Actions; +namespace ILIAS\components\ResourceStorage_\Resources\UI\Actions; use ILIAS\ResourceStorage\Revision\Revision; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/OverviewActionGenerator.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/OverviewActionGenerator.php similarity index 98% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/OverviewActionGenerator.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/OverviewActionGenerator.php index 6fda1a643858..b392cef9a896 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/Actions/OverviewActionGenerator.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/Actions/OverviewActionGenerator.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI\Actions; +namespace ILIAS\components\ResourceStorage_\Resources\UI\Actions; use ILIAS\ResourceStorage\Revision\Revision; use ILIAS\UI\Component\Modal\Modal; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/BaseToComponent.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/BaseToComponent.php similarity index 90% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/BaseToComponent.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/BaseToComponent.php index 26f9896f668e..0594d2e61e7d 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/BaseToComponent.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/BaseToComponent.php @@ -18,12 +18,12 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\Data\DataSize; use ILIAS\ResourceStorage\Resource\StorableResource; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\ActionGenerator; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\NullActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\ActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\NullActionGenerator; use ILIAS\UI\Component\Image\Image; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceListingUI.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceListingUI.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceListingUI.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceListingUI.php index 92c60fc609e8..da3832544735 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceListingUI.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceListingUI.php @@ -18,14 +18,14 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\ResourceStorage\Identification\ResourceIdentification; -use ILIAS\Services\ResourceStorage\Resources\DataSource\TableDataSource; -use ILIAS\Services\ResourceStorage\Resources\Listing\SortDirection; -use ILIAS\Services\ResourceStorage\Resources\Listing\ViewDefinition; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\ActionGenerator; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\NullActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\DataSource\TableDataSource; +use ILIAS\components\ResourceStorage_\Resources\Listing\SortDirection; +use ILIAS\components\ResourceStorage_\Resources\Listing\ViewDefinition; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\ActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\NullActionGenerator; use ILIAS\UI\Component\Table\PresentationRow; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceToComponent.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceToComponent.php similarity index 96% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceToComponent.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceToComponent.php index 04f5614c08c6..1cda7a5f60f8 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/ResourceToComponent.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ResourceToComponent.php @@ -18,12 +18,12 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Resource\StorableResource; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\ActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\ActionGenerator; use ILIAS\UI\Component\Card\Card; use ILIAS\UI\Component\Table\PresentationRow; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionListingUI.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionListingUI.php similarity index 91% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionListingUI.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionListingUI.php index 9c12bf2b6b83..c6b74f990cb4 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionListingUI.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionListingUI.php @@ -18,15 +18,15 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Resource\StorableResource; use ILIAS\ResourceStorage\Revision\Revision; -use ILIAS\Services\ResourceStorage\Resources\DataSource\TableDataSource; -use ILIAS\Services\ResourceStorage\Resources\Listing\ViewDefinition; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\ActionGenerator; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\NullActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\DataSource\TableDataSource; +use ILIAS\components\ResourceStorage_\Resources\Listing\ViewDefinition; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\ActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\NullActionGenerator; use ILIAS\UI\Component\Table\PresentationRow; /** diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionToComponent.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionToComponent.php similarity index 96% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionToComponent.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionToComponent.php index dd5b84bcc3b8..fe2c87190639 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/RevisionToComponent.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/RevisionToComponent.php @@ -18,18 +18,18 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Revision\Revision; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\ActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\ActionGenerator; use ILIAS\UI\Component\Card\Card; use ILIAS\UI\Component\Image\Image; use ILIAS\UI\Component\Table\PresentationRow; use ILIAS\ResourceStorage\Flavour\Machine\DefaultMachines\ExtractPages; use ILIAS\ResourceStorage\Flavour\Definition\PagesToExtract; -use ILIAS\Services\ResourceStorage\Collections\View\PreviewDefinition; +use ILIAS\components\ResourceStorage_\Collections\View\PreviewDefinition; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/Resources/UI/ToComponent.php b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ToComponent.php similarity index 94% rename from components/ILIAS/ResourceStorage/classes/Resources/UI/ToComponent.php rename to components/ILIAS/ResourceStorage_/classes/Resources/UI/ToComponent.php index 8925d83183ed..971adca34d89 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/UI/ToComponent.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/UI/ToComponent.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\ResourceStorage\Resources\UI; +namespace ILIAS\components\ResourceStorage_\Resources\UI; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; use ILIAS\UI\Component\Card\Card; diff --git a/components/ILIAS/ResourceStorage/classes/Resources/class.ilResourceOverviewGUI.php b/components/ILIAS/ResourceStorage_/classes/Resources/class.ilResourceOverviewGUI.php similarity index 93% rename from components/ILIAS/ResourceStorage/classes/Resources/class.ilResourceOverviewGUI.php rename to components/ILIAS/ResourceStorage_/classes/Resources/class.ilResourceOverviewGUI.php index 6ae0a2557314..ea01bd9b41af 100644 --- a/components/ILIAS/ResourceStorage/classes/Resources/class.ilResourceOverviewGUI.php +++ b/components/ILIAS/ResourceStorage_/classes/Resources/class.ilResourceOverviewGUI.php @@ -19,12 +19,12 @@ use ILIAS\GlobalScreen\Scope\MainMenu\Collector\Renderer\Hasher; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\ResourceStorage\Resources\DataSource\AllResourcesDataSource; -use ILIAS\Services\ResourceStorage\Resources\DataSource\TableDataSource; -use ILIAS\Services\ResourceStorage\Resources\Listing\ViewDefinition; -use ILIAS\Services\ResourceStorage\Resources\UI\Actions\OverviewActionGenerator; -use ILIAS\Services\ResourceStorage\Resources\UI\ResourceListingUI; -use ILIAS\Services\ResourceStorage\Resources\UI\RevisionListingUI; +use ILIAS\components\ResourceStorage_\Resources\DataSource\AllResourcesDataSource; +use ILIAS\components\ResourceStorage_\Resources\DataSource\TableDataSource; +use ILIAS\components\ResourceStorage_\Resources\Listing\ViewDefinition; +use ILIAS\components\ResourceStorage_\Resources\UI\Actions\OverviewActionGenerator; +use ILIAS\components\ResourceStorage_\Resources\UI\ResourceListingUI; +use ILIAS\components\ResourceStorage_\Resources\UI\RevisionListingUI; /** * @author Fabian Schmid diff --git a/components/ILIAS/ResourceStorage/classes/RevisionDBRepository.php b/components/ILIAS/ResourceStorage_/classes/RevisionDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/RevisionDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/RevisionDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php b/components/ILIAS/ResourceStorage_/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php similarity index 97% rename from components/ILIAS/ResourceStorage/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php rename to components/ILIAS/ResourceStorage_/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php index bc720b4d3ab9..59545a4577b7 100644 --- a/components/ILIAS/ResourceStorage/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php +++ b/components/ILIAS/ResourceStorage_/classes/Setup/Artifact/class.ilResourceStorageFlavourArtifact.php @@ -32,7 +32,7 @@ */ class ilResourceStorageFlavourArtifact extends BuildArtifactObjective { - public const PATH = './Services/ResourceStorage/artifacts/flavour_data.php'; + public const PATH = './components/ILIAS/ResourceStorage_/artifacts/flavour_data.php'; public function getArtifactPath(): string { diff --git a/components/ILIAS/ResourceStorage/classes/Setup/DB/class.ilResourceStorageDB80.php b/components/ILIAS/ResourceStorage_/classes/Setup/DB/class.ilResourceStorageDB80.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/Setup/DB/class.ilResourceStorageDB80.php rename to components/ILIAS/ResourceStorage_/classes/Setup/DB/class.ilResourceStorageDB80.php diff --git a/components/ILIAS/ResourceStorage/classes/Setup/DB/class.ilResourceStorageDB90.php b/components/ILIAS/ResourceStorage_/classes/Setup/DB/class.ilResourceStorageDB90.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/Setup/DB/class.ilResourceStorageDB90.php rename to components/ILIAS/ResourceStorage_/classes/Setup/DB/class.ilResourceStorageDB90.php diff --git a/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php b/components/ILIAS/ResourceStorage_/classes/Setup/class.ilResourceStorageMigrationHelper.php similarity index 98% rename from components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php rename to components/ILIAS/ResourceStorage_/classes/Setup/class.ilResourceStorageMigrationHelper.php index bb7c6ab9986c..d1267f3a9e3c 100644 --- a/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageMigrationHelper.php +++ b/components/ILIAS/ResourceStorage_/classes/Setup/class.ilResourceStorageMigrationHelper.php @@ -67,10 +67,10 @@ public function __construct( $data_dir = $ilias_ini->readVariable('clients', 'datadir'); $client_data_dir = "{$data_dir}/{$client_id}"; if (!defined("CLIENT_WEB_DIR")) { - define("CLIENT_WEB_DIR", dirname(__DIR__, 4) . "/data/" . $client_id); + define("CLIENT_WEB_DIR", dirname(__DIR__, 5) . "/data/" . $client_id); } if (!defined("ILIAS_WEB_DIR")) { - define("ILIAS_WEB_DIR", dirname(__DIR__, 4)); + define("ILIAS_WEB_DIR", dirname(__DIR__, 5)); } if (!defined("CLIENT_ID")) { define("CLIENT_ID", $client_id); diff --git a/components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php b/components/ILIAS/ResourceStorage_/classes/Setup/class.ilResourceStorageSetupAgent.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/Setup/class.ilResourceStorageSetupAgent.php rename to components/ILIAS/ResourceStorage_/classes/Setup/class.ilResourceStorageSetupAgent.php diff --git a/components/ILIAS/ResourceStorage/classes/Setup/class.ilStorageContainersExistingObjective.php b/components/ILIAS/ResourceStorage_/classes/Setup/class.ilStorageContainersExistingObjective.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/Setup/class.ilStorageContainersExistingObjective.php rename to components/ILIAS/ResourceStorage_/classes/Setup/class.ilStorageContainersExistingObjective.php diff --git a/components/ILIAS/ResourceStorage/classes/StakeholderDBRepository.php b/components/ILIAS/ResourceStorage_/classes/StakeholderDBRepository.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/StakeholderDBRepository.php rename to components/ILIAS/ResourceStorage_/classes/StakeholderDBRepository.php diff --git a/components/ILIAS/ResourceStorage/classes/class.ilResourceStorageInfoGUI.php b/components/ILIAS/ResourceStorage_/classes/class.ilResourceStorageInfoGUI.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/class.ilResourceStorageInfoGUI.php rename to components/ILIAS/ResourceStorage_/classes/class.ilResourceStorageInfoGUI.php diff --git a/components/ILIAS/ResourceStorage/classes/class.ilWACSignedResourceStorage.php b/components/ILIAS/ResourceStorage_/classes/class.ilWACSignedResourceStorage.php similarity index 100% rename from components/ILIAS/ResourceStorage/classes/class.ilWACSignedResourceStorage.php rename to components/ILIAS/ResourceStorage_/classes/class.ilWACSignedResourceStorage.php diff --git a/components/ILIAS/ResourceStorage/maintenance.json b/components/ILIAS/ResourceStorage_/maintenance.json similarity index 82% rename from components/ILIAS/ResourceStorage/maintenance.json rename to components/ILIAS/ResourceStorage_/maintenance.json index 4f14ff199c99..558434fa4dbe 100644 --- a/components/ILIAS/ResourceStorage/maintenance.json +++ b/components/ILIAS/ResourceStorage_/maintenance.json @@ -6,7 +6,7 @@ "coordinator": [], "tester": "", "testcase_writer": "", - "path": "Services/ResourceStorage", + "path": "components/ILIAS/ResourceStorage_", "belong_to_component": "IRSS", "used_in_components": [] } diff --git a/components/ILIAS/ResourceStorage/service.xml b/components/ILIAS/ResourceStorage_/service.xml similarity index 100% rename from components/ILIAS/ResourceStorage/service.xml rename to components/ILIAS/ResourceStorage_/service.xml diff --git a/components/ILIAS/SOAPAuth/examples/dummy_server.php b/components/ILIAS/SOAPAuth/examples/dummy_server.php index 6ba348403c0f..7689ef5b9bb9 100644 --- a/components/ILIAS/SOAPAuth/examples/dummy_server.php +++ b/components/ILIAS/SOAPAuth/examples/dummy_server.php @@ -29,6 +29,6 @@ ini_set("display_errors", "1"); error_reporting(E_ALL & ~E_NOTICE); -include_once './Services/SOAPAuth/examples/class.ilSoapDummyAuthServer.php'; +include_once './components/ILIAS/SOAPAuth/examples/class.ilSoapDummyAuthServer.php'; $server = new ilSoapDummyAuthServer(); $server->start(); diff --git a/components/ILIAS/Saml/classes/class.ilSamlAppEventListener.php b/components/ILIAS/Saml/classes/class.ilSamlAppEventListener.php index a8c433d7011b..3f71e4131db9 100644 --- a/components/ILIAS/Saml/classes/class.ilSamlAppEventListener.php +++ b/components/ILIAS/Saml/classes/class.ilSamlAppEventListener.php @@ -24,7 +24,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { global $DIC; - if ($a_component === 'Services/Authentication' && $a_event === 'afterLogout' && + if ($a_component === 'components/ILIAS/Authentication' && $a_event === 'afterLogout' && isset($a_parameter['is_explicit_logout']) && $a_parameter['is_explicit_logout'] === true && isset($a_parameter['used_external_auth_mode']) && $a_parameter['used_external_auth_mode']) { if ((int) $a_parameter['used_external_auth_mode'] === ilAuthUtils::AUTH_SAML) { diff --git a/components/ILIAS/Saml/classes/class.ilSamlIdpSelectionTableGUI.php b/components/ILIAS/Saml/classes/class.ilSamlIdpSelectionTableGUI.php index 019217fe75c4..a11abe011e17 100644 --- a/components/ILIAS/Saml/classes/class.ilSamlIdpSelectionTableGUI.php +++ b/components/ILIAS/Saml/classes/class.ilSamlIdpSelectionTableGUI.php @@ -39,6 +39,6 @@ public function __construct(object $parent_gui, string $parent_cmd) $this->setTitle($this->lng->txt('auth_saml_idp_selection_table_title')); $this->setDescription($this->lng->txt('auth_saml_idp_selection_table_desc')); - $this->setRowTemplate('tpl.saml_idp_selection_row.html', 'Services/Saml'); + $this->setRowTemplate('tpl.saml_idp_selection_row.html', 'components/ILIAS/Saml'); } } diff --git a/components/ILIAS/Saml/classes/class.ilSamlIdpTableGUI.php b/components/ILIAS/Saml/classes/class.ilSamlIdpTableGUI.php index 7b7e16e7712d..25334eb49da3 100644 --- a/components/ILIAS/Saml/classes/class.ilSamlIdpTableGUI.php +++ b/components/ILIAS/Saml/classes/class.ilSamlIdpTableGUI.php @@ -36,7 +36,7 @@ public function __construct( $this->setTitle($this->lng->txt('auth_saml_idps')); - $federationMdUrl = rtrim(ILIAS_HTTP_PATH, '/') . '/Services/Saml/lib/metadata.php?client_id=' . CLIENT_ID; + $federationMdUrl = rtrim(ILIAS_HTTP_PATH, '/') . '/components/ILIAS/Saml/lib/metadata.php?client_id=' . CLIENT_ID; $this->setDescription(sprintf( $this->lng->txt('auth_saml_idps_info'), @@ -48,7 +48,7 @@ public function __construct( )), $this->ui_renderer->render($this->ui_factory->link()->standard($federationMdUrl, $federationMdUrl)) )); - $this->setRowTemplate('tpl.saml_idp_row.html', 'Services/Saml'); + $this->setRowTemplate('tpl.saml_idp_row.html', 'components/ILIAS/Saml'); $this->addColumn($this->lng->txt('saml_tab_head_idp'), '', '80%'); $this->addColumn($this->lng->txt('active'), '', '5%'); diff --git a/components/ILIAS/Saml/classes/class.ilSimpleSAMLphpWrapper.php b/components/ILIAS/Saml/classes/class.ilSimpleSAMLphpWrapper.php index 476253fbec08..367dbc3f1289 100644 --- a/components/ILIAS/Saml/classes/class.ilSimpleSAMLphpWrapper.php +++ b/components/ILIAS/Saml/classes/class.ilSimpleSAMLphpWrapper.php @@ -54,7 +54,7 @@ private function initConfigFiles(string $configurationPath): void global $DIC; $templateHandler = new ilSimpleSAMLphpConfigTemplateHandler($DIC->filesystem()->storage()); - $templateHandler->copy('./Services/Saml/lib/config.php.dist', 'auth/saml/config/config.php', [ + $templateHandler->copy('./components/ILIAS/Saml/lib/config.php.dist', 'auth/saml/config/config.php', [ 'DB_PATH' => rtrim($configurationPath, '/') . '/ssphp.sq3', 'SQL_INITIAL_PASSWORD' => static function (): string { return substr(str_replace('+', '.', base64_encode(ilPasswordUtils::getBytes(20))), 0, 10); @@ -62,9 +62,9 @@ private function initConfigFiles(string $configurationPath): void 'COOKIE_PATH' => IL_COOKIE_PATH, 'LOG_DIRECTORY' => ilLoggingDBSettings::getInstance()->getLogDir() ]); - $templateHandler->copy('./Services/Saml/lib/authsources.php.dist', 'auth/saml/config/authsources.php', [ + $templateHandler->copy('./components/ILIAS/Saml/lib/authsources.php.dist', 'auth/saml/config/authsources.php', [ 'RELAY_STATE' => rtrim(ILIAS_HTTP_PATH, '/') . '/saml.php', - 'SP_ENTITY_ID' => rtrim(ILIAS_HTTP_PATH, '/') . '/Services/Saml/lib/metadata.php' + 'SP_ENTITY_ID' => rtrim(ILIAS_HTTP_PATH, '/') . '/components/ILIAS/Saml/lib/metadata.php' ]); } diff --git a/components/ILIAS/Saml/lib/metadata.php b/components/ILIAS/Saml/lib/metadata.php index f2df8c885f1b..0dd027fd758f 100644 --- a/components/ILIAS/Saml/lib/metadata.php +++ b/components/ILIAS/Saml/lib/metadata.php @@ -63,15 +63,15 @@ } define('IL_COOKIE_PATH', $cookie_path); -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SAML); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); $iliasHttpPath = ILIAS_HTTP_PATH; -require_once 'Services/Saml/classes/class.ilSamlAuthFactory.php'; +require_once 'components/ILIAS/Saml/classes/class.ilSamlAuthFactory.php'; $factory = new ilSamlAuthFactory(); $auth = $factory->auth(); diff --git a/components/ILIAS/Saml/lib/saml1-acs.php b/components/ILIAS/Saml/lib/saml1-acs.php index 16fa73c352a3..c4f6c637fc40 100644 --- a/components/ILIAS/Saml/lib/saml1-acs.php +++ b/components/ILIAS/Saml/lib/saml1-acs.php @@ -50,10 +50,10 @@ } define('IL_COOKIE_PATH', $cookie_path); -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SAML); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); $factory = new ilSamlAuthFactory(); diff --git a/components/ILIAS/Saml/lib/saml2-acs.php b/components/ILIAS/Saml/lib/saml2-acs.php index dcaab7742c8d..122af4fcdf7b 100644 --- a/components/ILIAS/Saml/lib/saml2-acs.php +++ b/components/ILIAS/Saml/lib/saml2-acs.php @@ -50,10 +50,10 @@ } define('IL_COOKIE_PATH', $cookie_path); -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SAML); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); $factory = new ilSamlAuthFactory(); diff --git a/components/ILIAS/Saml/lib/saml2-logout.php b/components/ILIAS/Saml/lib/saml2-logout.php index 2378b1445c4d..e4b2127c77c6 100644 --- a/components/ILIAS/Saml/lib/saml2-logout.php +++ b/components/ILIAS/Saml/lib/saml2-logout.php @@ -50,10 +50,10 @@ } define('IL_COOKIE_PATH', $cookie_path); -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SAML); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); $factory = new ilSamlAuthFactory(); @@ -63,7 +63,7 @@ $GLOBALS['DIC']['ilAuthSession']->logout(); $GLOBALS['ilAppEventHandler']->raise( - 'Services/Authentication', + 'components/ILIAS/Authentication', 'afterLogout', [ 'username' => $GLOBALS['DIC']->user()->getLogin(), diff --git a/components/ILIAS/Scorm2004/classes/class.ilObjSCORM2004LearningModule.php b/components/ILIAS/Scorm2004/classes/class.ilObjSCORM2004LearningModule.php index a7b5dbc3b87c..1c94d4a3d1c4 100644 --- a/components/ILIAS/Scorm2004/classes/class.ilObjSCORM2004LearningModule.php +++ b/components/ILIAS/Scorm2004/classes/class.ilObjSCORM2004LearningModule.php @@ -608,7 +608,7 @@ public function importSuccess(string $a_file): bool } if (count($usersToDelete) > 0) { - // include_once("./Services/Tracking/classes/class.ilLPMarks.php"); + // include_once("./components/ILIAS/Tracking/classes/class.ilLPMarks.php"); // ilLPMarks::_deleteForUsers($this->getId(), $usersToDelete); $this->deleteTrackingDataOfUsers($usersToDelete); } diff --git a/components/ILIAS/Scorm2004/classes/class.ilSCORM13PlayerGUI.php b/components/ILIAS/Scorm2004/classes/class.ilSCORM13PlayerGUI.php index d644ae1f2a1f..26fd14819a8b 100644 --- a/components/ILIAS/Scorm2004/classes/class.ilSCORM13PlayerGUI.php +++ b/components/ILIAS/Scorm2004/classes/class.ilSCORM13PlayerGUI.php @@ -453,9 +453,9 @@ public function getPlayer(): void $this->tpl->setVariable('JSON_LANGSTRINGS', json_encode($langstrings)); - // include_once("./Services/YUI/classes/class.ilYuiUtil.php"); + // include_once("./components/ILIAS/YUI/classes/class.ilYuiUtil.php"); // $this->tpl->setVariable('YUI_PATH', ilYuiUtil::getLocalPath()); - // $this->tpl->setVariable('TREE_JS', "./Services/UIComponent/NestedList/js/ilNestedList.js"); + // $this->tpl->setVariable('TREE_JS', "./components/ILIAS/UIComponent/NestedList/js/ilNestedList.js"); $this->tpl->setVariable('TREE_JS', "./components/ILIAS/Scorm2004/scripts/ilNestedList.js"); foreach ($langstrings as $key => $value) { $this->tpl->setVariable($key, $value); @@ -1211,7 +1211,7 @@ public function quoteJSONArray(?array $a_array): array // */ // public function getMimetype($filename) // { - // include_once("./Services/MediaObjects/classes/class.ilObjMediaObject.php"); + // include_once("./components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php"); // return ilObjMediaObject::getMimeType($filename); // } diff --git a/components/ILIAS/Scorm2004/classes/class.ilScorm2004DataSet.php b/components/ILIAS/Scorm2004/classes/class.ilScorm2004DataSet.php index c6206bcd6e42..fab109e77a2c 100644 --- a/components/ILIAS/Scorm2004/classes/class.ilScorm2004DataSet.php +++ b/components/ILIAS/Scorm2004/classes/class.ilScorm2004DataSet.php @@ -169,7 +169,7 @@ public function afterXmlRecordWriting(string $a_entity, string $a_version, array // ) : void { // switch ($a_entity) { // case "sahs": - // $new_obj_id = $a_mapping->getMapping("Services/Container", "objs", $a_rec["Id"]); + // $new_obj_id = $a_mapping->getMapping("components/ILIAS/Container", "objs", $a_rec["Id"]); // $lm = new ilObjSCORM2004LearningModule($new_obj_id, false); // //// $lm->setEditable($a_rec["Editable"]); diff --git a/components/ILIAS/Scorm2004/test/bootstrap.php b/components/ILIAS/Scorm2004/test/bootstrap.php index a2ec435a865f..ea4c2fd7690a 100644 --- a/components/ILIAS/Scorm2004/test/bootstrap.php +++ b/components/ILIAS/Scorm2004/test/bootstrap.php @@ -1,4 +1,4 @@ language(); - $tpl = new ilTemplate("tpl.tree.html", true, true, "Services/UIComponent/Explorer"); + $tpl = new ilTemplate("tpl.tree.html", true, true, "components/ILIAS/UIComponent/Explorer"); $tpl->setCurrentBlock("row"); $tpl->setVariable("TITLE", $lng->txt("cont_manifest")); diff --git a/components/ILIAS/ScormAicc/classes/SCORM/class.ilSCORMPresentationGUI.php b/components/ILIAS/ScormAicc/classes/SCORM/class.ilSCORMPresentationGUI.php index 8c352544e464..d2afe59f64db 100644 --- a/components/ILIAS/ScormAicc/classes/SCORM/class.ilSCORMPresentationGUI.php +++ b/components/ILIAS/ScormAicc/classes/SCORM/class.ilSCORMPresentationGUI.php @@ -259,7 +259,7 @@ public function get_actual_attempts(): int // )); // } - // include_once("./Services/Tracking/classes/class.ilLPStatusWrapper.php"); + // include_once("./components/ILIAS/Tracking/classes/class.ilLPStatusWrapper.php"); // ilLPStatusWrapper::_updateStatus($this->slm->getId(), $ilUser->getId()); // } @@ -346,7 +346,7 @@ public function increase_attemptAndsave_module_version(): void // )); // } - // include_once("./Services/Tracking/classes/class.ilLPStatusWrapper.php"); + // include_once("./components/ILIAS/Tracking/classes/class.ilLPStatusWrapper.php"); // ilLPStatusWrapper::_updateStatus($this->slm->getId(), $ilUser->getId()); // } diff --git a/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModule.php b/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModule.php index dafb6da3c37d..c6c2fb8c86ef 100644 --- a/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModule.php +++ b/components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModule.php @@ -18,7 +18,7 @@ * *********************************************************************/ -//require_once "Services/MetaData/classes/class.ilMDLanguageItem.php"; +//require_once "components/ILIAS/MetaData/classes/class.ilMDLanguageItem.php"; /** @defgroup ModulesScormAicc Modules/ScormAicc */ /** @@ -1234,7 +1234,7 @@ public function cloneObject(int $a_target_id, int $a_copy_id = 0, bool $a_omit_t // set/copy stylesheet - /* include_once("./Services/Style/Content/classes/class.ilObjStyleSheet.php"); + /* include_once("./components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php"); $style_id = $this->getStyleSheetId(); if ($style_id > 0 && !ilObjStyleSheet::_lookupStandard($style_id)) { diff --git a/components/ILIAS/ScormAicc/classes/class.ilObjSCORMLearningModule.php b/components/ILIAS/ScormAicc/classes/class.ilObjSCORMLearningModule.php index 748a04d09659..bfd6b1f22e2f 100644 --- a/components/ILIAS/ScormAicc/classes/class.ilObjSCORMLearningModule.php +++ b/components/ILIAS/ScormAicc/classes/class.ilObjSCORMLearningModule.php @@ -712,7 +712,7 @@ public function importSuccess(string $a_file): bool } if (count($usersToDelete) > 0) { - // include_once("./Services/Tracking/classes/class.ilLPMarks.php"); + // include_once("./components/ILIAS/Tracking/classes/class.ilLPMarks.php"); // ilLPMarks::_deleteForUsers($this->getId(), $usersToDelete); $this->deleteTrackingDataOfUsers($usersToDelete); } diff --git a/components/ILIAS/ScormAicc/classes/class.ilScormAiccImporter.php b/components/ILIAS/ScormAicc/classes/class.ilScormAiccImporter.php index 506c3ae99d12..5a5780a39f43 100644 --- a/components/ILIAS/ScormAicc/classes/class.ilScormAiccImporter.php +++ b/components/ILIAS/ScormAicc/classes/class.ilScormAiccImporter.php @@ -49,7 +49,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ // return; // } // case i container - if ($a_id !== "" && $a_mapping !== null && $new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($a_id !== "" && $a_mapping !== null && $new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId((int) $new_id, false); // $exportDir = ilExport::_getExportDirectory((int) $a_id); // $tempFile = dirname($exportDir) . '/export/' . basename($this->getImportDirectory()) . '.zip'; @@ -95,7 +95,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ $this->moduleProperties[$key] = $filteredValue; } - if ($a_id != null && $new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($a_id != null && $new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $this->dataset->writeData("sahs", "5.1.0", $newObj->getId(), $this->moduleProperties); $newObj->createReference(); @@ -158,7 +158,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ // $this->moduleProperties["Title"] = $xmlRoot->Title; // $this->moduleProperties["Description"] = $xmlRoot->Description; // - // if ($a_id !== "" && $a_mapping !== null && $new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + // if ($a_id !== "" && $a_mapping !== null && $new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { // if ($newObj !== null) { // $this->dataset->writeData("sahs", "5.1.0", $newObj->getId(), $this->moduleProperties); // diff --git a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchActivationTableGUI.php b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchActivationTableGUI.php index f6c876f138bb..bbcb24260cee 100644 --- a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchActivationTableGUI.php +++ b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchActivationTableGUI.php @@ -39,7 +39,7 @@ public function __construct($a_parent_obj, $a_parent_cmd = '') $this->addColumn('', 'id', '0px'); $this->addColumn($this->lng->txt('title'), 'title', '60%'); $this->addColumn($this->lng->txt('type'), 'type', '40%'); - $this->setRowTemplate('tpl.lucene_activation_row.html', 'Services/Search'); + $this->setRowTemplate('tpl.lucene_activation_row.html', 'components/ILIAS/Search'); $this->disable('sort'); $this->setLimit(100); $this->setSelectAllCheckbox('fid'); diff --git a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchFields.php b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchFields.php index 31255f83caa7..cbf4ec7ae0a4 100644 --- a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchFields.php +++ b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchFields.php @@ -798,7 +798,7 @@ protected function getRangeSelect( string $txt_until, string $select_until ): string { - $tpl = new ilTemplate('tpl.range_search.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.range_search.html', true, true, 'components/ILIAS/Search'); $tpl->setVariable('TXT_FROM', $txt_from); $tpl->setVariable('FROM', $select_from); $tpl->setVariable('TXT_UPTO', $txt_until); diff --git a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php index f8127f19a057..e25a7b61ff1b 100644 --- a/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php +++ b/components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php @@ -105,7 +105,7 @@ public function showSavedResults(): void $searcher->highlight($filter->getResultObjIds()); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_adv_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_adv_search.html', 'components/ILIAS/Search'); $presentation = new ilSearchResultPresentation($this); $presentation->setResults($filter->getResultIds()); $presentation->setSearcher($searcher); @@ -236,7 +236,7 @@ protected function performSearch(): void } // Show results - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_adv_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_adv_search.html', 'components/ILIAS/Search'); $presentation = new ilSearchResultPresentation($this); $presentation->setResults($filter->getResultIds()); $presentation->setSearcher($searcher); diff --git a/components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchGUI.php b/components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchGUI.php index 6e49eb5a8a38..13911724ec72 100644 --- a/components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchGUI.php +++ b/components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchGUI.php @@ -505,10 +505,10 @@ protected function setPageFormAction(string $a_action): void */ protected function showSearchForm(): void { - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_search.html', 'components/ILIAS/Search'); ilOverlayGUI::initJavascript(); - $this->tpl->addJavascript("./Services/Search/js/Search.js"); + $this->tpl->addJavascript("./components/ILIAS/Search/js/Search.js"); $this->tpl->setVariable("FORM_ACTION", $this->ctrl->getFormAction($this, 'performSearch')); diff --git a/components/ILIAS/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php b/components/ILIAS/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php index 9886ad362bda..e5eaef43542f 100644 --- a/components/ILIAS/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php +++ b/components/ILIAS/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php @@ -238,10 +238,10 @@ protected function initUserSearchCache(): void */ protected function showSearchForm() { - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_usr_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.lucene_usr_search.html', 'components/ILIAS/Search'); ilOverlayGUI::initJavascript(); - $this->tpl->addJavascript("./Services/Search/js/Search.js"); + $this->tpl->addJavascript("./components/ILIAS/Search/js/Search.js"); $this->tpl->setVariable('FORM_ACTION', $this->ctrl->getFormAction($this, 'performSearch')); $this->tpl->setVariable("TERM", ilLegacyFormElementsUtil::prepareFormOutput($this->search_cache->getQuery())); diff --git a/components/ILIAS/Search/classes/Provider/SearchMetaBarProvider.php b/components/ILIAS/Search/classes/Provider/SearchMetaBarProvider.php index b3504dade0e8..af92b9f2d4f1 100644 --- a/components/ILIAS/Search/classes/Provider/SearchMetaBarProvider.php +++ b/components/ILIAS/Search/classes/Provider/SearchMetaBarProvider.php @@ -47,7 +47,7 @@ public function getMetaBarItems(): array // user interface plugin slot + default rendering $uip = new ilUIHookProcessor( - "Services/MainMenu", + "components/ILIAS/MainMenu", "main_menu_search", array("main_menu_gui" => $this, "main_menu_search_gui" => $main_search) ); diff --git a/components/ILIAS/Search/classes/class.ilAdvancedSearchGUI.php b/components/ILIAS/Search/classes/class.ilAdvancedSearchGUI.php index 2978120f59ba..316c41948246 100644 --- a/components/ILIAS/Search/classes/class.ilAdvancedSearchGUI.php +++ b/components/ILIAS/Search/classes/class.ilAdvancedSearchGUI.php @@ -351,7 +351,7 @@ public function showAdvMDSearch(): bool $this->setSubTabs(); $this->tabs_gui->setSubTabActive('search_adv_md'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.advanced_adv_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.advanced_adv_search.html', 'components/ILIAS/Search'); $this->initAdvancedMetaDataForm(); $this->tpl->setVariable('SEARCH_FORM', $this->form->getHTML()); @@ -389,7 +389,7 @@ public function showSearch(): bool $this->setSubTabs(); $this->tabs_gui->setSubTabActive('search_lom'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.advanced_search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.advanced_search.html', 'components/ILIAS/Search'); $this->initFormSearch(); $this->tpl->setVariable('SEARCH_FORM', $this->form->getHTML()); diff --git a/components/ILIAS/Search/classes/class.ilMainMenuSearchGUI.php b/components/ILIAS/Search/classes/class.ilMainMenuSearchGUI.php index 7b882499f753..ff20638d2099 100644 --- a/components/ILIAS/Search/classes/class.ilMainMenuSearchGUI.php +++ b/components/ILIAS/Search/classes/class.ilMainMenuSearchGUI.php @@ -56,7 +56,7 @@ public function __construct() $this->http = $DIC->http(); $this->refinery = $DIC->refinery(); - $DIC->ui()->mainTemplate()->addJavascript('Services/Search/js/SearchMainMenu.js'); + $DIC->ui()->mainTemplate()->addJavascript('components/ILIAS/Search/js/SearchMainMenu.js'); $this->initRefIdFromQuery(); } @@ -77,7 +77,7 @@ public function getHTML(): string iljQueryUtil::initjQuery(); iljQueryUtil::initjQueryUI(); - $this->tpl = new ilTemplate('tpl.main_menu_search.html', true, true, 'Services/Search'); + $this->tpl = new ilTemplate('tpl.main_menu_search.html', true, true, 'components/ILIAS/Search'); if ($this->user->getId() != ANONYMOUS_USER_ID) { $this->tpl->setVariable('LABEL_SEARCH_OPTIONS', $this->lng->txt("label_search_options")); if (ilSearchSettings::getInstance()->isLuceneUserSearchEnabled() || ($this->ref_id != ROOT_FOLDER_ID)) { diff --git a/components/ILIAS/Search/classes/class.ilObjSearchSettings.php b/components/ILIAS/Search/classes/class.ilObjSearchSettings.php index b61541372794..116da0ce589e 100644 --- a/components/ILIAS/Search/classes/class.ilObjSearchSettings.php +++ b/components/ILIAS/Search/classes/class.ilObjSearchSettings.php @@ -3,7 +3,7 @@ declare(strict_types=1); /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -require_once "./Services/Object/classes/class.ilObject.php"; +require_once "./components/ILIAS/Object/classes/class.ilObject.php"; /** * Class ilObjSearchSettings diff --git a/components/ILIAS/Search/classes/class.ilObjectSearch.php b/components/ILIAS/Search/classes/class.ilObjectSearch.php index b14e8668d4ca..a309077dafd8 100644 --- a/components/ILIAS/Search/classes/class.ilObjectSearch.php +++ b/components/ILIAS/Search/classes/class.ilObjectSearch.php @@ -56,7 +56,7 @@ public static function raiseContentChanged(int $obj_id) : void global $DIC; $DIC->event()->raise( - 'Services/Search', + 'components/ILIAS/Search', 'contentChanged', [ "obj_id" => $obj_id diff --git a/components/ILIAS/Search/classes/class.ilRepositoryObjectResultTableGUI.php b/components/ILIAS/Search/classes/class.ilRepositoryObjectResultTableGUI.php index d0c477fa4531..aa7385a134fd 100644 --- a/components/ILIAS/Search/classes/class.ilRepositoryObjectResultTableGUI.php +++ b/components/ILIAS/Search/classes/class.ilRepositoryObjectResultTableGUI.php @@ -32,7 +32,7 @@ public function __construct($a_parent_obj, $a_parent_cmd, $a_allow_object_select $this->addColumn($this->lng->txt("members"), "member", "20%"); $this->setFormAction($this->ctrl->getFormAction($this->parent_obj)); - $this->setRowTemplate("tpl.rep_search_obj_result_row.html", "Services/Search"); + $this->setRowTemplate("tpl.rep_search_obj_result_row.html", "components/ILIAS/Search"); $this->setTitle($this->lng->txt('search_results')); $this->setEnableTitle(true); $this->setId("group_table"); diff --git a/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchBlockGUI.php b/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchBlockGUI.php index 5992162fdfea..fcf871905cda 100644 --- a/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchBlockGUI.php +++ b/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchBlockGUI.php @@ -104,7 +104,7 @@ public function fillDataSection(): void */ protected function getLegacyContent(): string { - $tpl = new ilTemplate("tpl.search_search_block.html", true, true, 'Services/Search'); + $tpl = new ilTemplate("tpl.search_search_block.html", true, true, 'components/ILIAS/Search'); $this->lng->loadLanguageModule('search'); $tpl->setVariable("TXT_SEARCH_INPUT_LABEL", $this->lng->txt('search_field')); diff --git a/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchResultTableGUI.php b/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchResultTableGUI.php index 5a01d39ab1f8..0746d369b834 100644 --- a/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchResultTableGUI.php +++ b/components/ILIAS/Search/classes/class.ilRepositoryObjectSearchResultTableGUI.php @@ -72,7 +72,7 @@ protected function initColumns(): void protected function initRowTemplate(): void { - $this->setRowTemplate('tpl.repository_object_search_result_row.html', 'Services/Search'); + $this->setRowTemplate('tpl.repository_object_search_result_row.html', 'components/ILIAS/Search'); } @@ -81,7 +81,7 @@ abstract public function parse(); public function getRelevanceHTML(float $a_rel): string { - $tpl = new ilTemplate('tpl.lucene_relevance.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.lucene_relevance.html', true, true, 'components/ILIAS/Search'); $pbar = ilProgressBar::getInstance(); $pbar->setCurrent($a_rel); diff --git a/components/ILIAS/Search/classes/class.ilRepositorySearchGUI.php b/components/ILIAS/Search/classes/class.ilRepositorySearchGUI.php index fedb3e3f2937..11ed15e27b67 100644 --- a/components/ILIAS/Search/classes/class.ilRepositorySearchGUI.php +++ b/components/ILIAS/Search/classes/class.ilRepositorySearchGUI.php @@ -695,7 +695,7 @@ public function showSearchSelected(): void $this->refinery->kindlyTo()->int() ); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'components/ILIAS/Search'); $this->addNewSearchButton(); $this->showSearchUserTable([$selected], 'showSearchResults'); } @@ -1165,7 +1165,7 @@ public function showSearchResults(): void $counter = 0; $f_result = array(); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'components/ILIAS/Search'); $this->addNewSearchButton(); $rep_search = ilSession::get('rep_search'); @@ -1341,7 +1341,7 @@ protected function listUsers(array $selected_entries = []): bool $members = array_unique($members); $this->__appendToStoredResults($members); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.rep_search_result.html', 'components/ILIAS/Search'); $this->addNewSearchButton(); $rep_search = ilSession::get('rep_search'); diff --git a/components/ILIAS/Search/classes/class.ilRepositoryUserResultTableGUI.php b/components/ILIAS/Search/classes/class.ilRepositoryUserResultTableGUI.php index 774cad650e39..df8eeffa7810 100644 --- a/components/ILIAS/Search/classes/class.ilRepositoryUserResultTableGUI.php +++ b/components/ILIAS/Search/classes/class.ilRepositoryUserResultTableGUI.php @@ -63,14 +63,14 @@ public function __construct($a_parent_obj, $a_parent_cmd, $a_admin_mode = false, if ($this->getType() == self::TYPE_STANDARD) { - $this->setRowTemplate("tpl.rep_search_usr_result_row.html", "Services/Search"); + $this->setRowTemplate("tpl.rep_search_usr_result_row.html", "components/ILIAS/Search"); $this->addColumn("", "", "1", true); $this->enable('select_all'); $this->setSelectAllCheckbox("user[]"); $this->setDefaultOrderField("login"); $this->setDefaultOrderDirection("asc"); } else { - $this->setRowTemplate("tpl.global_search_usr_result_row.html", "Services/Search"); + $this->setRowTemplate("tpl.global_search_usr_result_row.html", "components/ILIAS/Search"); $this->addColumn('', '', "110px"); } @@ -251,7 +251,7 @@ protected function fillRow(array $a_set): void if ($this->getType() == self::TYPE_GLOBAL_SEARCH) { $this->tpl->setVariable('SEARCH_RELEVANCE', $this->getRelevanceHTML($a_set['relevance'])); if (ilBuddySystem::getInstance()->isEnabled() && $a_set['usr_id'] != $this->user->getId()) { - require_once 'Services/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php'; + require_once 'components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemLinkButton.php'; $this->tpl->setVariable('CONTACT_ACTIONS', ilBuddySystemLinkButton::getInstanceByUserId((int) $a_set['usr_id'])->getHtml()); } else { $this->tpl->setVariable('CONTACT_ACTIONS', ''); @@ -359,7 +359,7 @@ public function parseUserIds(array $a_user_ids): bool public function getRelevanceHTML(float $a_rel): string { - $tpl = new ilTemplate('tpl.lucene_relevance.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.lucene_relevance.html', true, true, 'components/ILIAS/Search'); $pbar = ilProgressBar::getInstance(); $pbar->setCurrent($a_rel); diff --git a/components/ILIAS/Search/classes/class.ilSearchAppEventListener.php b/components/ILIAS/Search/classes/class.ilSearchAppEventListener.php index 278920f55a12..786a5ef47d94 100644 --- a/components/ILIAS/Search/classes/class.ilSearchAppEventListener.php +++ b/components/ILIAS/Search/classes/class.ilSearchAppEventListener.php @@ -56,14 +56,14 @@ public static function handleEvent(string $a_component, string $a_event, array $ } switch ($a_component) { - case 'Services/Search': + case 'components/ILIAS/Search': if ($a_event === 'contentChanged') { ilSearchAppEventListener::storeElement(ilSearchCommandQueueElement::RESET, $a_parameter); } break; - case 'Services/Help': - case 'Services/Object': + case 'components/ILIAS/Help': + case 'components/ILIAS/Object': switch ($a_event) { case 'undelete': diff --git a/components/ILIAS/Search/classes/class.ilSearchGUI.php b/components/ILIAS/Search/classes/class.ilSearchGUI.php index 34944d919568..656cc6bc58b6 100644 --- a/components/ILIAS/Search/classes/class.ilSearchGUI.php +++ b/components/ILIAS/Search/classes/class.ilSearchGUI.php @@ -336,10 +336,10 @@ public function autoComplete(): void public function showSearch(): void { ilOverlayGUI::initJavascript(); - $this->tpl->addJavascript("./Services/Search/js/Search.js"); + $this->tpl->addJavascript("./components/ILIAS/Search/js/Search.js"); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.search.html', 'Services/Search'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.search.html', 'components/ILIAS/Search'); $this->tpl->setVariable("FORM_ACTION", $this->ctrl->getFormAction($this, 'performSearch')); $this->tpl->setVariable("TERM", ilLegacyFormElementsUtil::prepareFormOutput($this->getString())); $this->tpl->setVariable("SEARCH_LABEL", $this->lng->txt("search")); diff --git a/components/ILIAS/Search/classes/class.ilSearchResultPresentation.php b/components/ILIAS/Search/classes/class.ilSearchResultPresentation.php index 06e9fba19bf0..0587ac1b5485 100644 --- a/components/ILIAS/Search/classes/class.ilSearchResultPresentation.php +++ b/components/ILIAS/Search/classes/class.ilSearchResultPresentation.php @@ -338,7 +338,7 @@ public function appendAdditionalInformation( !strlen($more)) { return; } - $tpl = new ilTemplate('tpl.lucene_additional_information.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.lucene_additional_information.html', true, true, 'components/ILIAS/Search'); $tpl->setVariable('SUBITEM', $sub); if (strlen($path)) { $tpl->setVariable('PATH', $path); @@ -357,7 +357,7 @@ protected function appendPath(int $a_ref_id): string $path_gui->enableTextOnly(false); $path_gui->setUseImages(false); - $tpl = new ilTemplate('tpl.lucene_path.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.lucene_path.html', true, true, 'components/ILIAS/Search'); $tpl->setVariable('PATH_ITEM', $path_gui->getPath(ROOT_FOLDER_ID, $a_ref_id)); return $tpl->get(); } @@ -372,7 +372,7 @@ protected function appendMorePathes(int $a_ref_id): string if (!$num_refs = $this->getMoreReferencesCounter($a_ref_id)) { return ''; } - $tpl = new ilTemplate('tpl.lucene_more_references.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.lucene_more_references.html', true, true, 'components/ILIAS/Search'); $this->ctrl->setParameter($this->getContainer(), 'refs', $a_ref_id); $tpl->setVariable('MORE_REFS_LINK', $this->ctrl->getLinkTarget($this->getContainer(), '')); $this->ctrl->clearParameters($this->getContainer()); diff --git a/components/ILIAS/Search/classes/class.ilSearchResultTableGUI.php b/components/ILIAS/Search/classes/class.ilSearchResultTableGUI.php index bf4e12a35243..dfc9678a8bcf 100644 --- a/components/ILIAS/Search/classes/class.ilSearchResultTableGUI.php +++ b/components/ILIAS/Search/classes/class.ilSearchResultTableGUI.php @@ -74,7 +74,7 @@ public function __construct($a_parent_obj, $a_parent_cmd, ilSearchResultPresenta $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.search_result_row.html", "Services/Search"); + $this->setRowTemplate("tpl.search_result_row.html", "components/ILIAS/Search"); //$this->disable("footer"); $this->setEnableTitle(true); $this->setEnableNumInfo(false); diff --git a/components/ILIAS/Search/classes/class.ilSearchRootSelector.php b/components/ILIAS/Search/classes/class.ilSearchRootSelector.php index 45696f94bdca..9f8627c6a4d0 100644 --- a/components/ILIAS/Search/classes/class.ilSearchRootSelector.php +++ b/components/ILIAS/Search/classes/class.ilSearchRootSelector.php @@ -150,7 +150,7 @@ public function showChilds($a_parent_id): bool */ public function formatHeader(ilTemplate $tpl, $a_obj_id, array $a_option): void { - #$tpl = new ilTemplate("tpl.tree.html", true, true, "Services/UIComponent/Explorer"); + #$tpl = new ilTemplate("tpl.tree.html", true, true, "components/ILIAS/UIComponent/Explorer"); if (in_array("root", $this->clickable_types)) { $tpl->setCurrentBlock("link"); diff --git a/components/ILIAS/Search/classes/class.ilUserFilterGUI.php b/components/ILIAS/Search/classes/class.ilUserFilterGUI.php index 62b23fc19c62..22fb41f5e24f 100644 --- a/components/ILIAS/Search/classes/class.ilUserFilterGUI.php +++ b/components/ILIAS/Search/classes/class.ilUserFilterGUI.php @@ -91,7 +91,7 @@ public function getUserId(): int public function getHTML(): string { - $tpl = new ilTemplate('tpl.search_user_filter.html', true, true, 'Services/Search'); + $tpl = new ilTemplate('tpl.search_user_filter.html', true, true, 'components/ILIAS/Search'); $tpl->setVariable("FILTER_ACTION", $this->ctrl->getFormAction($this)); $tpl->setVariable("TBL_TITLE", $this->lng->txt('trac_lp_filter')); diff --git a/components/ILIAS/Search/test/ilServicesSearchSuite.php b/components/ILIAS/Search/test/ilServicesSearchSuite.php index 5950aaa3726f..d457efa2d1df 100644 --- a/components/ILIAS/Search/test/ilServicesSearchSuite.php +++ b/components/ILIAS/Search/test/ilServicesSearchSuite.php @@ -26,8 +26,8 @@ public static function suite(): self { $suite = new ilServicesSearchSuite(); - include_once("./Services/Search/test/ilSearchLuceneQueryParserTest.php"); - include_once("./Services/Search/test/ilObjSearchRpcClientCoordinatorTest.php"); + include_once("./components/ILIAS/Search/test/ilSearchLuceneQueryParserTest.php"); + include_once("./components/ILIAS/Search/test/ilObjSearchRpcClientCoordinatorTest.php"); $suite->addTestSuite(ilSearchLuceneQueryParserTest::class); $suite->addTestSuite(ilObjSearchRpcClientCoordinatorTest::class); return $suite; diff --git a/components/ILIAS/Session/classes/class.ilSessionAppEventListener.php b/components/ILIAS/Session/classes/class.ilSessionAppEventListener.php index 9dedffa99507..e5c889f67e5a 100644 --- a/components/ILIAS/Session/classes/class.ilSessionAppEventListener.php +++ b/components/ILIAS/Session/classes/class.ilSessionAppEventListener.php @@ -87,7 +87,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ public function handle(): void { - if ($this->component === 'Services/AccessControl') { + if ($this->component === 'components/ILIAS/AccessControl') { if ($this->event === 'deassignUser') { $session = ilObjectFactory::getInstanceByObjId($this->parameters['obj_id'], false); if ($session instanceof ilObjSession) { diff --git a/components/ILIAS/Session/classes/class.ilSessionDataSet.php b/components/ILIAS/Session/classes/class.ilSessionDataSet.php index c04ea2bf3e92..214bcab30dbf 100644 --- a/components/ILIAS/Session/classes/class.ilSessionDataSet.php +++ b/components/ILIAS/Session/classes/class.ilSessionDataSet.php @@ -324,7 +324,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI { switch ($a_entity) { case "sess": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $refs = ilObject::_getAllReferences((int) $new_id); $newObj = ilObjectFactory::getInstanceByRefId(end($refs), false); } else { @@ -391,10 +391,10 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI $this->current_obj = $newObj; $a_mapping->addMapping("components/ILIAS/Session", "sess", $a_rec["Id"], (string) $newObj->getId()); - $a_mapping->addMapping('Services/Object', 'objs', $a_rec['Id'], (string) $newObj->getId()); - $a_mapping->addMapping('Services/AdvancedMetaData', 'parent', $a_rec['Id'], (string) $newObj->getId()); + $a_mapping->addMapping('components/ILIAS/Object', 'objs', $a_rec['Id'], (string) $newObj->getId()); + $a_mapping->addMapping('components/ILIAS/AdvancedMetaData', 'parent', $a_rec['Id'], (string) $newObj->getId()); $a_mapping->addMapping( - "Services/MetaData", + "components/ILIAS/MetaData", "md", $a_rec["Id"] . ":0:sess", $newObj->getId() . ":0:sess" @@ -402,7 +402,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI break; case "sess_item": - if ($obj_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['ItemId'])) { + if ($obj_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['ItemId'])) { $ref_id = current(ilObject::_getAllReferences((int) $obj_id)); $evi = new ilEventItems($this->current_obj->getId()); $evi->addItem($ref_id); diff --git a/components/ILIAS/Session/classes/class.ilSessionExporter.php b/components/ILIAS/Session/classes/class.ilSessionExporter.php index 79e9d5e5bb23..8f2a6250306e 100644 --- a/components/ILIAS/Session/classes/class.ilSessionExporter.php +++ b/components/ILIAS/Session/classes/class.ilSessionExporter.php @@ -52,7 +52,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ } if (sizeof($advmd_ids)) { $deps[] = array( - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ); @@ -65,7 +65,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if ($md_ids) { $deps[] = array( - "component" => "Services/MetaData", + "component" => "components/ILIAS/MetaData", "entity" => "md", "ids" => $md_ids ); @@ -73,13 +73,13 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ // service settings $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "service_settings", "ids" => $a_ids); // tile image $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "tile", "ids" => $a_ids); diff --git a/components/ILIAS/Skill/Export/class.ilSkillDataSet.php b/components/ILIAS/Skill/Export/class.ilSkillDataSet.php index 8d14d1646d91..d6d8ecb73a12 100644 --- a/components/ILIAS/Skill/Export/class.ilSkillDataSet.php +++ b/components/ILIAS/Skill/Export/class.ilSkillDataSet.php @@ -616,7 +616,7 @@ public function importRecord( $status = ilSkillTreeNode::STATUS_DRAFT; $order = (int) $a_rec["OrderNr"] + $init_top_order_nr; } else { - $parent = (int) $a_mapping->getMapping("Services/Skill", "skl_tree", $a_rec["Parent"]); + $parent = (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Parent"]); $status = (int) $a_rec["Status"]; $order = (int) $a_rec["OrderNr"]; } @@ -631,7 +631,7 @@ public function importRecord( $scat->setStatus($status); $scat->create(); $tree_node_manager->putIntoTree($scat, $parent); - $a_mapping->addMapping("Services/Skill", "skl_tree", $a_rec["Child"], (string) $scat->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Child"], (string) $scat->getId()); break; case "skll": @@ -644,11 +644,11 @@ public function importRecord( $skll->setStatus($status); $skll->create(); $tree_node_manager->putIntoTree($skll, $parent); - $a_mapping->addMapping("Services/Skill", "skl_tree", $a_rec["Child"], (string) $skll->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Child"], (string) $skll->getId()); break; case "sktr": - $template_id = (int) $a_mapping->getMapping("Services/Skill", "skl_tree", $a_rec["TemplateId"]); + $template_id = (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_tree", $a_rec["TemplateId"]); // only create template references, if referenced template is found (template trees are imported first) if ($template_id > 0) { $sktr = new ilSkillTemplateReference(); @@ -661,7 +661,7 @@ public function importRecord( $sktr->setStatus($status); $sktr->create(); $tree_node_manager->putIntoTree($sktr, $parent); - $a_mapping->addMapping("Services/Skill", "skl_tree", $a_rec["Child"], (string) $sktr->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Child"], (string) $sktr->getId()); } break; } @@ -672,7 +672,7 @@ public function importRecord( $parent = $skill_tree_root_id; $order = (int) $a_rec["OrderNr"] + $init_templ_top_order_nr; } else { - $parent = (int) $a_mapping->getMapping("Services/Skill", "skl_tree", $a_rec["Parent"]); + $parent = (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Parent"]); $order = (int) $a_rec["OrderNr"]; } switch ($a_rec["Type"]) { @@ -684,7 +684,7 @@ public function importRecord( $sctp->setOrderNr($order); $sctp->create(); $tree_node_manager->putIntoTree($sctp, $parent); - $a_mapping->addMapping("Services/Skill", "skl_tree", $a_rec["Child"], (string) $sctp->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Child"], (string) $sctp->getId()); break; case "sktp": @@ -695,13 +695,13 @@ public function importRecord( $sktp->setOrderNr($order); $sktp->create(); $tree_node_manager->putIntoTree($sktp, $parent); - $a_mapping->addMapping("Services/Skill", "skl_tree", $a_rec["Child"], (string) $sktp->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_tree", $a_rec["Child"], (string) $sktp->getId()); break; } break; case "skl_level": - $skill_id = (int) $a_mapping->getMapping("Services/Skill", "skl_tree", $a_rec["SkillId"]); + $skill_id = (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_tree", $a_rec["SkillId"]); $type = ilSkillTreeNode::_lookupType($skill_id); if (in_array($type, array("skll", "sktp"))) { if ($type == "skll") { @@ -723,7 +723,7 @@ public function importRecord( ); $new_profile = $this->skill_manager->getProfileManager()->createProfile($profile); - $a_mapping->addMapping("Services/Skill", "skl_prof", $a_rec["Id"], (string) $new_profile->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_prof", $a_rec["Id"], (string) $new_profile->getId()); break; case "skl_local_prof": @@ -737,13 +737,13 @@ public function importRecord( ); $new_profile = $this->skill_manager->getProfileManager()->createProfile($profile); - $a_mapping->addMapping("Services/Skill", "skl_local_prof", $a_rec["Id"], (string) $new_profile->getId()); + $a_mapping->addMapping("components/ILIAS/Skill", "skl_local_prof", $a_rec["Id"], (string) $new_profile->getId()); break; case "skl_prof_level": - $profile_id = (int) $a_mapping->getMapping("Services/Skill", "skl_prof", $a_rec["ProfileId"]) - ? (int) $a_mapping->getMapping("Services/Skill", "skl_prof", $a_rec["ProfileId"]) - : (int) $a_mapping->getMapping("Services/Skill", "skl_local_prof", $a_rec["ProfileId"]); + $profile_id = (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_prof", $a_rec["ProfileId"]) + ? (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_prof", $a_rec["ProfileId"]) + : (int) $a_mapping->getMapping("components/ILIAS/Skill", "skl_local_prof", $a_rec["ProfileId"]); if ($profile_id > 0) { $level_id_data = ilBasicSkill::getLevelIdForImportId((int) $this->getCurrentInstallationId(), (int) $a_rec["LevelId"]); $skill_data = ilBasicSkill::getCommonSkillIdForImportId((int) $this->getCurrentInstallationId(), (int) $a_rec["BaseSkillId"], (int) $a_rec["TrefId"]); diff --git a/components/ILIAS/Skill/Export/class.ilSkillExporter.php b/components/ILIAS/Skill/Export/class.ilSkillExporter.php index 68e92723f05f..8b113eade8f8 100644 --- a/components/ILIAS/Skill/Export/class.ilSkillExporter.php +++ b/components/ILIAS/Skill/Export/class.ilSkillExporter.php @@ -35,7 +35,7 @@ public function init(): void $this->ds = new ilSkillDataSet(); $this->ds->setExportDirectories($this->dir_relative, $this->dir_absolute); $this->ds->setDSPrefix("ds"); - $this->config = $this->getExport()->getConfig("Services/Skill"); + $this->config = $this->getExport()->getConfig("components/ILIAS/Skill"); $this->ds->setSelectedNodes($this->config->getSelectedNodes()); $this->ds->setSelectedProfiles($this->config->getSelectedProfiles()); $this->ds->setMode($this->config->getMode()); diff --git a/components/ILIAS/Skill/Export/class.ilSkillImporter.php b/components/ILIAS/Skill/Export/class.ilSkillImporter.php index aff2fdd25702..56c69433baff 100644 --- a/components/ILIAS/Skill/Export/class.ilSkillImporter.php +++ b/components/ILIAS/Skill/Export/class.ilSkillImporter.php @@ -34,7 +34,7 @@ public function init(): void $this->ds = new ilSkillDataSet(); $this->ds->setDSPrefix("ds"); - $this->config = $this->getImport()->getConfig("Services/Skill"); + $this->config = $this->getImport()->getConfig("components/ILIAS/Skill"); $this->ds->setSkillTreeId($this->config->getSkillTreeId()); } diff --git a/components/ILIAS/Skill/Level/class.ilSkillLevelTableGUI.php b/components/ILIAS/Skill/Level/class.ilSkillLevelTableGUI.php index 28ae86a8d789..c0081399ea6e 100644 --- a/components/ILIAS/Skill/Level/class.ilSkillLevelTableGUI.php +++ b/components/ILIAS/Skill/Level/class.ilSkillLevelTableGUI.php @@ -88,7 +88,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.skill_level_row.html", "Services/Skill"); + $this->setRowTemplate("tpl.skill_level_row.html", "components/ILIAS/Skill"); $this->setEnableTitle(true); if ($this->tref_id == 0 && !$this->in_use && $this->manage_perm) { diff --git a/components/ILIAS/Skill/Node/class.SkillDeletionManager.php b/components/ILIAS/Skill/Node/class.SkillDeletionManager.php index bbccce4e0c3c..c9f5d59b40b4 100644 --- a/components/ILIAS/Skill/Node/class.SkillDeletionManager.php +++ b/components/ILIAS/Skill/Node/class.SkillDeletionManager.php @@ -151,7 +151,7 @@ protected function deleteSkill(int $skll_id): void $this->material_manager->removeAssignedMaterialsForSkill($skll_id); $this->profile_manager->deleteProfileLevelsForSkill($skll_id); $this->resources_manager->removeResourcesForSkill($skll_id); - $this->event_handler->raise("Services/Skill", "deleteSkill", ["node_id" => $skll_id, "is_reference" => false]); + $this->event_handler->raise("components/ILIAS/Skill", "deleteSkill", ["node_id" => $skll_id, "is_reference" => false]); } protected function deleteSkillCategory(int $scat_id, \ilSkillTree $tree): void @@ -175,7 +175,7 @@ protected function deleteSkillTemplateReference(int $sktr_id): void $this->material_manager->removeAssignedMaterialsForSkill($sktr_id, true); $this->profile_manager->deleteProfileLevelsForSkill($sktr_id, true); $this->resources_manager->removeResourcesForSkill($sktr_id, true); - $this->event_handler->raise("Services/Skill", "deleteSkill", ["node_id" => $sktr_id, "is_reference" => true]); + $this->event_handler->raise("components/ILIAS/Skill", "deleteSkill", ["node_id" => $sktr_id, "is_reference" => true]); } protected function deleteSkillTemplate(int $sktp_id): void @@ -186,7 +186,7 @@ protected function deleteSkillTemplate(int $sktp_id): void $this->material_manager->removeAssignedMaterialsForSkill($sktp_id); $this->profile_manager->deleteProfileLevelsForSkill($sktp_id); $this->resources_manager->removeResourcesForSkill($sktp_id); - $this->event_handler->raise("Services/Skill", "deleteSkill", ["node_id" => $sktp_id, "is_reference" => false]); + $this->event_handler->raise("components/ILIAS/Skill", "deleteSkill", ["node_id" => $sktp_id, "is_reference" => false]); foreach (\ilSkillTemplateReference::_lookupTrefIdsForTemplateId($sktp_id) as $tref_id) { $this->deleteNode($tref_id); diff --git a/components/ILIAS/Skill/Node/class.ilSkillCatTableGUI.php b/components/ILIAS/Skill/Node/class.ilSkillCatTableGUI.php index 7bdb2b08de5c..d05e009d97b4 100644 --- a/components/ILIAS/Skill/Node/class.ilSkillCatTableGUI.php +++ b/components/ILIAS/Skill/Node/class.ilSkillCatTableGUI.php @@ -107,7 +107,7 @@ public function __construct( $this->addColumn($this->lng->txt("title")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.skill_cat_row.html", "Services/Skill"); + $this->setRowTemplate("tpl.skill_cat_row.html", "components/ILIAS/Skill"); if ($this->tref_id == 0 && $this->manage_perm) { $this->addMultiCommand("cutItems", $lng->txt("cut")); diff --git a/components/ILIAS/Skill/Node/class.ilSkillRootGUI.php b/components/ILIAS/Skill/Node/class.ilSkillRootGUI.php index 872a0362f23e..5576182f9bf4 100644 --- a/components/ILIAS/Skill/Node/class.ilSkillRootGUI.php +++ b/components/ILIAS/Skill/Node/class.ilSkillRootGUI.php @@ -193,9 +193,9 @@ public function importSkills(): void $form = $this->initInputForm(); if ($form->checkInput()) { $imp = new ilImport(); - $conf = $imp->getConfig("Services/Skill"); + $conf = $imp->getConfig("components/ILIAS/Skill"); $conf->setSkillTreeId($this->skill_tree_id); - $imp->importEntity($_FILES["import_file"]["tmp_name"], $_FILES["import_file"]["name"], "skmg", "Services/Skill"); + $imp->importEntity($_FILES["import_file"]["tmp_name"], $_FILES["import_file"]["name"], "skmg", "components/ILIAS/Skill"); $this->tpl->setOnScreenMessage('success', $lng->txt("msg_obj_modified"), true); $ilCtrl->redirect($this, "listSkills"); diff --git a/components/ILIAS/Skill/Node/class.ilSkillTreeNodeGUI.php b/components/ILIAS/Skill/Node/class.ilSkillTreeNodeGUI.php index 27ffcf8d41df..34353679dabe 100644 --- a/components/ILIAS/Skill/Node/class.ilSkillTreeNodeGUI.php +++ b/components/ILIAS/Skill/Node/class.ilSkillTreeNodeGUI.php @@ -615,7 +615,7 @@ public function exportSelectedNodes(): void } $exp = new ilExport(); - $conf = $exp->getConfig("Services/Skill"); + $conf = $exp->getConfig("components/ILIAS/Skill"); $conf->setSelectedNodes($this->requested_node_ids); $conf->setSkillTreeId($this->skill_tree_id); $exp->exportObject("skmg", ilObject::_lookupObjId($this->requested_ref_id)); diff --git a/components/ILIAS/Skill/Personal/class.ilPersonalSkillsGUI.php b/components/ILIAS/Skill/Personal/class.ilPersonalSkillsGUI.php index 6acfc12b2467..0309aa5db556 100644 --- a/components/ILIAS/Skill/Personal/class.ilPersonalSkillsGUI.php +++ b/components/ILIAS/Skill/Personal/class.ilPersonalSkillsGUI.php @@ -435,7 +435,7 @@ public function listSkills(): void $main_tpl = $this->tpl; $ilToolbar = $this->toolbar; - $tpl = new ilTemplate("tpl.skill_filter.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_filter.html", true, true, "components/ILIAS/Skill"); $this->setTabs("list_skills"); @@ -513,7 +513,7 @@ public function getSkillHTML( // user interface plugin slot + default rendering $uip = new ilUIHookProcessor( - "Services/Skill", + "components/ILIAS/Skill", "personal_skill_html", array("personal_skills_gui" => $this, "top_skill_id" => $a_top_skill_id, "user_id" => $a_user_id, "edit" => $a_edit, "tref_id" => $a_tref_id) @@ -523,7 +523,7 @@ public function getSkillHTML( $skill_html = $this->renderSkillHTML($a_top_skill_id, $a_user_id, $a_edit, $a_tref_id); } $skill_html = $uip->getHTML($skill_html); - $main_tpl->addJavaScript("./Services/Skill/js/SkillEntries.js"); + $main_tpl->addJavaScript("./components/ILIAS/Skill/js/SkillEntries.js"); return $skill_html; } @@ -546,7 +546,7 @@ public function renderSkillHTML( $user = new ilObjUser($a_user_id); } - $tpl = new ilTemplate("tpl.skill_pres.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_pres.html", true, true, "components/ILIAS/Skill"); $vtree = $this->tree_repo->getVirtualTreeForNodeId($a_top_skill_id); $tref_id = $a_tref_id; @@ -1039,7 +1039,7 @@ public function assignMaterial(): void } // fill template - $mtpl = new ilTemplate("tpl.materials_selection.html", true, true, "Services/Skill"); + $mtpl = new ilTemplate("tpl.materials_selection.html", true, true, "components/ILIAS/Skill"); $mtpl->setVariable("EXP", $exp->getHTML()); // toolbars @@ -1723,7 +1723,7 @@ public function getProfileTargetItem(int $a_profile_id, array $a_levels, int $a_ } } - $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "components/ILIAS/Skill"); $tpl->setVariable("SCALE_BAR", $this->getScaleBar($a_levels, $a_activated_levels)); $tpl->setVariable("TYPE", $lng->txt("skmg_target_level")); @@ -1756,7 +1756,7 @@ public function getActualGapItem(array $a_levels, int $a_tref_id = 0): string $title = ilObject::_lookupTitle($this->gap_mode_obj_id); } - $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "components/ILIAS/Skill"); $tpl->setVariable("SCALE_BAR", $this->getScaleBar($a_levels, $a_activated_levels)); $type = 1; @@ -1794,7 +1794,7 @@ public function getSelfEvalGapItem(array $a_levels, int $a_tref_id = 0): string return ""; } - $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "components/ILIAS/Skill"); $tpl->setVariable("SCALE_BAR", $this->getScaleBar($a_levels, $a_activated_levels)); $type = 3; @@ -1833,7 +1833,7 @@ public function getEvalItem(array $a_levels, array $a_level_entry, bool $is_late $lng = $this->lng; $ilAccess = $this->access; - $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_eval_item.html", true, true, "components/ILIAS/Skill"); $tpl->setVariable("SCALE_BAR", $this->getScaleBar($a_levels, $a_level_entry["level_id"])); $type = Personal\SkillEval::TYPE_APPRAISAL; @@ -1893,7 +1893,7 @@ protected function getLatestEntriesForSkillHTML( ): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.skill_entries_latest.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_entries_latest.html", true, true, "components/ILIAS/Skill"); $user_entries = $skill->getAllHistoricLevelEntriesOfUser($bs["tref"], $user->getId(), $eval_type); $user_entries_filtered = $this->getFilteredEntriesForSkill( @@ -1944,7 +1944,7 @@ protected function getNonLatestEntriesForSkillHTML( ): string { $lng = $this->lng; - $tpl = new ilTemplate("tpl.skill_entries_non_latest.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_entries_non_latest.html", true, true, "components/ILIAS/Skill"); $user_entries = $skill->getAllHistoricLevelEntriesOfUser($bs["tref"], $user->getId(), $eval_type); $user_entries_filtered = $this->getFilteredEntriesForSkill( @@ -2085,7 +2085,7 @@ protected function getAllEntriesWithoutLatest(array $entries): array protected function getSkillEntriesHeader(int $eval_type): string { - $tpl = new ilTemplate("tpl.skill_entries_header.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_entries_header.html", true, true, "components/ILIAS/Skill"); if ($eval_type == ilBasicSkill::EVAL_BY_SELF) { $tpl->setVariable("HEADING", $this->lng->txt("skmg_self_evaluation")); @@ -2103,7 +2103,7 @@ protected function getSkillEntriesHeader(int $eval_type): string protected function getSkillCategoryDescription(int $skill_id, int $tref_id): string { - $tpl = new ilTemplate("tpl.skill_description_category.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_description_category.html", true, true, "components/ILIAS/Skill"); //if (ilSkillTreeNode::_lookupType($skill_id) == "scat") { $des = ilSkillTreeNode::_lookupDescription($skill_id); @@ -2119,7 +2119,7 @@ protected function getSkillCategoryDescription(int $skill_id, int $tref_id): str protected function getBasicSkillDescription(string $description): string { - $tpl = new ilTemplate("tpl.skill_description_basic.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_description_basic.html", true, true, "components/ILIAS/Skill"); if (!empty($description)) { $tpl->setCurrentBlock("description_basic"); @@ -2133,7 +2133,7 @@ protected function getBasicSkillDescription(string $description): string public function getSkillLevelDescription(ilSkillTreeNode $skill): string { $level_data = $skill->getLevelData(); - $tpl = new ilTemplate("tpl.skill_desc.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_desc.html", true, true, "components/ILIAS/Skill"); $desc_exists = false; foreach ($level_data as $l) { @@ -2325,7 +2325,7 @@ public function listAssignedProfile(): void $main_tpl = $this->tpl; - $tpl = new ilTemplate("tpl.skill_filter.html", true, true, "Services/Skill"); + $tpl = new ilTemplate("tpl.skill_filter.html", true, true, "components/ILIAS/Skill"); $this->tabs->clearTargets(); $this->tabs->setBackTarget( diff --git a/components/ILIAS/Skill/Profile/class.ilSkillProfileGUI.php b/components/ILIAS/Skill/Profile/class.ilSkillProfileGUI.php index bb723d9f8c42..f5d26e8c01ab 100644 --- a/components/ILIAS/Skill/Profile/class.ilSkillProfileGUI.php +++ b/components/ILIAS/Skill/Profile/class.ilSkillProfileGUI.php @@ -989,7 +989,7 @@ public function exportProfiles(): void } $exp = new ilExport(); - $conf = $exp->getConfig("Services/Skill"); + $conf = $exp->getConfig("components/ILIAS/Skill"); $conf->setMode(ilSkillExportConfig::MODE_PROFILES); $conf->setSelectedProfiles($profiles_to_export); $conf->setSkillTreeId($this->skill_tree_id); @@ -997,7 +997,7 @@ public function exportProfiles(): void //ilExport::_createExportDirectory(0, "xml", ""); //$export_dir = ilExport::_getExportDirectory($a_id, "xml", $a_type); - //$exp->exportEntity("skprof", $_POST["id"], "", "Services/Skill", $a_title, $a_export_dir, "skprof"); + //$exp->exportEntity("skprof", $_POST["id"], "", "components/ILIAS/Skill", $a_title, $a_export_dir, "skprof"); $ilCtrl->redirectByClass(array("ilobjskilltreegui", "ilexportgui"), ""); } @@ -1041,9 +1041,9 @@ public function importProfiles(): void $form = $this->initInputForm(); if ($form->checkInput()) { $imp = new ilImport(); - $conf = $imp->getConfig("Services/Skill"); + $conf = $imp->getConfig("components/ILIAS/Skill"); $conf->setSkillTreeId($this->skill_tree_id); - $imp->importEntity($_FILES["import_file"]["tmp_name"], $_FILES["import_file"]["name"], "skmg", "Services/Skill"); + $imp->importEntity($_FILES["import_file"]["tmp_name"], $_FILES["import_file"]["name"], "skmg", "components/ILIAS/Skill"); $this->tpl->setOnScreenMessage('success', $lng->txt("msg_obj_modified"), true); $ilCtrl->redirect($this, ""); diff --git a/components/ILIAS/Skill/Profile/class.ilSkillProfileLevelsTableGUI.php b/components/ILIAS/Skill/Profile/class.ilSkillProfileLevelsTableGUI.php index cd8a15fc60eb..8ce6d7eb7046 100644 --- a/components/ILIAS/Skill/Profile/class.ilSkillProfileLevelsTableGUI.php +++ b/components/ILIAS/Skill/Profile/class.ilSkillProfileLevelsTableGUI.php @@ -80,7 +80,7 @@ public function __construct( } $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.skill_profile_level_row.html", "Services/Skill"); + $this->setRowTemplate("tpl.skill_profile_level_row.html", "components/ILIAS/Skill"); if ($access_manager->hasManageProfilesPermission()) { $this->addMultiCommand("confirmLevelAssignmentRemoval", $this->lng->txt("skmg_remove_levels")); diff --git a/components/ILIAS/Skill/classes/class.ilSkillAppEventListener.php b/components/ILIAS/Skill/classes/class.ilSkillAppEventListener.php index 4e91662f28d4..8e20a1a5a84e 100644 --- a/components/ILIAS/Skill/classes/class.ilSkillAppEventListener.php +++ b/components/ILIAS/Skill/classes/class.ilSkillAppEventListener.php @@ -38,7 +38,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ $resource_manager = $DIC->skills()->internal()->manager()->getResourceManager(); switch ($a_component) { - case 'Services/Tracking': + case 'components/ILIAS/Tracking': switch ($a_event) { case 'updateStatus': if ($a_parameter["status"] == ilLPStatus::LP_STATUS_COMPLETED_NUM) { @@ -67,7 +67,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ } break; - case "Services/Object": + case "components/ILIAS/Object": switch ($a_event) { case "beforeDeletion": $handler = new ilSkillObjDeletionHandler($a_parameter["object"]->getId(), $a_parameter["object"]->getType()); diff --git a/components/ILIAS/Skill/test/ilServicesSkillSuite.php b/components/ILIAS/Skill/test/ilServicesSkillSuite.php index 17275ff646c4..b1dfcc40cfdf 100644 --- a/components/ILIAS/Skill/test/ilServicesSkillSuite.php +++ b/components/ILIAS/Skill/test/ilServicesSkillSuite.php @@ -32,12 +32,12 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Skill/test/SkillCategoryTest.php"); - require_once("./Services/Skill/test/SkillInternalFactoryServiceTest.php"); - require_once("./Services/Skill/test/SkillInternalPersonalFactoryTest.php"); - require_once("./Services/Skill/test/SkillInternalProfileFactoryTest.php"); - require_once("./Services/Skill/test/SkillPersonalTest.php"); - require_once("./Services/Skill/test/SkillProfileTest.php"); + require_once("./components/ILIAS/Skill/test/SkillCategoryTest.php"); + require_once("./components/ILIAS/Skill/test/SkillInternalFactoryServiceTest.php"); + require_once("./components/ILIAS/Skill/test/SkillInternalPersonalFactoryTest.php"); + require_once("./components/ILIAS/Skill/test/SkillInternalProfileFactoryTest.php"); + require_once("./components/ILIAS/Skill/test/SkillPersonalTest.php"); + require_once("./components/ILIAS/Skill/test/SkillProfileTest.php"); $suite->addTestSuite(SkillCategoryTest::class); $suite->addTestSuite(SkillInternalFactoryServiceTest::class); $suite->addTestSuite(SkillInternalPersonalFactoryTest::class); diff --git a/components/ILIAS/StudyProgramme/classes/Setup/ilStudyProgrammePCStatusInfoUpdateSteps.php b/components/ILIAS/StudyProgramme/classes/Setup/ilStudyProgrammePCStatusInfoUpdateSteps.php index 734ec0cf5ef1..9527f3f047ef 100644 --- a/components/ILIAS/StudyProgramme/classes/Setup/ilStudyProgrammePCStatusInfoUpdateSteps.php +++ b/components/ILIAS/StudyProgramme/classes/Setup/ilStudyProgrammePCStatusInfoUpdateSteps.php @@ -46,4 +46,15 @@ public function step_2(): void $this->db->manipulate($query); } } + + public function step_3(): void + { + if ($this->db->tableExists("copg_pc_def")) { + $query = "UPDATE " . self::TABLE_NAME . " SET " . PHP_EOL + . " component = REPLACE(component, 'Services', 'components/ILIAS') " . PHP_EOL + . " WHERE component LIKE ('Services/%')"; + + $this->db->manipulate($query); + } + } } diff --git a/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgramme.php b/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgramme.php index 36c3df53d0ac..68fdc88383e2 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgramme.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgramme.php @@ -1477,14 +1477,14 @@ protected function updateLastChange(): void * Set all progresses to completed where the object with given id is a leaf * and that belong to the user. * - * This is exclusively called via event "Services/Tracking, updateStatus" (onServiceTrackingUpdateStatus) + * This is exclusively called via event "components/ILIAS/Tracking, updateStatus" (onServiceTrackingUpdateStatus) */ public static function setProgressesCompletedFor(int $obj_id, int $user_id): void { // We only use courses via crs_refs $type = ilObject::_lookupType($obj_id); if ($type === "crsr") { - require_once("Services/ContainerReference/classes/class.ilContainerReference.php"); + require_once("components/ILIAS/ContainerReference/classes/class.ilContainerReference.php"); $crs_reference_obj_ids = ilContainerReference::_lookupSourceIds($obj_id); foreach ($crs_reference_obj_ids as $crs_reference_obj_id) { foreach (ilObject::_getAllReferences($crs_reference_obj_id) as $ref_id) { diff --git a/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoMembershipsGUI.php b/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoMembershipsGUI.php index 7d05ed9c247e..43e5b4240e3d 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoMembershipsGUI.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoMembershipsGUI.php @@ -105,7 +105,7 @@ public function __construct( // Add this js manually here because the modal contains a form that is // loaded asynchronously later on, and this JS won't be pulled then for // some reason. - $tpl->addJavaScript("Services/Form/js/Form.js"); + $tpl->addJavaScript("components/ILIAS/Form/js/Form.js"); } public function executeCommand(): void { diff --git a/components/ILIAS/StudyProgramme/classes/class.ilObjectFactoryWrapper.php b/components/ILIAS/StudyProgramme/classes/class.ilObjectFactoryWrapper.php index 96db882efbcc..1058dfd8fe2a 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilObjectFactoryWrapper.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilObjectFactoryWrapper.php @@ -18,7 +18,7 @@ * *********************************************************************/ -require_once("./Services/Object/classes/class.ilObjectFactory.php"); +require_once("./components/ILIAS/Object/classes/class.ilObjectFactory.php"); /** * Class ilObjectFactoryWrapper. diff --git a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeAppEventListener.php b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeAppEventListener.php index 5ee3ba60eb86..d9d095d03edf 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeAppEventListener.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeAppEventListener.php @@ -39,21 +39,21 @@ public static function handleEvent(string $component, string $event, array $para global $DIC; switch ($component) { - case "Services/User": + case "components/ILIAS/User": switch ($event) { case "deleteUser": self::onServiceUserDeleteUser($parameter); break; } break; - case "Services/Tracking": + case "components/ILIAS/Tracking": switch ($event) { case "updateStatus": self::onServiceTrackingUpdateStatus($parameter); break; } break; - case "Services/Tree": + case "components/ILIAS/Tree": switch ($event) { case "insertNode": self::onServiceTreeInsertNode($parameter); @@ -63,7 +63,7 @@ public static function handleEvent(string $component, string $event, array $para break; } break; - case "Services/Object": + case "components/ILIAS/Object": switch ($event) { case "delete": case "toTrash": @@ -71,7 +71,7 @@ public static function handleEvent(string $component, string $event, array $para break; } break; - case "Services/ContainerReference": + case "components/ILIAS/ContainerReference": switch ($event) { case "deleteReference": self::onServiceObjectDeleteOrToTrash($parameter); @@ -111,7 +111,7 @@ public static function handleEvent(string $component, string $event, array $para break; } break; - case "Services/AccessControl": + case "components/ILIAS/AccessControl": switch ($event) { case "assignUser": self::addMemberToProgrammes( diff --git a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeDashboardViewGUI.php b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeDashboardViewGUI.php index f24c2aad3900..46b1c989cfb8 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeDashboardViewGUI.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeDashboardViewGUI.php @@ -20,7 +20,7 @@ use ILIAS\UI\Component\Item\Item; use ILIAS\UI\Component\Button\Shy; -use ILIAS\Services\Dashboard\Block\BlockDTO; +use ILIAS\components\Dashboard\Block\BlockDTO; class ilStudyProgrammeDashboardViewGUI extends ilDashboardBlockGUI { diff --git a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeExpandableProgressListGUI.php b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeExpandableProgressListGUI.php index d73eaf96c20e..b511db1481db 100644 --- a/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeExpandableProgressListGUI.php +++ b/components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeExpandableProgressListGUI.php @@ -268,7 +268,7 @@ protected function addJavaScript() } iljQueryUtil::initjQueryUI(); - $this->tpl->addJavaScript("./Services/Accordion/js/accordion.js", true, 3); + $this->tpl->addJavaScript("./components/ILIAS/Accordion/js/accordion.js", true, 3); $this->js_added = true; } diff --git a/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncContainerSelectionExplorer.php b/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncContainerSelectionExplorer.php index cf37433ea066..64dae0a15404 100644 --- a/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncContainerSelectionExplorer.php +++ b/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncContainerSelectionExplorer.php @@ -63,7 +63,7 @@ public static function addJavascript(): void global $DIC; $tpl = $DIC['tpl']; - $tpl->addJavaScript("./Services/UIComponent/Explorer/js/ilExplorer.js"); + $tpl->addJavaScript("./components/ILIAS/UIComponent/Explorer/js/ilExplorer.js"); } /** diff --git a/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncPropertyFormGUI.php b/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncPropertyFormGUI.php index a6f23dcc4a0b..e94467d1d270 100644 --- a/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncPropertyFormGUI.php +++ b/components/ILIAS/StudyProgramme/classes/helpers/class.ilAsyncPropertyFormGUI.php @@ -148,7 +148,7 @@ public static function getErrorMessageTemplate(): string global $DIC; $lng = $DIC['lng']; - $tpl = new ilTemplate("tpl.property_form.html", true, true, "Services/Form"); + $tpl = new ilTemplate("tpl.property_form.html", true, true, "components/ILIAS/Form"); $tpl->setCurrentBlock("alert"); // TODO: DW -> refactor getImagePath diff --git a/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsRepositoryTest.php b/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsRepositoryTest.php index 050d124b8fdf..8ec7cb36dbce 100644 --- a/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsRepositoryTest.php +++ b/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsRepositoryTest.php @@ -33,7 +33,7 @@ protected function setUp(): void global $DIC; if (!$DIC) { try { - include_once("./Services/PHPUnit/classes/class.ilUnitUtil.php"); + include_once("./components/ILIAS/PHPUnit/classes/class.ilUnitUtil.php"); ilUnitUtil::performInitialisation(); } catch (Exception $e) { } diff --git a/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsTest.php b/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsTest.php index d0af9eb5c642..a15009864002 100644 --- a/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsTest.php +++ b/components/ILIAS/StudyProgramme/test/model/Settings/ilStudyProgrammeSettingsTest.php @@ -13,7 +13,7 @@ public function setUp(): void global $DIC; if (!$DIC) { - include_once("./Services/PHPUnit/classes/class.ilUnitUtil.php"); + include_once("./components/ILIAS/PHPUnit/classes/class.ilUnitUtil.php"); try { ilUnitUtil::performInitialisation(); } catch (\Exception $e) { diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundImageInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundImageInputGUI.php index cefb885a6259..b153c9204298 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundImageInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundImageInputGUI.php @@ -91,7 +91,7 @@ public function getInput(): array public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate("tpl.prop_background_image.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_background_image.html", true, true, "components/ILIAS/Style/Content"); $tpl->setVariable("POSTVAR", $this->getPostVar()); diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundPositionInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundPositionInputGUI.php index 8c6cee171011..bbe61a46b26b 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundPositionInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilBackgroundPositionInputGUI.php @@ -142,12 +142,12 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $layout_tpl = new ilTemplate("tpl.prop_hv_layout.html", true, true, "Services/Style/Content"); + $layout_tpl = new ilTemplate("tpl.prop_hv_layout.html", true, true, "components/ILIAS/Style/Content"); foreach ($this->dirs as $dir) { $value = ""; $current_unit = ""; - $tpl = new ilTemplate("tpl.prop_background_position.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_background_position.html", true, true, "components/ILIAS/Style/Content"); $unit_options = ilObjStyleSheet::_getStyleParameterNumericUnits(); $pre_options = ilObjStyleSheet::_getStyleParameterValues("background-position"); $pre_options = $pre_options[$dir]; diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilFontSizeInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilFontSizeInputGUI.php index e72bf264ee3e..86f300be39bb 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilFontSizeInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilFontSizeInputGUI.php @@ -90,7 +90,7 @@ public function getInput(): array public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate("tpl.prop_fontsize.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_fontsize.html", true, true, "components/ILIAS/Style/Content"); $tpl->setVariable("POSTVAR", $this->getPostVar()); $current_unit = ""; diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilNumericStyleValueInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilNumericStyleValueInputGUI.php index 86372f1ef36f..cd44cb4d785f 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilNumericStyleValueInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilNumericStyleValueInputGUI.php @@ -93,7 +93,7 @@ public function getInput(): array public function insert(ilTemplate $a_tpl): void { - $tpl = new ilTemplate("tpl.prop_style_numeric.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_style_numeric.html", true, true, "components/ILIAS/Style/Content"); $tpl->setVariable("POSTVAR", $this->getPostVar()); diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderStyleInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderStyleInputGUI.php index 1ef6cc4b2fd5..7386457c31d1 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderStyleInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderStyleInputGUI.php @@ -143,10 +143,10 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; $value = ""; - $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "Services/Style/Content"); + $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "components/ILIAS/Style/Content"); foreach ($this->dirs as $dir) { - $tpl = new ilTemplate("tpl.prop_trbl_select.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_trbl_select.html", true, true, "components/ILIAS/Style/Content"); $pre_options = array_merge( array("" => ""), ilObjStyleSheet::_getStyleParameterValues("border-style") diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderWidthInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderWidthInputGUI.php index 2e52ceb43470..9f333267f88e 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderWidthInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLBorderWidthInputGUI.php @@ -161,10 +161,10 @@ public function insert(ilTemplate $a_tpl): void $lng = $this->lng; $value = ""; $current_unit = ""; - $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "Services/Style/Content"); + $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "components/ILIAS/Style/Content"); foreach ($this->dirs as $dir) { - $tpl = new ilTemplate("tpl.prop_trbl_border_width.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_trbl_border_width.html", true, true, "components/ILIAS/Style/Content"); $unit_options = ilObjStyleSheet::_getStyleParameterNumericUnits(); $pre_options = ilObjStyleSheet::_getStyleParameterValues("border-width"); diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLColorPickerInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLColorPickerInputGUI.php index a7831fc16e4b..1894ae400a15 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLColorPickerInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLColorPickerInputGUI.php @@ -177,7 +177,7 @@ public function insert(ilTemplate $a_tpl): void { $lng = $this->lng; - $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "Services/Style/Content"); + $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "components/ILIAS/Style/Content"); $funcs = array( "all" => "getAllValue", "top" => "getTopValue", @@ -191,7 +191,7 @@ public function insert(ilTemplate $a_tpl): void $value = strtoupper($value); } - $tpl = new ilTemplate('tpl.prop_color.html', true, true, 'Services/Form'); + $tpl = new ilTemplate('tpl.prop_color.html', true, true, 'components/ILIAS/Form'); $tpl->setVariable('COLOR_ID', $this->getFieldId() . "_" . $dir); $ic = ilColorPickerInputGUI::determineHexcode($value); if ($ic == "") { diff --git a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLNumericStyleValueInputGUI.php b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLNumericStyleValueInputGUI.php index d2788ae82665..28fcbe1f6cab 100644 --- a/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLNumericStyleValueInputGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/Inputs/class.ilTRBLNumericStyleValueInputGUI.php @@ -162,10 +162,10 @@ public function insert(ilTemplate $a_tpl): void $lng = $this->lng; $value = ""; - $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "Services/Style/Content"); + $layout_tpl = new ilTemplate("tpl.prop_trbl_layout.html", true, true, "components/ILIAS/Style/Content"); foreach ($this->dirs as $dir) { - $tpl = new ilTemplate("tpl.prop_trbl_style_numeric.html", true, true, "Services/Style/Content"); + $tpl = new ilTemplate("tpl.prop_trbl_style_numeric.html", true, true, "components/ILIAS/Style/Content"); $unit_options = ilObjStyleSheet::_getStyleParameterNumericUnits(!$this->getAllowPercentage()); switch ($dir) { diff --git a/components/ILIAS/Style/Content/Characteristic/class.CharacteristicTableGUI.php b/components/ILIAS/Style/Content/Characteristic/class.CharacteristicTableGUI.php index f12d7406989b..f4c66fc5bd61 100644 --- a/components/ILIAS/Style/Content/Characteristic/class.CharacteristicTableGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/class.CharacteristicTableGUI.php @@ -96,7 +96,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions")); $this->setEnableHeader(true); $this->setFormAction($ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.style_row.html", "Services/Style/Content/Characteristic"); + $this->setRowTemplate("tpl.style_row.html", "components/ILIAS/Style/Content/Characteristic"); $this->disable("footer"); if ($this->access_manager->checkWrite()) { diff --git a/components/ILIAS/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php b/components/ILIAS/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php index 7e863f090414..9dfc9a3e27c5 100644 --- a/components/ILIAS/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php +++ b/components/ILIAS/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php @@ -704,7 +704,7 @@ protected function outputTagStyleEditScreen(ilPropertyFormGUI $form): void ilObjStyleSheet::getContentStylePath($this->object->getId()) ); - $ts_tpl = new ilTemplate("tpl.style_tag_edit.html", true, true, "Services/Style/Content"); + $ts_tpl = new ilTemplate("tpl.style_tag_edit.html", true, true, "components/ILIAS/Style/Content"); $ts_tpl->setVariable( "EXAMPLE", diff --git a/components/ILIAS/Style/Content/Color/class.ilStyleColorTableGUI.php b/components/ILIAS/Style/Content/Color/class.ilStyleColorTableGUI.php index 869468421a9b..3b152d145b8a 100644 --- a/components/ILIAS/Style/Content/Color/class.ilStyleColorTableGUI.php +++ b/components/ILIAS/Style/Content/Color/class.ilStyleColorTableGUI.php @@ -62,7 +62,7 @@ public function __construct( $this->addColumn($this->lng->txt("sty_commands"), "", "1"); $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.style_color_row.html", "Services/Style/Content"); + $this->setRowTemplate("tpl.style_color_row.html", "components/ILIAS/Style/Content"); //$this->setSelectAllCheckbox("file"); $this->getItems(); diff --git a/components/ILIAS/Style/Content/Images/class.ilStyleImageTableGUI.php b/components/ILIAS/Style/Content/Images/class.ilStyleImageTableGUI.php index 351c715244fc..7e4d486c5d9d 100644 --- a/components/ILIAS/Style/Content/Images/class.ilStyleImageTableGUI.php +++ b/components/ILIAS/Style/Content/Images/class.ilStyleImageTableGUI.php @@ -69,7 +69,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions")); $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.style_image_row.html", "Services/Style/Content/Images"); + $this->setRowTemplate("tpl.style_image_row.html", "components/ILIAS/Style/Content/Images"); $this->setSelectAllCheckbox("file"); $this->getItems(); diff --git a/components/ILIAS/Style/Content/classes/class.ilContentStylesTableGUI.php b/components/ILIAS/Style/Content/classes/class.ilContentStylesTableGUI.php index e771ff25f819..72f80526248a 100644 --- a/components/ILIAS/Style/Content/classes/class.ilContentStylesTableGUI.php +++ b/components/ILIAS/Style/Content/classes/class.ilContentStylesTableGUI.php @@ -66,7 +66,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.content_style_row.html", "Services/Style/Content"); + $this->setRowTemplate("tpl.content_style_row.html", "components/ILIAS/Style/Content"); if ($this->parent_obj->checkPermission("sty_write_content", false)) { $this->addMultiCommand("deleteStyle", $lng->txt("delete")); $this->addCommandButton("saveActiveStyles", $lng->txt("sty_save_active_styles")); diff --git a/components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php b/components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php index c837506d1546..e6bb8b115e27 100644 --- a/components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php +++ b/components/ILIAS/Style/Content/classes/class.ilObjStyleSheet.php @@ -1603,23 +1603,23 @@ public static function getContentStylePath( return $path; } else { // todo: work this out - return "./Services/COPage/css/content.css"; + return "./components/ILIAS/COPage/css/content.css"; } } public static function getContentPrintStyle(): string { - return "./Services/COPage/css/print_content.css"; + return "./components/ILIAS/COPage/css/print_content.css"; } public static function getSyntaxStylePath(): string { - return "./Services/COPage/css/syntaxhighlight.css"; + return "./components/ILIAS/COPage/css/syntaxhighlight.css"; } public static function getPlaceHolderStylePath(): string { - return "./Services/COPage/css/placeholder.css"; + return "./components/ILIAS/COPage/css/placeholder.css"; } public function update(): bool diff --git a/components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php b/components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php index a1166f35d3b5..dcb21ab884bf 100644 --- a/components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php +++ b/components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php @@ -439,7 +439,7 @@ public function saveObject(): void ilObjStyleSheet::getBasicZipPath(), "style.zip", "sty", - "Services/Style", + "components/ILIAS/Style", true ); @@ -698,7 +698,7 @@ public static function getStyleExampleHTML( $c = explode(":", $a_class); $a_class = $c[0]; - $ex_tpl = new ilTemplate("tpl.style_example.html", true, true, "Services/Style/Content"); + $ex_tpl = new ilTemplate("tpl.style_example.html", true, true, "components/ILIAS/Style/Content"); if ($ex_tpl->blockExists("Example_" . $a_type)) { $ex_tpl->setCurrentBlock("Example_" . $a_type); @@ -1460,7 +1460,7 @@ public function displayTemplateEditForm(): void "tpl.template_edit.html", true, true, - "Services/Style/Content" + "components/ILIAS/Style/Content" ); $this->includeCSS(); $a_tpl->setVariable("FORM", $this->form_gui->getHTML()); diff --git a/components/ILIAS/Style/Content/classes/class.ilPasteStyleCharacteristicTableGUI.php b/components/ILIAS/Style/Content/classes/class.ilPasteStyleCharacteristicTableGUI.php index 2b8dadd24280..efbfaf83d8ae 100644 --- a/components/ILIAS/Style/Content/classes/class.ilPasteStyleCharacteristicTableGUI.php +++ b/components/ILIAS/Style/Content/classes/class.ilPasteStyleCharacteristicTableGUI.php @@ -61,7 +61,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.paste_style_row.html", "Services/Style/Content"); + $this->setRowTemplate("tpl.paste_style_row.html", "components/ILIAS/Style/Content"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/Style/Content/classes/class.ilStyleMediaQueryTableGUI.php b/components/ILIAS/Style/Content/classes/class.ilStyleMediaQueryTableGUI.php index 2cc99e0c4434..58a0d7ab3d0b 100644 --- a/components/ILIAS/Style/Content/classes/class.ilStyleMediaQueryTableGUI.php +++ b/components/ILIAS/Style/Content/classes/class.ilStyleMediaQueryTableGUI.php @@ -59,7 +59,7 @@ public function __construct( $this->addColumn($this->lng->txt("actions"), ""); $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.style_media_query_row.html", "Services/Style/Content"); + $this->setRowTemplate("tpl.style_media_query_row.html", "components/ILIAS/Style/Content"); //$this->setSelectAllCheckbox("file"); $this->getItems(); diff --git a/components/ILIAS/Style/Content/classes/class.ilTableTemplatesTableGUI.php b/components/ILIAS/Style/Content/classes/class.ilTableTemplatesTableGUI.php index ea76723ba3e3..af122dbac51d 100644 --- a/components/ILIAS/Style/Content/classes/class.ilTableTemplatesTableGUI.php +++ b/components/ILIAS/Style/Content/classes/class.ilTableTemplatesTableGUI.php @@ -64,7 +64,7 @@ public function __construct( $this->addColumn($this->lng->txt("sty_commands"), "", "1"); $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.style_template_row.html", "Services/Style/Content"); + $this->setRowTemplate("tpl.style_template_row.html", "components/ILIAS/Style/Content"); $this->getItems(); // action commands diff --git a/components/ILIAS/Style/Content/test/ilServicesStyleContentSuite.php b/components/ILIAS/Style/Content/test/ilServicesStyleContentSuite.php index d111256497d1..5fec401415d9 100644 --- a/components/ILIAS/Style/Content/test/ilServicesStyleContentSuite.php +++ b/components/ILIAS/Style/Content/test/ilServicesStyleContentSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Style/Content/test/ContentStyleStandardGUIRequestTest.php"); + require_once("./components/ILIAS/Style/Content/test/ContentStyleStandardGUIRequestTest.php"); $suite->addTestSuite("ContentStyleStandardGUIRequestTest"); return $suite; diff --git a/components/ILIAS/Style/System/classes/Config/class.ilSubStyleAssignmentGUI.php b/components/ILIAS/Style/System/classes/Config/class.ilSubStyleAssignmentGUI.php index 7f37cd9c944c..a8e23ec7ab2d 100644 --- a/components/ILIAS/Style/System/classes/Config/class.ilSubStyleAssignmentGUI.php +++ b/components/ILIAS/Style/System/classes/Config/class.ilSubStyleAssignmentGUI.php @@ -86,7 +86,7 @@ public function assignStyle(ilSkin $skin, ilSkinStyle $substyle): void */ public function addAssignment(): void { - include_once 'Services/Search/classes/class.ilSearchRootSelector.php'; + include_once 'components/ILIAS/Search/classes/class.ilSearchRootSelector.php'; $exp = new ilSearchRootSelector( $this->ctrl->getLinkTarget($this->getParentGui(), 'addStyleCatAssignment') ); diff --git a/components/ILIAS/Style/System/classes/Config/class.ilSysStyleCatAssignmentTableGUI.php b/components/ILIAS/Style/System/classes/Config/class.ilSysStyleCatAssignmentTableGUI.php index 9aecfdd791e2..09d960727782 100644 --- a/components/ILIAS/Style/System/classes/Config/class.ilSysStyleCatAssignmentTableGUI.php +++ b/components/ILIAS/Style/System/classes/Config/class.ilSysStyleCatAssignmentTableGUI.php @@ -49,7 +49,7 @@ public function __construct( $this->addColumn($this->lng->txt('obj_cat')); $this->setFormAction($DIC->ctrl()->getFormAction($a_parent_obj)); - $this->setRowTemplate('tpl.sty_cat_ass_row.html', 'Services/Style/System'); + $this->setRowTemplate('tpl.sty_cat_ass_row.html', 'components/ILIAS/Style/System'); $this->addMultiCommand('deleteAssignments', $DIC->language()->txt('remove_assignment')); } diff --git a/components/ILIAS/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php b/components/ILIAS/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php index 9798eb1b73e6..1d5cbd5ac627 100644 --- a/components/ILIAS/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php +++ b/components/ILIAS/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php @@ -31,8 +31,8 @@ class ilSystemStyleDocumentationGUI protected ILIAS\UI\Renderer $r; public const SHOW_TREE = 'system_styles_show_tree'; - public const DATA_PATH = './Services/Style/System/data/data.php'; - public const ROOT_FACTORY_PATH = './Services/Style/System/data/abstractDataFactory.php'; + public const DATA_PATH = './components/ILIAS/Style/System/data/data.php'; + public const ROOT_FACTORY_PATH = './components/ILIAS/Style/System/data/abstractDataFactory.php'; public function __construct( ilGlobalTemplateInterface $tpl, diff --git a/components/ILIAS/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php b/components/ILIAS/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php index 76bd21274819..df8265d95b16 100644 --- a/components/ILIAS/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php +++ b/components/ILIAS/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php @@ -461,7 +461,7 @@ protected function cloneSystemStyleForm(): ilPropertyFormGUI protected function getCreationFormsHTML(array $a_forms): string { - include_once('./Services/Accordion/classes/class.ilAccordionGUI.php'); + include_once('./components/ILIAS/Accordion/classes/class.ilAccordionGUI.php'); $acc = new ilAccordionGUI(); $acc->setBehaviour(ilAccordionGUI::FIRST_OPEN); @@ -470,7 +470,7 @@ protected function getCreationFormsHTML(array $a_forms): string /** * @var ilPropertyFormGUI $cf */ - $htpl = new ilTemplate('tpl.creation_acc_head.html', true, true, 'Services/Object'); + $htpl = new ilTemplate('tpl.creation_acc_head.html', true, true, 'components/ILIAS/Object'); // using custom form titles (used for repository plugins) $form_title = ''; diff --git a/components/ILIAS/Style/System/classes/Overview/class.ilSystemStylesTableGUI.php b/components/ILIAS/Style/System/classes/Overview/class.ilSystemStylesTableGUI.php index 18f2b4bd7c48..3fee50db6782 100644 --- a/components/ILIAS/Style/System/classes/Overview/class.ilSystemStylesTableGUI.php +++ b/components/ILIAS/Style/System/classes/Overview/class.ilSystemStylesTableGUI.php @@ -47,7 +47,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd = '') $this->addColumn($this->lng->txt('active')); $this->addColumn($this->lng->txt('users'), 'users'); $this->addColumn($this->lng->txt('version')); - $this->setRowTemplate('tpl.sys_styles_row.html', 'Services/Style/System'); + $this->setRowTemplate('tpl.sys_styles_row.html', 'components/ILIAS/Style/System'); $this->setEnableHeader(true); } @@ -62,7 +62,7 @@ public function addActions($management_enabled, bool $read_documentation = true) $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); $this->addCommandButton('saveStyleSettings', $this->lng->txt('save')); - $this->setRowTemplate('tpl.sys_styles_row_with_actions.html', 'Services/Style/System'); + $this->setRowTemplate('tpl.sys_styles_row_with_actions.html', 'components/ILIAS/Style/System'); if ($read_documentation || $management_enabled) { $this->setWithActions(true); diff --git a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleColorExceptionTest.php b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleColorExceptionTest.php index 6b73b6152c32..f6827af1ff0c 100644 --- a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleColorExceptionTest.php +++ b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleColorExceptionTest.php @@ -19,7 +19,7 @@ declare(strict_types=1); require_once('libs/composer/vendor/autoload.php'); -include_once('Services/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); +include_once('components/ILIAS/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); class ilSystemStyleColorExceptionTest extends ilSystemStyleExceptionBaseUnit { diff --git a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleIconExceptionTest.php b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleIconExceptionTest.php index 9f72c18f5028..5617ee00cae3 100644 --- a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleIconExceptionTest.php +++ b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleIconExceptionTest.php @@ -19,7 +19,7 @@ declare(strict_types=1); require_once('libs/composer/vendor/autoload.php'); -include_once('Services/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); +include_once('components/ILIAS/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); class ilSystemStyleIconExceptionTest extends ilSystemStyleExceptionBaseUnit { diff --git a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleMessageStackExceptionTest.php b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleMessageStackExceptionTest.php index d40121dd7ec2..7b2309350b0a 100644 --- a/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleMessageStackExceptionTest.php +++ b/components/ILIAS/Style/System/test/Exceptions/ilSystemStyleMessageStackExceptionTest.php @@ -19,7 +19,7 @@ declare(strict_types=1); require_once('libs/composer/vendor/autoload.php'); -include_once('Services/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); +include_once('components/ILIAS/Style/System/test/Exceptions/ilSystemStyleExceptionBaseUnit.php'); class ilSystemStyleMessageStackExceptionTest extends ilSystemStyleExceptionBaseUnit { diff --git a/components/ILIAS/Style/System/test/fixtures/mocks/ilSystemStyleConfigMock.php b/components/ILIAS/Style/System/test/fixtures/mocks/ilSystemStyleConfigMock.php index 33417797880c..a1d8e2a00a5c 100644 --- a/components/ILIAS/Style/System/test/fixtures/mocks/ilSystemStyleConfigMock.php +++ b/components/ILIAS/Style/System/test/fixtures/mocks/ilSystemStyleConfigMock.php @@ -10,14 +10,14 @@ class ilSystemStyleConfigMock extends ilSystemStyleConfig { protected string $default_skin_id = 'defaultSkin'; protected string $default_style_id = 'defaultStyle'; - protected string $default_template_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/template.xml'; - protected string $delos_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/defaultStyle'; - protected string $rel_delos_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/defaultStyle'; - protected string $default_settings_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/010-settings'; - protected string $default_images_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/images/'; - protected string $default_fonts_path = './Services/Style/System/test/fixtures/skins_temp/defaultSkin/fonts/'; + protected string $default_template_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/template.xml'; + protected string $delos_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/defaultStyle'; + protected string $rel_delos_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/defaultStyle'; + protected string $default_settings_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/010-settings'; + protected string $default_images_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/images/'; + protected string $default_fonts_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/defaultSkin/fonts/'; protected string $default_sounds_path = ''; - protected string $customizing_skin_path = './Services/Style/System/test/fixtures/skins_temp/customSkins/'; - public string $test_skin_original_path = './Services/Style/System/test/fixtures/skins/'; - public string $test_skin_temp_path = './Services/Style/System/test/fixtures/skins_temp/'; + protected string $customizing_skin_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/customSkins/'; + public string $test_skin_original_path = './components/ILIAS/Style/System/test/fixtures/skins/'; + public string $test_skin_temp_path = './components/ILIAS/Style/System/test/fixtures/skins_temp/'; } diff --git a/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style1/style1.scss b/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style1/style1.scss index b9160db55a5d..9832162f2a55 100644 --- a/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style1/style1.scss +++ b/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style1/style1.scss @@ -1,3 +1,3 @@ -@import "./Services/Style/System/tests/fixtures/skins/defaultSkin/defaultStyle"; +@import "./components/ILIAS/Style/System/tests/fixtures/skins/defaultSkin/defaultStyle"; // Import Custom Less Files here @import "style1css-variables.scss"; diff --git a/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style2/style2.scss b/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style2/style2.scss index f5b2defca092..09a69683a02f 100644 --- a/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style2/style2.scss +++ b/components/ILIAS/Style/System/test/fixtures/skins/customSkins/skin1/style2/style2.scss @@ -1,3 +1,3 @@ -@import "./Services/Style/System/tests/fixtures/skins/defaultSkin/defaultStyle"; +@import "./components/ILIAS/Style/System/tests/fixtures/skins/defaultSkin/defaultStyle"; // Import Custom Less Files here @import "style2css-variables.scss"; diff --git a/components/ILIAS/Style/System/test/ilServicesStyleSystemSuite.php b/components/ILIAS/Style/System/test/ilServicesStyleSystemSuite.php index 51f0e55d3588..7529368d467b 100644 --- a/components/ILIAS/Style/System/test/ilServicesStyleSystemSuite.php +++ b/components/ILIAS/Style/System/test/ilServicesStyleSystemSuite.php @@ -26,7 +26,7 @@ public static function suite(): TestSuite { $suite = new ilServicesStyleSystemSuite(); - $base_dir = './Services/Style/System/test/'; + $base_dir = './components/ILIAS/Style/System/test/'; $rec_it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($base_dir)); foreach ($rec_it as $file) { diff --git a/components/ILIAS/Style/classes/class.ilStyleDataSet.php b/components/ILIAS/Style/classes/class.ilStyleDataSet.php index 4449dbdfe223..b7639a6e5044 100644 --- a/components/ILIAS/Style/classes/class.ilStyleDataSet.php +++ b/components/ILIAS/Style/classes/class.ilStyleDataSet.php @@ -419,7 +419,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI switch ($a_entity) { case "sty": $this->log->debug("Entity: " . $a_entity); - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjStyleSheet(); @@ -431,8 +431,8 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI $newObj->update(true); $this->current_obj = $newObj; - $a_mapping->addMapping("Services/Style", "sty", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Style", "sty", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); $this->log->debug("Added mapping Services/Style sty " . $a_rec["Id"] . " > " . $newObj->getId()); $dir = str_replace("..", "", $a_rec["ImagesDir"]); @@ -452,7 +452,7 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI break; case "sty_parameter": - $mq_id = (int) $a_mapping->getMapping("Services/Style", "media_query", $a_rec["MqId"]); + $mq_id = (int) $a_mapping->getMapping("components/ILIAS/Style", "media_query", $a_rec["MqId"]); $characteristic_manager->replaceParameter($a_rec["Tag"], $a_rec["Class"], $a_rec["Parameter"], $a_rec["Value"], $a_rec["Type"], $mq_id, $a_rec["Custom"]); break; @@ -462,22 +462,22 @@ public function importRecord(string $a_entity, array $a_types, array $a_rec, ilI case "sty_media_query": $mq_id = $this->current_obj->addMediaQuery($a_rec["MQuery"], $a_rec["OrderNr"]); - $a_mapping->addMapping("Services/Style", "media_query", $a_rec["Id"], $mq_id); + $a_mapping->addMapping("components/ILIAS/Style", "media_query", $a_rec["Id"], $mq_id); break; case "sty_template": $tid = $this->current_obj->addTemplate($a_rec["TempType"], $a_rec["Name"], array()); - $a_mapping->addMapping("Services/Style", "template", $a_rec["Id"], $tid); + $a_mapping->addMapping("components/ILIAS/Style", "template", $a_rec["Id"], $tid); break; case "sty_template_class": - $tid = (int) $a_mapping->getMapping("Services/Style", "template", $a_rec["TemplateId"]); + $tid = (int) $a_mapping->getMapping("components/ILIAS/Style", "template", $a_rec["TemplateId"]); $this->current_obj->addTemplateClass($tid, $a_rec["ClassType"], $a_rec["Class"]); break; case "sty_usage": - $obj_id = (int) $a_mapping->getMapping("Services/Object", "obj", $a_rec["ObjId"]); - $style_id = (int) $a_mapping->getMapping("Services/Style", "sty", $a_rec["StyleId"]); + $obj_id = (int) $a_mapping->getMapping("components/ILIAS/Object", "obj", $a_rec["ObjId"]); + $style_id = (int) $a_mapping->getMapping("components/ILIAS/Style", "sty", $a_rec["StyleId"]); if ($obj_id > 0 && $style_id > 0) { ilObjStyleSheet::writeStyleUsage($obj_id, $style_id); ilObjStyleSheet::writeOwner($obj_id, $style_id); diff --git a/components/ILIAS/Style/classes/class.ilStyleImporter.php b/components/ILIAS/Style/classes/class.ilStyleImporter.php index e9985558421e..8790223071f6 100644 --- a/components/ILIAS/Style/classes/class.ilStyleImporter.php +++ b/components/ILIAS/Style/classes/class.ilStyleImporter.php @@ -84,6 +84,6 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ } } - $a_mapping->addMapping("Services/Style", "sty", $a_id, $new_id); + $a_mapping->addMapping("components/ILIAS/Style", "sty", $a_id, $new_id); } } diff --git a/components/ILIAS/Style/test/ilServicesStyleSuite.php b/components/ILIAS/Style/test/ilServicesStyleSuite.php index 664055e2cfc6..9381ea8d1047 100644 --- a/components/ILIAS/Style/test/ilServicesStyleSuite.php +++ b/components/ILIAS/Style/test/ilServicesStyleSuite.php @@ -17,8 +17,8 @@ public static function suite() $suite = new ilServicesStyleSuite(); // add each test class of the component - include_once("./Services/Style/System/test/ilServicesStyleSystemSuite.php"); - include_once("./Services/Style/Content/test/ilServicesStyleContentSuite.php"); + include_once("./components/ILIAS/Style/System/test/ilServicesStyleSystemSuite.php"); + include_once("./components/ILIAS/Style/Content/test/ilServicesStyleContentSuite.php"); $suite->addTestSuite("ilServicesStyleSystemSuite"); $suite->addTestSuite("ilServicesStyleContentSuite"); return $suite; diff --git a/components/ILIAS/Survey/Export/class.ilSurveyExporter.php b/components/ILIAS/Survey/Export/class.ilSurveyExporter.php index 4a015b5b0461..8b5cf0aa166c 100644 --- a/components/ILIAS/Survey/Export/class.ilSurveyExporter.php +++ b/components/ILIAS/Survey/Export/class.ilSurveyExporter.php @@ -79,7 +79,7 @@ public function getXmlExportTailDependencies( "entity" => "svy_skill_threshold", "ids" => $a_ids), array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids) ); diff --git a/components/ILIAS/Survey/Export/class.ilSurveyImporter.php b/components/ILIAS/Survey/Export/class.ilSurveyImporter.php index 29b814615154..ca6d32b8c8b6 100644 --- a/components/ILIAS/Survey/Export/class.ilSurveyImporter.php +++ b/components/ILIAS/Survey/Export/class.ilSurveyImporter.php @@ -81,7 +81,7 @@ public function importXmlRepresentation( ): void { if ($a_entity === "svy") { // Container import => test object already created - if (!($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id))) { // case ii, non container + if (!($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id))) { // case ii, non container $new_id = $a_mapping->getMapping("components/ILIAS/Survey", "svy", 0); } /** @var ilObjSurvey $newObj */ diff --git a/components/ILIAS/Survey/Participants/class.ilSurveyRaterGUI.php b/components/ILIAS/Survey/Participants/class.ilSurveyRaterGUI.php index 1c0af56736b9..f539a0522093 100644 --- a/components/ILIAS/Survey/Participants/class.ilSurveyRaterGUI.php +++ b/components/ILIAS/Survey/Participants/class.ilSurveyRaterGUI.php @@ -120,7 +120,7 @@ public function initOptionSelectForm(): ilPropertyFormGUI $ctrl = $this->ctrl; $lng = $this->lng; - include_once("Services/Form/classes/class.ilPropertyFormGUI.php"); + include_once("components/ILIAS/Form/classes/class.ilPropertyFormGUI.php"); $form = new ilPropertyFormGUI(); // diff --git a/components/ILIAS/Survey/classes/class.ilSurveyAppEventListener.php b/components/ILIAS/Survey/classes/class.ilSurveyAppEventListener.php index 1c34a6e2c5f9..5bd58b90e5d5 100644 --- a/components/ILIAS/Survey/classes/class.ilSurveyAppEventListener.php +++ b/components/ILIAS/Survey/classes/class.ilSurveyAppEventListener.php @@ -34,7 +34,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ $survey_skill_deletion_manager = $DIC->skills()->internalSurvey()->manager()->getSkillDeletionManager(); switch ($a_component) { - case "Services/Skill": + case "components/ILIAS/Skill": switch ($a_event) { case "deleteSkill": $survey_skill_deletion_manager->removeSurveySkillsForSkill( diff --git a/components/ILIAS/SurveyQuestionPool/Categories/class.ilCategoryWizardInputGUI.php b/components/ILIAS/SurveyQuestionPool/Categories/class.ilCategoryWizardInputGUI.php index 831dbfb1d9af..05feab6a227a 100644 --- a/components/ILIAS/SurveyQuestionPool/Categories/class.ilCategoryWizardInputGUI.php +++ b/components/ILIAS/SurveyQuestionPool/Categories/class.ilCategoryWizardInputGUI.php @@ -393,7 +393,7 @@ public function insert( $a_tpl->parseCurrentBlock(); $tpl = $this->tpl; - $tpl->addJavaScript("./Services/Form/js/ServiceFormWizardInput.js"); + $tpl->addJavaScript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); $tpl->addJavaScript("./components/ILIAS/SurveyQuestionPool/Categories/js/categorywizard.js"); } } diff --git a/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolExporter.php b/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolExporter.php index 3b39c385accf..7f694bd45b54 100644 --- a/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolExporter.php +++ b/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolExporter.php @@ -49,7 +49,7 @@ public function getXmlExportTailDependencies( // service settings $deps[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; diff --git a/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolImporter.php b/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolImporter.php index 106524002180..a5bad2f44773 100644 --- a/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolImporter.php +++ b/components/ILIAS/SurveyQuestionPool/Export/class.ilSurveyQuestionPoolImporter.php @@ -29,7 +29,7 @@ public function importXmlRepresentation( ilImportMapping $a_mapping ): void { // Container import => test object already created - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { // case ii, non container // Shouldn't happen diff --git a/components/ILIAS/SurveyQuestionPool/classes/class.ilMatrixRowWizardInputGUI.php b/components/ILIAS/SurveyQuestionPool/classes/class.ilMatrixRowWizardInputGUI.php index 0299c4f7e21e..cf543f1bc673 100644 --- a/components/ILIAS/SurveyQuestionPool/classes/class.ilMatrixRowWizardInputGUI.php +++ b/components/ILIAS/SurveyQuestionPool/classes/class.ilMatrixRowWizardInputGUI.php @@ -228,7 +228,7 @@ public function insert(ilTemplate $a_tpl): void $a_tpl->parseCurrentBlock(); $tpl = $this->tpl; - $tpl->addJavaScript("./Services/Form/js/ServiceFormWizardInput.js"); + $tpl->addJavaScript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); $tpl->addJavaScript("./components/ILIAS/SurveyQuestionPool/js/matrixrowwizard.js"); } } diff --git a/components/ILIAS/SystemCheck/classes/class.ilSCGroupTableGUI.php b/components/ILIAS/SystemCheck/classes/class.ilSCGroupTableGUI.php index 1e4a1c4c9bdb..b0ff1f6091b0 100644 --- a/components/ILIAS/SystemCheck/classes/class.ilSCGroupTableGUI.php +++ b/components/ILIAS/SystemCheck/classes/class.ilSCGroupTableGUI.php @@ -50,7 +50,7 @@ public function init(): void $this->setTitle($this->lng->txt('sysc_overview')); - $this->setRowTemplate('tpl.syscheck_groups_row.html', 'Services/SystemCheck'); + $this->setRowTemplate('tpl.syscheck_groups_row.html', 'components/ILIAS/SystemCheck'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); } diff --git a/components/ILIAS/SystemCheck/classes/class.ilSCTaskTableGUI.php b/components/ILIAS/SystemCheck/classes/class.ilSCTaskTableGUI.php index d436768eebaa..e86920c5859e 100644 --- a/components/ILIAS/SystemCheck/classes/class.ilSCTaskTableGUI.php +++ b/components/ILIAS/SystemCheck/classes/class.ilSCTaskTableGUI.php @@ -59,7 +59,7 @@ public function init(): void $this->setTitle($this->lng->txt('sysc_task_overview')); - $this->setRowTemplate('tpl.syscheck_tasks_row.html', 'Services/SystemCheck'); + $this->setRowTemplate('tpl.syscheck_tasks_row.html', 'components/ILIAS/SystemCheck'); $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); } diff --git a/components/ILIAS/SystemCheck/test/ilServicesSystemCheckSuite.php b/components/ILIAS/SystemCheck/test/ilServicesSystemCheckSuite.php index 2c6e91e236b1..7a59b0548681 100644 --- a/components/ILIAS/SystemCheck/test/ilServicesSystemCheckSuite.php +++ b/components/ILIAS/SystemCheck/test/ilServicesSystemCheckSuite.php @@ -12,7 +12,7 @@ public static function suite(): self { $suite = new ilServicesSystemCheckSuite(); - include_once("./Services/SystemCheck/test/ilSystemCheckTaskTest.php"); + include_once("./components/ILIAS/SystemCheck/test/ilSystemCheckTaskTest.php"); $suite->addTestSuite(ilSystemCheckTaskTest::class); return $suite; } diff --git a/components/ILIAS/SystemFolder/classes/class.ilObjSystemFolderGUI.php b/components/ILIAS/SystemFolder/classes/class.ilObjSystemFolderGUI.php index 78677bf09e7e..8d0ee55eadd6 100644 --- a/components/ILIAS/SystemFolder/classes/class.ilObjSystemFolderGUI.php +++ b/components/ILIAS/SystemFolder/classes/class.ilObjSystemFolderGUI.php @@ -460,7 +460,7 @@ public function changeHeaderTitleObject(): void "SEL_LANGUAGE", "sel_language", "tpl.lang_selection.html", - "Services/MetaData" + "components/ILIAS/MetaData" ); $this->tpl->setVariable("SEL_NAME", "Fobject[" . $key . "][lang]"); diff --git a/components/ILIAS/Table/classes/class.ilTable2GUI.php b/components/ILIAS/Table/classes/class.ilTable2GUI.php index bf955252851c..847955431813 100644 --- a/components/ILIAS/Table/classes/class.ilTable2GUI.php +++ b/components/ILIAS/Table/classes/class.ilTable2GUI.php @@ -152,7 +152,7 @@ public function __construct( $this->multi = array(); $this->hidden_inputs = array(); $this->formname = "table_" . $this->unique_id; - $this->tpl = new ilTemplate("tpl.table2.html", true, true, "Services/Table"); + $this->tpl = new ilTemplate("tpl.table2.html", true, true, "components/ILIAS/Table"); $lng->loadLanguageModule('tbl'); @@ -1515,7 +1515,7 @@ private function renderFilter(): void $filter = $this->getFilterItems(); $opt_filter = $this->getFilterItems(true); - $main_tpl->addJavascript("./Services/Table/js/ServiceTable.js"); + $main_tpl->addJavascript("./components/ILIAS/Table/js/ServiceTable.js"); if (count($filter) == 0 && count($opt_filter) == 0) { return; diff --git a/components/ILIAS/Table/classes/class.ilTableGUI.php b/components/ILIAS/Table/classes/class.ilTableGUI.php index a1130856f790..76e27bd05148 100644 --- a/components/ILIAS/Table/classes/class.ilTableGUI.php +++ b/components/ILIAS/Table/classes/class.ilTableGUI.php @@ -107,7 +107,7 @@ public function __construct( if ($this->global_tpl) { $this->tpl = $tpl; } else { - $this->tpl = new ilTemplate("tpl.table.html", true, true, "Services/Table"); + $this->tpl = new ilTemplate("tpl.table.html", true, true, "components/ILIAS/Table"); } $this->lng = $lng; diff --git a/components/ILIAS/Table/test/ilServicesTableSuite.php b/components/ILIAS/Table/test/ilServicesTableSuite.php index 15583253b6d0..baa382abae44 100644 --- a/components/ILIAS/Table/test/ilServicesTableSuite.php +++ b/components/ILIAS/Table/test/ilServicesTableSuite.php @@ -31,7 +31,7 @@ public static function suite(): ilServicesTableSuite { $suite = new self(); - require_once("./Services/Table/test/TableGUIRequestTest.php"); + require_once("./components/ILIAS/Table/test/TableGUIRequestTest.php"); $suite->addTestSuite("TableGUIRequestTest"); return $suite; diff --git a/components/ILIAS/Tagging/classes/class.ilTaggingAppEventListener.php b/components/ILIAS/Tagging/classes/class.ilTaggingAppEventListener.php index e7025a57c0ed..b8583fe87cc7 100644 --- a/components/ILIAS/Tagging/classes/class.ilTaggingAppEventListener.php +++ b/components/ILIAS/Tagging/classes/class.ilTaggingAppEventListener.php @@ -27,8 +27,8 @@ class ilTaggingAppEventListener { /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" - * @param string $a_event component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" + * @param string $a_event component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ public static function handleEvent( @@ -38,7 +38,7 @@ public static function handleEvent( ): void { // PHP8 Review: 'switch' with single 'case' switch ($a_component) { - case "Services/Object": + case "components/ILIAS/Object": switch ($a_event) { case "toTrash": if (!ilObject::_hasUntrashedReference($a_parameter["obj_id"])) { diff --git a/components/ILIAS/Tagging/classes/class.ilTaggingClassificationProvider.php b/components/ILIAS/Tagging/classes/class.ilTaggingClassificationProvider.php index 4d98e7ecbe91..f7673e9ddbd8 100644 --- a/components/ILIAS/Tagging/classes/class.ilTaggingClassificationProvider.php +++ b/components/ILIAS/Tagging/classes/class.ilTaggingClassificationProvider.php @@ -122,7 +122,7 @@ public function render( } reset($tags); - $tpl = new ilTemplate("tpl.tag_cloud_block.html", true, true, "Services/Tagging"); + $tpl = new ilTemplate("tpl.tag_cloud_block.html", true, true, "components/ILIAS/Tagging"); $tpl->setCurrentBlock("tag_bl"); foreach ($tags as $tag => $counter) { diff --git a/components/ILIAS/Tagging/classes/class.ilTaggingGUI.php b/components/ILIAS/Tagging/classes/class.ilTaggingGUI.php index 2e2430adefd1..ca33ab9fece5 100644 --- a/components/ILIAS/Tagging/classes/class.ilTaggingGUI.php +++ b/components/ILIAS/Tagging/classes/class.ilTaggingGUI.php @@ -148,7 +148,7 @@ public function getTaggingInputHTML(): string { $lng = $this->lng; - $ttpl = new ilTemplate("tpl.tags_input.html", true, true, "Services/Tagging"); + $ttpl = new ilTemplate("tpl.tags_input.html", true, true, "components/ILIAS/Tagging"); $tags = ilTagging::getTagsForUserAndObject( $this->obj_id, $this->obj_type, @@ -224,7 +224,7 @@ public function isForbidden(string $a_tag): bool // Get Input HTML for Tagging of an object (and a user) public function getAllUserTagsForObjectHTML(): string { - $ttpl = new ilTemplate("tpl.tag_cloud.html", true, true, "Services/Tagging"); + $ttpl = new ilTemplate("tpl.tag_cloud.html", true, true, "components/ILIAS/Tagging"); $tags = ilTagging::getTagsForObject( $this->obj_id, $this->obj_type, @@ -276,7 +276,7 @@ public static function initJavascript( ilYuiUtil::initConnection($tpl); iljQueryUtil::initjQuery($tpl); - $tpl->addJavaScript("./Services/Tagging/js/ilTagging.js"); + $tpl->addJavaScript("./components/ILIAS/Tagging/js/ilTagging.js"); $tpl->addOnLoadCode("ilTagging.setAjaxUrl('" . $a_ajax_url . "');"); } @@ -304,7 +304,7 @@ public function getHTML(): string $ui = $this->ui; $lng->loadLanguageModule("tagging"); - $tpl = new ilTemplate("tpl.edit_tags.html", true, true, "Services/Tagging"); + $tpl = new ilTemplate("tpl.edit_tags.html", true, true, "components/ILIAS/Tagging"); $tpl->setVariable("TXT_TAGS", $lng->txt("tagging_tags")); $mtxt = ""; diff --git a/components/ILIAS/Tagging/classes/class.ilTaggingSlateContentGUI.php b/components/ILIAS/Tagging/classes/class.ilTaggingSlateContentGUI.php index b1610cb6296e..7db2e160ce82 100644 --- a/components/ILIAS/Tagging/classes/class.ilTaggingSlateContentGUI.php +++ b/components/ILIAS/Tagging/classes/class.ilTaggingSlateContentGUI.php @@ -115,7 +115,7 @@ protected function renderTagCloud(): string "tpl.tag_cloud.html", true, true, - "Services/Tagging" + "components/ILIAS/Tagging" ); $max = 1; foreach ($this->tags as $tag) { diff --git a/components/ILIAS/Tagging/classes/class.ilUserForTagTableGUI.php b/components/ILIAS/Tagging/classes/class.ilUserForTagTableGUI.php index 9fc8ed03f9d5..8f7de5a9d03d 100644 --- a/components/ILIAS/Tagging/classes/class.ilUserForTagTableGUI.php +++ b/components/ILIAS/Tagging/classes/class.ilUserForTagTableGUI.php @@ -45,7 +45,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.user_for_tag_row.html", "Services/Tagging"); + $this->setRowTemplate("tpl.user_for_tag_row.html", "components/ILIAS/Tagging"); $this->setEnableTitle(true); } diff --git a/components/ILIAS/Tagging/test/ilServicesTaggingSuite.php b/components/ILIAS/Tagging/test/ilServicesTaggingSuite.php index d4ac9a404af7..8aee59843a89 100644 --- a/components/ILIAS/Tagging/test/ilServicesTaggingSuite.php +++ b/components/ILIAS/Tagging/test/ilServicesTaggingSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Tagging/test/TagRelevanceTest.php"); + require_once("./components/ILIAS/Tagging/test/TagRelevanceTest.php"); $suite->addTestSuite("TagRelevanceTest"); return $suite; diff --git a/components/ILIAS/Tasks/classes/class.ilPDTasksBlockGUI.php b/components/ILIAS/Tasks/classes/class.ilPDTasksBlockGUI.php index 3a7cf11983fa..0a970559a562 100644 --- a/components/ILIAS/Tasks/classes/class.ilPDTasksBlockGUI.php +++ b/components/ILIAS/Tasks/classes/class.ilPDTasksBlockGUI.php @@ -99,7 +99,7 @@ public function fillDataSection(): void $this->tasks = $collector->getEntries($this->user->getId()); if (count($this->tasks) > 0) { - $this->setRowTemplate("tpl.pd_tasks.html", "Services/Tasks"); + $this->setRowTemplate("tpl.pd_tasks.html", "components/ILIAS/Tasks"); $this->getListRowData(); parent::fillDataSection(); } else { diff --git a/components/ILIAS/Tasks/test/ilServicesTasksSuite.php b/components/ILIAS/Tasks/test/ilServicesTasksSuite.php index f4afdaf31448..746aff437302 100644 --- a/components/ILIAS/Tasks/test/ilServicesTasksSuite.php +++ b/components/ILIAS/Tasks/test/ilServicesTasksSuite.php @@ -31,13 +31,13 @@ public static function suite(): ilServicesTasksSuite $suite = new self(); - include_once("./Services/Tasks/test/ilDerivedTaskTest.php"); + include_once("./components/ILIAS/Tasks/test/ilDerivedTaskTest.php"); $suite->addTestSuite("ilDerivedTaskTest"); - include_once("./Services/Tasks/test/ilDerivedTaskFactoryTest.php"); + include_once("./components/ILIAS/Tasks/test/ilDerivedTaskFactoryTest.php"); $suite->addTestSuite("ilDerivedTaskFactoryTest"); - include_once("./Services/Tasks/test/ilDerivedTaskCollectorTest.php"); + include_once("./components/ILIAS/Tasks/test/ilDerivedTaskCollectorTest.php"); $suite->addTestSuite("ilDerivedTaskCollectorTest"); return $suite; diff --git a/components/ILIAS/Taxonomy/README-technical.md b/components/ILIAS/Taxonomy/README-technical.md index bbeb60ab8432..fd504f83e03f 100644 --- a/components/ILIAS/Taxonomy/README-technical.md +++ b/components/ILIAS/Taxonomy/README-technical.md @@ -80,7 +80,7 @@ class ilPresentationListTableGUI extends ilTable2GUI function initFilter() { ... - include_once("./Services/Taxonomy/classes/class.ilTaxSelectInputGUI.php"); + include_once("./components/ILIAS/Taxonomy/classes/class.ilTaxSelectInputGUI.php"); $tax = new ilTaxSelectInputGUI($this->tax_id, "tax_node", true); $this->addFilterItem($tax); $tax->readFromSession(); diff --git a/components/ILIAS/Taxonomy/classes/class.ilTaxAssignedItemsTableGUI.php b/components/ILIAS/Taxonomy/classes/class.ilTaxAssignedItemsTableGUI.php index 51c029ed3319..2a7da2147e39 100644 --- a/components/ILIAS/Taxonomy/classes/class.ilTaxAssignedItemsTableGUI.php +++ b/components/ILIAS/Taxonomy/classes/class.ilTaxAssignedItemsTableGUI.php @@ -74,7 +74,7 @@ public function __construct( $this->addColumn($this->lng->txt("title")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.tax_ass_items_row.html", "Services/Taxonomy"); + $this->setRowTemplate("tpl.tax_ass_items_row.html", "components/ILIAS/Taxonomy"); $this->addCommandButton("saveAssignedItemsSorting", $lng->txt("save")); } diff --git a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyAdministrationRepositoryTableGUI.php b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyAdministrationRepositoryTableGUI.php index 291eb3e49025..a958c3179c8e 100644 --- a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyAdministrationRepositoryTableGUI.php +++ b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyAdministrationRepositoryTableGUI.php @@ -47,7 +47,7 @@ public function __construct($a_parent_obj, $a_parent_cmd, ilObject $a_obj) $this->setDefaultOrderField("tax_title"); $this->setDefaultOrderDirection("asc"); - $this->setRowTemplate("tpl.tax_admin_repo_row.html", "Services/Taxonomy"); + $this->setRowTemplate("tpl.tax_admin_repo_row.html", "components/ILIAS/Taxonomy"); $this->initItems(); } diff --git a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyDataSet.php b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyDataSet.php index ee969cf6f746..394856563270 100644 --- a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyDataSet.php +++ b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyDataSet.php @@ -207,14 +207,14 @@ public function importRecord( $newObj->update(); $this->current_obj = $newObj; - $a_mapping->addMapping("Services/Taxonomy", "tax", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Taxonomy", "tax", $a_rec["Id"], $newObj->getId()); break; case "tax_tree": switch ($a_rec["Type"]) { case "taxn": - $parent = (int) $a_mapping->getMapping("Services/Taxonomy", "tax_tree", $a_rec["Parent"]); - $tax_id = $a_mapping->getMapping("Services/Taxonomy", "tax", $a_rec["TaxId"]); + $parent = (int) $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_tree", $a_rec["Parent"]); + $tax_id = $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax", $a_rec["TaxId"]); if ($parent == 0) { $parent = $this->current_obj->getTree()->readRootId(); } @@ -225,7 +225,7 @@ public function importRecord( $node->create(); ilTaxonomyNode::putInTree((int) $tax_id, $node, (int) $parent, 0, (int) $a_rec["OrderNr"]); $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_tree", $a_rec["Child"], $node->getId() @@ -236,18 +236,18 @@ public function importRecord( // no break case "tax_node_assignment": $new_item_id = (int) $a_mapping->getMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item", ($a_rec["Component"] ?? "") . ":" . ($a_rec["ItemType"] ?? "") . ":" . ($a_rec["ItemId"] ?? "") ); - $new_node_id = (int) $a_mapping->getMapping("Services/Taxonomy", "tax_tree", $a_rec["NodeId"] ?? ""); + $new_node_id = (int) $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_tree", $a_rec["NodeId"] ?? ""); // this is needed since 4.4 (but not exported with 4.3) // with 4.4 this should be part of export/import $new_item_id_obj = (int) $a_mapping->getMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item_obj_id", ($a_rec["Component"] ?? "") . ":" . ($a_rec["ItemType"] ?? "") . ":" . @@ -265,12 +265,12 @@ public function importRecord( break; case "tax_usage": - $usage = $a_mapping->getMapping("Services/Taxonomy", "tax_usage_of_obj", $a_rec["ObjId"]); + $usage = $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_usage_of_obj", $a_rec["ObjId"]); if ($usage != "") { $usage .= ":"; } $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_usage_of_obj", $a_rec["ObjId"], $usage . $this->current_obj->getId() diff --git a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyListTableGUI.php b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyListTableGUI.php index 6c1e7c10fd65..fa2770da0bfc 100644 --- a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyListTableGUI.php +++ b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyListTableGUI.php @@ -54,7 +54,7 @@ public function __construct($a_parent_obj, $a_parent_cmd, int $a_assigned_object $this->setDefaultOrderDirection("asc"); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.taxonomy_list_row.html", "Services/Taxonomy"); + $this->setRowTemplate("tpl.taxonomy_list_row.html", "components/ILIAS/Taxonomy"); // @todo introduce request wrapper $params = $DIC->http()->request()->getQueryParams(); diff --git a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyTableGUI.php b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyTableGUI.php index 711a7f76b8e2..b1469dfbdc90 100644 --- a/components/ILIAS/Taxonomy/classes/class.ilTaxonomyTableGUI.php +++ b/components/ILIAS/Taxonomy/classes/class.ilTaxonomyTableGUI.php @@ -84,7 +84,7 @@ public function __construct( $this->addColumn($this->lng->txt("title")); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.tax_row.html", "Services/Taxonomy"); + $this->setRowTemplate("tpl.tax_row.html", "components/ILIAS/Taxonomy"); $this->addMultiCommand("deleteItems", $lng->txt("delete")); $this->addMultiCommand("moveItems", $lng->txt("move")); diff --git a/components/ILIAS/Taxonomy/test/ilServicesTaxonomySuite.php b/components/ILIAS/Taxonomy/test/ilServicesTaxonomySuite.php index 34df42992fd7..25e245f40072 100644 --- a/components/ILIAS/Taxonomy/test/ilServicesTaxonomySuite.php +++ b/components/ILIAS/Taxonomy/test/ilServicesTaxonomySuite.php @@ -31,7 +31,7 @@ public static function suite(): ilServicesTaxonomySuite { $suite = new self(); - require_once("./Services/Taxonomy/test/Assignment/TaxAssignmentTest.php"); + require_once("./components/ILIAS/Taxonomy/test/Assignment/TaxAssignmentTest.php"); $suite->addTestSuite("TaxAssignmentTest"); return $suite; diff --git a/components/ILIAS/TermsOfService/classes/Consumer.php b/components/ILIAS/TermsOfService/classes/Consumer.php index ac7d56ae1ea7..601b27234b66 100644 --- a/components/ILIAS/TermsOfService/classes/Consumer.php +++ b/components/ILIAS/TermsOfService/classes/Consumer.php @@ -79,7 +79,7 @@ public function uses(UseSlot $slot, LazyProvide $provide): UseSlot private function userHasWithdrawn(): void { $this->container['ilAppEventHandler']->raise( - 'Services/TermsOfService', + 'components/ILIAS/TermsOfService', 'withdraw', ['event' => $this->container->user()] ); diff --git a/components/ILIAS/Test/classes/class.ilTestAppEventListener.php b/components/ILIAS/Test/classes/class.ilTestAppEventListener.php index bcc48e91ee30..749fb91b6b8e 100644 --- a/components/ILIAS/Test/classes/class.ilTestAppEventListener.php +++ b/components/ILIAS/Test/classes/class.ilTestAppEventListener.php @@ -32,7 +32,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { $test_skill_repo = new TestSkillDBRepository(); - if ($a_component === "Services/Skill" && $a_event === "deleteSkill") { + if ($a_component === "components/ILIAS/Skill" && $a_event === "deleteSkill") { $test_skill_repo->removeForSkill($a_parameter["node_id"], $a_parameter["is_reference"]); } } diff --git a/components/ILIAS/Test/classes/class.ilTestExporter.php b/components/ILIAS/Test/classes/class.ilTestExporter.php index 28f665117175..3c7c7240eb74 100644 --- a/components/ILIAS/Test/classes/class.ilTestExporter.php +++ b/components/ILIAS/Test/classes/class.ilTestExporter.php @@ -79,14 +79,14 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($tax_ids)) { $deps[] = [ - 'component' => 'Services/Taxonomy', + 'component' => 'components/ILIAS/Taxonomy', 'entity' => 'tax', 'ids' => $tax_ids ]; } $deps[] = [ - 'component' => 'Services/Object', + 'component' => 'components/ILIAS/Object', 'entity' => 'common', 'ids' => $a_ids ]; diff --git a/components/ILIAS/Test/classes/class.ilTestImporter.php b/components/ILIAS/Test/classes/class.ilTestImporter.php index bde698dca453..481bf8925784 100644 --- a/components/ILIAS/Test/classes/class.ilTestImporter.php +++ b/components/ILIAS/Test/classes/class.ilTestImporter.php @@ -59,7 +59,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ { ilObjTest::_setImportDirectory($this->getImportDirectoryContainer()); - if ($new_id = (int) $a_mapping->getMapping('Services/Container', 'objs', $a_id)) { + if ($new_id = (int) $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) { // container content $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); ilSession::set('tst_import_subdir', $this->getImportPackageName()); @@ -108,14 +108,14 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ foreach ($qtiParser->getQuestionIdMapping() as $oldQuestionId => $newQuestionId) { $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item", "tst:quest:$oldQuestionId", (string) $newQuestionId ); $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item_obj_id", "tst:quest:$oldQuestionId", (string) $newObj->getId() @@ -183,7 +183,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void protected function finalRandomTestTaxonomyProcessing(ilImportMapping $mapping, string $oldTstObjId, string $newTstObjId, ilObjTest $testOBJ) { $new_tax_ids = $mapping->getMapping( - 'Services/Taxonomy', + 'components/ILIAS/Taxonomy', 'tax_usage_of_obj', $oldTstObjId ); @@ -236,7 +236,7 @@ protected function getNewMappedTaxonomyFilter(ilImportMapping $mapping, array $m foreach ($mappedFilter as $taxId => $taxNodes) { $newTaxId = $mapping->getMapping( - 'Services/Taxonomy', + 'components/ILIAS/Taxonomy', 'tax', $taxId ); @@ -249,7 +249,7 @@ protected function getNewMappedTaxonomyFilter(ilImportMapping $mapping, array $m foreach ($taxNodes as $taxNodeId) { $newTaxNodeId = $mapping->getMapping( - 'Services/Taxonomy', + 'components/ILIAS/Taxonomy', 'tax_tree', $taxNodeId ); diff --git a/components/ILIAS/Test/classes/class.ilTestScoringByQuestionsGUI.php b/components/ILIAS/Test/classes/class.ilTestScoringByQuestionsGUI.php index 3441aaa11509..fc7401eb78bd 100644 --- a/components/ILIAS/Test/classes/class.ilTestScoringByQuestionsGUI.php +++ b/components/ILIAS/Test/classes/class.ilTestScoringByQuestionsGUI.php @@ -79,9 +79,9 @@ protected function showManScoringByQuestionParticipantsTable($manPointsPost = [] $this->tpl->addJavaScript($mathJaxSetting->get("path_to_mathjax")); } - $this->tpl->addJavaScript("./Services/JavaScript/js/Basic.js"); - $this->tpl->addJavaScript("./Services/Form/js/Form.js"); - $this->tpl->addJavascript('./Services/UIComponent/Modal/js/Modal.js'); + $this->tpl->addJavaScript("./components/ILIAS/JavaScript/js/Basic.js"); + $this->tpl->addJavaScript("./components/ILIAS/Form/js/Form.js"); + $this->tpl->addJavascript('./components/ILIAS/UIComponent/Modal/js/Modal.js'); $this->lng->toJSMap(['answer' => $this->lng->txt('answer')]); $table = new ilTestManScoringParticipantsBySelectedQuestionAndPassTableGUI($this, $this->access); diff --git a/components/ILIAS/Test/test/tables/ilTestVerificationTableGUITest.php b/components/ILIAS/Test/test/tables/ilTestVerificationTableGUITest.php index e3d0146c5117..a19ffbd8ac83 100644 --- a/components/ILIAS/Test/test/tables/ilTestVerificationTableGUITest.php +++ b/components/ILIAS/Test/test/tables/ilTestVerificationTableGUITest.php @@ -18,7 +18,7 @@ declare(strict_types=1); -use ILIAS\Services\Logging\NullLogger; +use ILIAS\components\Logging\NullLogger; /** * Class ilTestVerificationTableGUITest diff --git a/components/ILIAS/TestQuestionPool/classes/class.assQuestion.php b/components/ILIAS/TestQuestionPool/classes/class.assQuestion.php index 3ab477deab6d..6bec7cf5b104 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.assQuestion.php +++ b/components/ILIAS/TestQuestionPool/classes/class.assQuestion.php @@ -1188,7 +1188,7 @@ public function fixUnavailableSkinImageSources(string $html): string $component = ''; - if ($levels[4] === 'components/ILIAS' || $levels[4] === 'Services') { + if ($levels[4] === 'components/ILIAS' || $levels[4] === 'components/ILIAS') { $component = $levels[4] . DIRECTORY_SEPARATOR . $levels[5]; } diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillAssignmentsGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillAssignmentsGUI.php index cb6e078a04c5..1005b2d76da4 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillAssignmentsGUI.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillAssignmentsGUI.php @@ -616,7 +616,7 @@ private function buildSkillSelectorToolbarGUI(): ilToolbarGUI private function buildQuestionPage(assQuestionGUI $questionGUI) { - $this->tpl->addCss('Services/COPage/css/content.css'); + $this->tpl->addCss('components/ILIAS/COPage/css/content.css'); $pageGUI = new ilAssQuestionPageGUI($questionGUI->object->getId()); diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php index e2ee82ca8c90..321b4229ee63 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php @@ -124,8 +124,8 @@ public function __construct() $this->action_parameter_token = $action_parameter_token; $this->row_id_token = $row_id_token; - $this->tpl->addJavascript('Services/Notes/js/ilNotes.js'); - $this->tpl->addJavascript('Services/UIComponent/Modal/js/Modal.js'); + $this->tpl->addJavascript('components/ILIAS/Notes/js/ilNotes.js'); + $this->tpl->addJavascript('components/ILIAS/UIComponent/Modal/js/Modal.js'); } protected function getQueryParamString(string $param): ?string diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolAppEventListener.php b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolAppEventListener.php index 2cecad7639e3..8521d35de673 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolAppEventListener.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolAppEventListener.php @@ -32,7 +32,7 @@ public static function handleEvent(string $a_component, string $a_event, array $ { $qpl_skill_repo = new TestQuestionPoolSkillDBRepository(); - if ($a_component === "Services/Skill" && $a_event === "deleteSkill") { + if ($a_component === "components/ILIAS/Skill" && $a_event === "deleteSkill") { $qpl_skill_repo->removeForSkill($a_parameter["node_id"], $a_parameter["is_reference"]); } } diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolExporter.php b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolExporter.php index 86d59f00037c..63ed81cfc254 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolExporter.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolExporter.php @@ -85,7 +85,7 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ if (count($taxIds)) { $deps[] = array( - 'component' => 'Services/Taxonomy', + 'component' => 'components/ILIAS/Taxonomy', 'entity' => 'tax', 'ids' => $taxIds ); diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolImporter.php b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolImporter.php index 58913450a376..b4d4b2ad562d 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolImporter.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilTestQuestionPoolImporter.php @@ -41,7 +41,7 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ ilObjQuestionPool::_setImportDirectory($this->getImportDirectoryContainer()); // Container import => pool object already created - if (($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_id)) !== null) { + if (($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_id)) !== null) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); $newObj->getObjectProperties()->storePropertyIsOnline($newObj->getObjectProperties()->getPropertyIsOnline()->withOffline()); // sets Question pools to always online @@ -106,14 +106,14 @@ public function importXmlRepresentation(string $a_entity, string $a_id, string $ $newQuestionId = $v['pool']; // yes, this is the new question id ^^ $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item", "qpl:quest:$oldQuestionId", $newQuestionId ); $a_mapping->addMapping( - "Services/Taxonomy", + "components/ILIAS/Taxonomy", "tax_item_obj_id", "qpl:quest:$oldQuestionId", $newObj->getId() @@ -148,7 +148,7 @@ public function finalProcessing(ilImportMapping $a_mapping): void foreach ($maps as $old => $new) { if ($old != "new_id" && (int) $old > 0) { // get all new taxonomys of this object - $new_tax_ids = $a_mapping->getMapping("Services/Taxonomy", "tax_usage_of_obj", $old); + $new_tax_ids = $a_mapping->getMapping("components/ILIAS/Taxonomy", "tax_usage_of_obj", $old); if ($new_tax_ids !== null) { $tax_ids = explode(":", $new_tax_ids); foreach ($tax_ids as $tid) { diff --git a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php index 23ac15aac08a..3ffb7d646ef8 100644 --- a/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php +++ b/components/ILIAS/TestQuestionPool/classes/class.ilUnitConfigurationGUI.php @@ -460,8 +460,8 @@ protected function showUnitsOfCategory(): void $category = $this->getCategoryById($this->request->int('category_id'), false); - $this->tpl->addJavaScript("./Services/JavaScript/js/Basic.js"); - $this->tpl->addJavaScript("./Services/Form/js/Form.js"); + $this->tpl->addJavaScript("./components/ILIAS/JavaScript/js/Basic.js"); + $this->tpl->addJavaScript("./components/ILIAS/Form/js/Form.js"); $this->lng->loadLanguageModule('form'); $ilToolbar->addButton( diff --git a/components/ILIAS/TestQuestionPool/classes/forms/class.ilImagemapCorrectionsInputGUI.php b/components/ILIAS/TestQuestionPool/classes/forms/class.ilImagemapCorrectionsInputGUI.php index c463e4c2d921..4cca5e388c20 100644 --- a/components/ILIAS/TestQuestionPool/classes/forms/class.ilImagemapCorrectionsInputGUI.php +++ b/components/ILIAS/TestQuestionPool/classes/forms/class.ilImagemapCorrectionsInputGUI.php @@ -165,7 +165,7 @@ public function insert(ilTemplate $a_tpl): void global $DIC; $tpl = $DIC['tpl']; - #$tpl->addJavascript("./Services/Form/js/ServiceFormWizardInput.js"); + #$tpl->addJavascript("./components/ILIAS/Form/js/ServiceFormWizardInput.js"); #$tpl->addJavascript("./components/ILIAS/TestQuestionPool/templates/default/imagemap.js"); } } diff --git a/components/ILIAS/TestQuestionPool/classes/forms/class.ilMultipleNestedOrderingElementsInputGUI.php b/components/ILIAS/TestQuestionPool/classes/forms/class.ilMultipleNestedOrderingElementsInputGUI.php index 8f5de1313f30..6f521c0195f2 100644 --- a/components/ILIAS/TestQuestionPool/classes/forms/class.ilMultipleNestedOrderingElementsInputGUI.php +++ b/components/ILIAS/TestQuestionPool/classes/forms/class.ilMultipleNestedOrderingElementsInputGUI.php @@ -448,7 +448,7 @@ protected function renderJsInit(): void public function render(string $a_mode = ""): string { if ($this->isStylingEnabled()) { - $this->getGlobalTpl()->addCss('Services/Form/css/nested_ordering.css'); + $this->getGlobalTpl()->addCss('components/ILIAS/Form/css/nested_ordering.css'); } if ($this->isInteractionEnabled()) { diff --git a/components/ILIAS/Tracking/classes/class.ilLPStatus.php b/components/ILIAS/Tracking/classes/class.ilLPStatus.php index 4f9dfd659097..2bb60fc12a6c 100644 --- a/components/ILIAS/Tracking/classes/class.ilLPStatus.php +++ b/components/ILIAS/Tracking/classes/class.ilLPStatus.php @@ -337,7 +337,7 @@ protected static function raiseEvent( ); $ilAppEventHandler->raise( - "Services/Tracking", + "components/ILIAS/Tracking", "updateStatus", array( "obj_id" => $a_obj_id, diff --git a/components/ILIAS/Tracking/classes/class.ilLearningProgressBaseGUI.php b/components/ILIAS/Tracking/classes/class.ilLearningProgressBaseGUI.php index 4a5cca665944..cee8437dff9b 100644 --- a/components/ILIAS/Tracking/classes/class.ilLearningProgressBaseGUI.php +++ b/components/ILIAS/Tracking/classes/class.ilLearningProgressBaseGUI.php @@ -445,7 +445,7 @@ public function __appendLPDetails( "tpl.lp_edit_manual_info_page.html", true, true, - "Services/Tracking" + "components/ILIAS/Tracking" ); $i_tpl->setVariable( "INFO_EDITED", @@ -568,7 +568,7 @@ public function __getLegendHTML(int $variant = ilLPStatusIcons::ICON_VARIANT_LON "tpl.lp_legend.html", true, true, - "Services/Tracking" + "components/ILIAS/Tracking" ); $tpl->setVariable( "IMG_NOT_ATTEMPTED", diff --git a/components/ILIAS/Tracking/classes/class.ilTrackingAppEventListener.php b/components/ILIAS/Tracking/classes/class.ilTrackingAppEventListener.php index f51960476016..eb1499d409cb 100644 --- a/components/ILIAS/Tracking/classes/class.ilTrackingAppEventListener.php +++ b/components/ILIAS/Tracking/classes/class.ilTrackingAppEventListener.php @@ -29,7 +29,7 @@ class ilTrackingAppEventListener implements ilAppEventListener { /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ @@ -40,7 +40,7 @@ public static function handleEvent( ): void { $obj_id = $a_parameter['obj_id'] ?? null; switch ($a_component) { - case 'Services/Object': + case 'components/ILIAS/Object': switch ($a_event) { case 'toTrash': $olp = ilObjectLP::getInstance($obj_id); @@ -58,7 +58,7 @@ public static function handleEvent( } break; - case 'Services/Tree': + case 'components/ILIAS/Tree': switch ($a_event) { case 'moveTree': if ($a_parameter['tree'] == 'tree') { diff --git a/components/ILIAS/Tracking/classes/collection/class.ilLPCollection.php b/components/ILIAS/Tracking/classes/collection/class.ilLPCollection.php index 75ef89aa2eed..83cf0e983642 100644 --- a/components/ILIAS/Tracking/classes/collection/class.ilLPCollection.php +++ b/components/ILIAS/Tracking/classes/collection/class.ilLPCollection.php @@ -36,7 +36,7 @@ public static function getInstanceByMode( int $a_obj_id, int $a_mode ): ?ilLPCollection { - $path = "Services/Tracking/classes/collection/"; + $path = "components/ILIAS/Tracking/classes/collection/"; switch ($a_mode) { case ilLPObjSettings::LP_MODE_COLLECTION: diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php index 1c295c7b4e59..42b0a552df4a 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php @@ -37,7 +37,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd) ); $this->setRowTemplate( "tpl.lp_object_statistics_admin_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(true); diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php index 9d9c0c9f8716..85ba05df234a 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php @@ -87,7 +87,7 @@ public function init(): void ); $this->setRowTemplate( "tpl.lp_object_statistics_daily_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(true); diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php index 477fafe0708c..56ff4579ef58 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php @@ -562,7 +562,7 @@ public function showLearningProgressDetails(): void "tpl.lp_object_statistics_lp_details.html", true, true, - "Services/Tracking" + "components/ILIAS/Tracking" ); $a_tpl->setVariable("CONTENT", $lp_table->getHTML()); $a_tpl->setVariable('CLOSE_IMG_TXT', $this->lng->txt('close')); diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php index 660919a5caae..e433344d2836 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php @@ -141,7 +141,7 @@ public function init(): void ); $this->setRowTemplate( "tpl.lp_object_statistics_lp_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(true); @@ -716,6 +716,6 @@ protected function initLearningProgressDetailsLayer(): void ilYuiUtil::initOverlay(); iljQueryUtil::initjQuery(); - $tpl->addJavascript("./Services/Tracking/js/ilObjStat.js"); + $tpl->addJavascript("./components/ILIAS/Tracking/js/ilObjStat.js"); } } diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php index 844a91938db5..03aa7962e0e7 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php @@ -87,7 +87,7 @@ public function init(): void ); $this->setRowTemplate( "tpl.lp_object_statistics_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(true); diff --git a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php index e0f608be9948..40edd3470622 100644 --- a/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php +++ b/components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php @@ -69,7 +69,7 @@ public function __construct( ); $this->setRowTemplate( "tpl.lp_object_statistics_types_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(true); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPCollectionSettingsTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPCollectionSettingsTableGUI.php index 380476e29a90..ef08d7ff77c8 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPCollectionSettingsTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPCollectionSettingsTableGUI.php @@ -345,7 +345,7 @@ protected function initTable(): void case ilLPObjSettings::LP_MODE_COLLECTION_MANUAL: $this->setRowTemplate( 'tpl.lp_collection_row.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $this->setTitle($this->lng->txt('trac_lp_determination')); $this->setDescription( @@ -356,7 +356,7 @@ protected function initTable(): void case ilLPObjSettings::LP_MODE_MANUAL_BY_TUTOR: $this->setRowTemplate( 'tpl.lp_collection_row.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $this->setTitle($this->lng->txt('trac_lp_determination_tutor')); $this->setDescription( @@ -367,7 +367,7 @@ protected function initTable(): void case ilLPObjSettings::LP_MODE_SCORM: $this->setRowTemplate( 'tpl.lp_collection_scorm_row.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $this->setTitle($this->lng->txt('trac_lp_determination')); $this->setDescription( @@ -378,7 +378,7 @@ protected function initTable(): void case ilLPObjSettings::LP_MODE_COLLECTION_TLT: $this->setRowTemplate( 'tpl.lp_collection_subitem_row.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $this->setTitle($this->lng->txt('trac_lp_determination')); $this->setDescription( @@ -392,7 +392,7 @@ protected function initTable(): void case ilLPObjSettings::LP_MODE_COLLECTION_MOBS: $this->setRowTemplate( 'tpl.lp_collection_subitem_row.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $this->setTitle($this->lng->txt('trac_lp_determination')); $this->setDescription( diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php index 68f15ea87661..71cb53ded4b6 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php @@ -244,7 +244,7 @@ public function details(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_loo.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); // Show back button @@ -324,7 +324,7 @@ public function userDetails(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_loo.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $info = new ilInfoScreenGUI($this); @@ -365,7 +365,7 @@ public function __listObjects(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_list_objects.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $lp_table = new ilTrSummaryTableGUI($this, "", ROOT_FOLDER_ID); @@ -429,7 +429,7 @@ public function showUserObjectMatrix(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_loo.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $info = new ilInfoScreenGUI($this); $info->setFormAction($this->ctrl->getFormAction($this)); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php index 61c2e84406b6..f3b74369b303 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php @@ -139,7 +139,7 @@ public function details(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_progress_container.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); $info = new ilInfoScreenGUI($this); @@ -209,7 +209,7 @@ public function __showProgressList(): void 'ADM_CONTENT', 'adm_content', 'tpl.lp_list_progress.html', - 'Services/Tracking' + 'components/ILIAS/Tracking' ); // User info diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php index 85fb73bf25f7..9ee985337a9d 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php @@ -499,7 +499,7 @@ protected function handleLPUsageInfo(): string "tpl.lp_obj_settings_tree_info.html", true, true, - "Services/Tracking" + "components/ILIAS/Tracking" ); $margin = 0; diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php index 424f6dc5660d..8ec5a8b2d753 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php @@ -149,7 +149,7 @@ public function __construct( ); $this->setRowTemplate( "tpl.lp_progress_list_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableHeader(true); $this->setEnableNumInfo(false); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php index 1caee2dac681..152ef5a2ac7c 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php @@ -21,7 +21,7 @@ * name table * @author Jörg Lützenkirchen * @version $Id$ - * @ingroup Services + * @ingroup components/ILIAS */ class ilTrMatrixTableGUI extends ilLPTableBaseGUI { @@ -89,7 +89,7 @@ public function __construct( ); $this->setRowTemplate( "tpl.user_object_matrix_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setDefaultOrderField("login"); $this->setDefaultOrderDirection("asc"); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php index 9f8f5348ef30..bafb7c73e88d 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php @@ -120,7 +120,7 @@ public function __construct( ); $this->setRowTemplate( "tpl.object_users_props_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableTitle(true); $this->setShowTemplates(true); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php index 6993d1e2fff0..0f4059c7cd11 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php @@ -21,7 +21,7 @@ /** * @author Jörg Lützenkirchen * @ilCtrl_Calls ilTrSummaryTableGUI: ilFormPropertyDispatchGUI - * @ingroup Services + * @ingroup components/ILIAS */ class ilTrSummaryTableGUI extends ilLPTableBaseGUI { @@ -97,7 +97,7 @@ public function __construct( $this->setFormAction( $this->ctrl->getFormActionByClass(get_class($this)) ); - $this->setRowTemplate("tpl.trac_summary_row.html", "Services/Tracking"); + $this->setRowTemplate("tpl.trac_summary_row.html", "components/ILIAS/Tracking"); $this->initFilter(); $this->getItems($a_parent_obj->getObjId(), $a_ref_id); diff --git a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php index 3c0cce505a1e..f0225bfd08c9 100644 --- a/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php +++ b/components/ILIAS/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php @@ -95,7 +95,7 @@ public function __construct( ); $this->setRowTemplate( "tpl.user_objects_props_row.html", - "Services/Tracking" + "components/ILIAS/Tracking" ); $this->setEnableTitle(true); $this->setDefaultOrderField("title"); diff --git a/components/ILIAS/Tracking/test/ilServicesTrackingSuite.php b/components/ILIAS/Tracking/test/ilServicesTrackingSuite.php index 9bf1862d5b4c..9226b7e834d7 100644 --- a/components/ILIAS/Tracking/test/ilServicesTrackingSuite.php +++ b/components/ILIAS/Tracking/test/ilServicesTrackingSuite.php @@ -9,7 +9,7 @@ class ilServicesTrackingSuite extends TestSuite public static function suite(): self { $suite = new self(); - include_once './Services/Tracking/test/ilTrackingCollectionTest.php'; + include_once './components/ILIAS/Tracking/test/ilTrackingCollectionTest.php'; $suite->addTestSuite(ilTrackingCollectionTest::class); return $suite; } diff --git a/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php b/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php index 8d6c153159a6..b04cdbcc9baa 100644 --- a/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php +++ b/components/ILIAS/Tree/classes/Setup/class.ilTreeSetupAgent.php @@ -67,7 +67,7 @@ public function getBuildArtifactObjective(): Objective public function getStatusObjective(Metrics\Storage $storage): Objective { return new Setup\ObjectiveCollection( - 'Services/Tree', + 'components/ILIAS/Tree', true, new ilDatabaseUpdateStepsMetricsCollectedObjective($storage, new ilTreeDBUpdateSteps8()), new ilTreeMetricsCollectedObjective($storage) diff --git a/components/ILIAS/Tree/classes/SystemCheck/class.ilSCTreeDuplicatesTableGUI.php b/components/ILIAS/Tree/classes/SystemCheck/class.ilSCTreeDuplicatesTableGUI.php index e3418472cff3..c2c107b1f200 100644 --- a/components/ILIAS/Tree/classes/SystemCheck/class.ilSCTreeDuplicatesTableGUI.php +++ b/components/ILIAS/Tree/classes/SystemCheck/class.ilSCTreeDuplicatesTableGUI.php @@ -21,7 +21,7 @@ public function init(): void $this->setFormAction($this->ctrl->getFormAction($this->getParentObject())); $this->setDisableFilterHiding(true); - $this->setRowTemplate('tpl.sc_tree_duplicates_row.html', 'Services/Tree'); + $this->setRowTemplate('tpl.sc_tree_duplicates_row.html', 'components/ILIAS/Tree'); $this->addColumn($this->lng->txt('sysc_duplicates_repository'), ''); $this->addColumn($this->lng->txt('sysc_duplicates_trash'), ''); diff --git a/components/ILIAS/Tree/classes/class.ilPathGUI.php b/components/ILIAS/Tree/classes/class.ilPathGUI.php index 96168d953bf8..2dd07cd0799a 100644 --- a/components/ILIAS/Tree/classes/class.ilPathGUI.php +++ b/components/ILIAS/Tree/classes/class.ilPathGUI.php @@ -135,7 +135,7 @@ public function displayCut(): bool protected function getHTML(): string { if ($this->textOnly()) { - $tpl = new ilTemplate('tpl.locator_text_only.html', true, true, "Services/Locator"); + $tpl = new ilTemplate('tpl.locator_text_only.html', true, true, "components/ILIAS/Locator"); $first = true; @@ -169,7 +169,7 @@ protected function getHTML(): string } else { // With images and links - $tpl = new ilTemplate('tpl.locator.html', true, true, 'Services/Locator'); + $tpl = new ilTemplate('tpl.locator.html', true, true, 'components/ILIAS/Locator'); $first = true; diff --git a/components/ILIAS/Tree/classes/class.ilTree.php b/components/ILIAS/Tree/classes/class.ilTree.php index 5c4f93fc37f9..65f27e4e7f5f 100644 --- a/components/ILIAS/Tree/classes/class.ilTree.php +++ b/components/ILIAS/Tree/classes/class.ilTree.php @@ -686,7 +686,7 @@ public function insertNode( } if (isset($this->eventHandler) && ($this->eventHandler instanceof ilAppEventHandler) && $this->__isMainTree()) { $this->eventHandler->raise( - 'Services/Tree', + 'components/ILIAS/Tree', 'insertNode', [ 'tree' => $this->table_tree, @@ -2063,7 +2063,7 @@ public function moveTree(int $a_source_id, int $a_target_id, int $a_location = s $this->getTreeImplementation()->moveTree($a_source_id, $a_target_id, $a_location); if (isset($GLOBALS['DIC']["ilAppEventHandler"]) && $this->__isMainTree()) { $GLOBALS['DIC']['ilAppEventHandler']->raise( - "Services/Tree", + "components/ILIAS/Tree", "moveTree", array( 'tree' => $this->table_tree, @@ -2159,7 +2159,7 @@ public function deleteNode(int $a_tree_id, int $a_node_id): void $this->db->manipulate($query); $this->eventHandler->raise( - "Services/Tree", + "components/ILIAS/Tree", "deleteNode", [ 'tree' => $this->table_tree, diff --git a/components/ILIAS/Tree/test/ilServicesTreeSuite.php b/components/ILIAS/Tree/test/ilServicesTreeSuite.php index 29ec5df67d87..03025b079bac 100644 --- a/components/ILIAS/Tree/test/ilServicesTreeSuite.php +++ b/components/ILIAS/Tree/test/ilServicesTreeSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - include_once './Services/Tree/test/ilRepositoryTreeTest.php'; + include_once './components/ILIAS/Tree/test/ilRepositoryTreeTest.php'; $suite->addTestSuite(ilRepositoryTreeTest::class); return $suite; } diff --git a/components/ILIAS/UIComponent/AdvancedSelectionList/classes/class.ilAdvancedSelectionListGUI.php b/components/ILIAS/UIComponent/AdvancedSelectionList/classes/class.ilAdvancedSelectionListGUI.php index d2a46814d11e..6d6c027b77d9 100644 --- a/components/ILIAS/UIComponent/AdvancedSelectionList/classes/class.ilAdvancedSelectionListGUI.php +++ b/components/ILIAS/UIComponent/AdvancedSelectionList/classes/class.ilAdvancedSelectionListGUI.php @@ -450,13 +450,13 @@ public function getHTML(bool $a_only_cmd_list_asynch = false): string return ""; } - $this->global_tpl->addJavaScript("./Services/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); + $this->global_tpl->addJavaScript("./components/ILIAS/UIComponent/AdvancedSelectionList/js/AdvancedSelectionList.js"); $tpl = new ilTemplate( "tpl.adv_selection_list.html", true, true, - "Services/UIComponent/AdvancedSelectionList", + "components/ILIAS/UIComponent/AdvancedSelectionList", "DEFAULT", false, true @@ -744,7 +744,7 @@ protected function getJSTemplate(): ilTemplate "tpl.adv_selection_list_js_init.js", true, true, - "Services/UIComponent/AdvancedSelectionList", + "components/ILIAS/UIComponent/AdvancedSelectionList", "DEFAULT", false, true diff --git a/components/ILIAS/UIComponent/CheckboxListOverlay/classes/class.ilCheckboxListOverlayGUI.php b/components/ILIAS/UIComponent/CheckboxListOverlay/classes/class.ilCheckboxListOverlayGUI.php index 8cd21a0a9de6..eee63e56f4cb 100644 --- a/components/ILIAS/UIComponent/CheckboxListOverlay/classes/class.ilCheckboxListOverlayGUI.php +++ b/components/ILIAS/UIComponent/CheckboxListOverlay/classes/class.ilCheckboxListOverlayGUI.php @@ -125,7 +125,7 @@ public function getHTML(bool $pull_right = true): string "tpl.checkbox_list_overlay.html", true, true, - "Services/UIComponent/CheckboxListOverlay", + "components/ILIAS/UIComponent/CheckboxListOverlay", "DEFAULT", false, true diff --git a/components/ILIAS/UIComponent/Confirmation/class.ilConfirmationTableGUI.php b/components/ILIAS/UIComponent/Confirmation/class.ilConfirmationTableGUI.php index 9242c47ac6af..59027b55bf32 100644 --- a/components/ILIAS/UIComponent/Confirmation/class.ilConfirmationTableGUI.php +++ b/components/ILIAS/UIComponent/Confirmation/class.ilConfirmationTableGUI.php @@ -50,7 +50,7 @@ public function __construct(bool $a_use_icons) $this->addColumn($this->lng->txt("title")); $this->setEnableHeader(true); - $this->setRowTemplate("tpl.confirmation_row.html", "Services/Utilities"); + $this->setRowTemplate("tpl.confirmation_row.html", "components/ILIAS/Utilities"); $this->disable("footer"); $this->setEnableTitle(true); } diff --git a/components/ILIAS/UIComponent/Explorer/classes/class.ilExplorer.php b/components/ILIAS/UIComponent/Explorer/classes/class.ilExplorer.php index 6770d4e92f09..8c0b71abecb5 100644 --- a/components/ILIAS/UIComponent/Explorer/classes/class.ilExplorer.php +++ b/components/ILIAS/UIComponent/Explorer/classes/class.ilExplorer.php @@ -532,13 +532,13 @@ public function getOutput(): string } ilYuiUtil::initConnection(); - $tpl->addJavaScript("./Services/UIComponent/Explorer/js/ilExplorer.js"); + $tpl->addJavaScript("./components/ILIAS/UIComponent/Explorer/js/ilExplorer.js"); //echo "hh"; // set global body class // $tpl->setBodyClass("il_Explorer"); - $tpl_tree = new ilTemplate("tpl.tree.html", true, true, "Services/UIComponent/Explorer"); + $tpl_tree = new ilTemplate("tpl.tree.html", true, true, "components/ILIAS/UIComponent/Explorer"); // updater if (($this->requestStr("ict") !== "" || diff --git a/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerBaseGUI.php b/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerBaseGUI.php index 5b88e6de5957..2bf2e1c7abde 100644 --- a/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerBaseGUI.php +++ b/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerBaseGUI.php @@ -35,7 +35,7 @@ abstract class ilExplorerBaseGUI protected static string $js_tree_path = "./node_modules/jstree/dist/jstree.js"; protected static string $js_tree_path_css = "./node_modules/jstree/dist/themes/default/style.min.css"; - protected static string $js_expl_path = "./Services/UIComponent/Explorer2/js/Explorer2.js"; + protected static string $js_expl_path = "./components/ILIAS/UIComponent/Explorer2/js/Explorer2.js"; protected bool $skip_root_node = false; protected bool $ajax = false; protected array $custom_open_nodes = array(); @@ -138,8 +138,8 @@ public static function getLocalJsTreeCssPath(): string public static function createHTMLExportDirs(string $a_target_dir): void { - ilFileUtils::makeDirParents($a_target_dir . "/Services/UIComponent/Explorer2/lib/jstree-v.pre1.0"); - ilFileUtils::makeDirParents($a_target_dir . "/Services/UIComponent/Explorer2/js"); + ilFileUtils::makeDirParents($a_target_dir . "/components/ILIAS/UIComponent/Explorer2/lib/jstree-v.pre1.0"); + ilFileUtils::makeDirParents($a_target_dir . "/components/ILIAS/UIComponent/Explorer2/js"); } @@ -480,7 +480,7 @@ public function getNodeAsync(): string { $this->beforeRendering(); - $etpl = new ilTemplate("tpl.explorer2.html", true, true, "Services/UIComponent/Explorer2"); + $etpl = new ilTemplate("tpl.explorer2.html", true, true, "components/ILIAS/UIComponent/Explorer2"); $root = $this->getNodeId($this->getRootNode()); if (!in_array($root, $this->open_nodes)) { @@ -629,7 +629,7 @@ public function getHTML(): string $tpl->addOnLoadCode($this->getOnLoadCode()); } - $etpl = new ilTemplate("tpl.explorer2.html", true, true, "Services/UIComponent/Explorer2"); + $etpl = new ilTemplate("tpl.explorer2.html", true, true, "components/ILIAS/UIComponent/Explorer2"); if (!$this->ajax) { // render childs diff --git a/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerSelectInputGUI.php b/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerSelectInputGUI.php index 7b974ce87f21..09729e2c7100 100644 --- a/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerSelectInputGUI.php +++ b/components/ILIAS/UIComponent/Explorer2/classes/class.ilExplorerSelectInputGUI.php @@ -152,13 +152,13 @@ public function render(string $a_mode = "property_form"): string { $lng = $this->lng; - $this->global_tpl->addJavascript("./Services/UIComponent/Explorer2/js/Explorer2.js"); - $this->global_tpl->addJavascript("./Services/UIComponent/Modal/js/Modal.js"); + $this->global_tpl->addJavascript("./components/ILIAS/UIComponent/Explorer2/js/Explorer2.js"); + $this->global_tpl->addJavascript("./components/ILIAS/UIComponent/Modal/js/Modal.js"); $this->global_tpl->addOnLoadCode( "il.Explorer2.initSelect('" . $this->getFieldId() . "');" ); - $tpl = new ilTemplate("tpl.prop_expl_select.html", true, true, "Services/UIComponent/Explorer2"); + $tpl = new ilTemplate("tpl.prop_expl_select.html", true, true, "components/ILIAS/UIComponent/Explorer2"); if ($a_mode !== "property_form") { $tpl->touchBlock("tiny_presentation"); diff --git a/components/ILIAS/UIComponent/GroupedList/classes/class.ilGroupedListGUI.php b/components/ILIAS/UIComponent/GroupedList/classes/class.ilGroupedListGUI.php index 0f40a17fa2f4..58b9d9aa62c1 100644 --- a/components/ILIAS/UIComponent/GroupedList/classes/class.ilGroupedListGUI.php +++ b/components/ILIAS/UIComponent/GroupedList/classes/class.ilGroupedListGUI.php @@ -96,7 +96,7 @@ public function getHTML(): string { $ilCtrl = $this->ctrl; - $tpl = new ilTemplate("tpl.grouped_list.html", true, true, "Services/UIComponent/GroupedList"); + $tpl = new ilTemplate("tpl.grouped_list.html", true, true, "components/ILIAS/UIComponent/GroupedList"); $tt_calls = ""; foreach ($this->items as $i) { switch ($i["type"]) { diff --git a/components/ILIAS/UIComponent/Modal/classes/class.ilModalGUI.php b/components/ILIAS/UIComponent/Modal/classes/class.ilModalGUI.php index 6a33cff4828d..a98b7589984b 100644 --- a/components/ILIAS/UIComponent/Modal/classes/class.ilModalGUI.php +++ b/components/ILIAS/UIComponent/Modal/classes/class.ilModalGUI.php @@ -107,7 +107,7 @@ public function getButtons(): array public function getHTML(): string { - $tpl = new ilTemplate("tpl.modal.html", true, true, "Services/UIComponent/Modal"); + $tpl = new ilTemplate("tpl.modal.html", true, true, "components/ILIAS/UIComponent/Modal"); if (count($this->getButtons()) > 0) { foreach ($this->getButtons() as $b) { @@ -143,6 +143,6 @@ public static function initJS(ilGlobalTemplateInterface $a_main_tpl = null): voi $tpl = $a_main_tpl ?? $DIC["tpl"]; - $tpl->addJavaScript("./Services/UIComponent/Modal/js/Modal.js"); + $tpl->addJavaScript("./components/ILIAS/UIComponent/Modal/js/Modal.js"); } } diff --git a/components/ILIAS/UIComponent/NestedList/classes/class.ilNestedList.php b/components/ILIAS/UIComponent/NestedList/classes/class.ilNestedList.php index 8045bc4d66f8..bb5c6c976377 100644 --- a/components/ILIAS/UIComponent/NestedList/classes/class.ilNestedList.php +++ b/components/ILIAS/UIComponent/NestedList/classes/class.ilNestedList.php @@ -85,7 +85,7 @@ public function getNumbers(): array public function getHTML(): string { - $tpl = new ilTemplate("tpl.nested_list.html", true, true, "Services/UIComponent/NestedList"); + $tpl = new ilTemplate("tpl.nested_list.html", true, true, "components/ILIAS/UIComponent/NestedList"); $nr = array(); $depth = 1; diff --git a/components/ILIAS/UIComponent/Overlay/classes/class.ilOverlayGUI.php b/components/ILIAS/UIComponent/Overlay/classes/class.ilOverlayGUI.php index 5731bffd02d8..88557a3ce2be 100644 --- a/components/ILIAS/UIComponent/Overlay/classes/class.ilOverlayGUI.php +++ b/components/ILIAS/UIComponent/Overlay/classes/class.ilOverlayGUI.php @@ -157,7 +157,7 @@ public static function initJavascript(): void $tpl = $DIC->ui()->mainTemplate(); ilYuiUtil::initOverlay($tpl); - $tpl->addJavaScript("./Services/UIComponent/Overlay/js/ilOverlay.js"); + $tpl->addJavaScript("./components/ILIAS/UIComponent/Overlay/js/ilOverlay.js"); } public function getTriggerOnLoadCode( diff --git a/components/ILIAS/UIComponent/Panel/classes/class.ilPanelGUI.php b/components/ILIAS/UIComponent/Panel/classes/class.ilPanelGUI.php index 101f2b262183..c11d105fbef8 100644 --- a/components/ILIAS/UIComponent/Panel/classes/class.ilPanelGUI.php +++ b/components/ILIAS/UIComponent/Panel/classes/class.ilPanelGUI.php @@ -109,7 +109,7 @@ public function getFooterStyle(): int public function getHTML(): string { - $tpl = new ilTemplate("tpl.panel.html", true, true, "Services/UIComponent/Panel"); + $tpl = new ilTemplate("tpl.panel.html", true, true, "components/ILIAS/UIComponent/Panel"); $head_outer_div_style = ""; if ($this->getHeading() !== "") { diff --git a/components/ILIAS/UIComponent/ProgressBar/classes/class.ilProgressBar.php b/components/ILIAS/UIComponent/ProgressBar/classes/class.ilProgressBar.php index e7fbe693b1ee..05fcbc0807e3 100644 --- a/components/ILIAS/UIComponent/ProgressBar/classes/class.ilProgressBar.php +++ b/components/ILIAS/UIComponent/ProgressBar/classes/class.ilProgressBar.php @@ -126,7 +126,7 @@ public function setId(string $a_id): void public function render(): string { - $tpl = new ilTemplate("tpl.il_progress.html", true, true, "Services/UIComponent/ProgressBar"); + $tpl = new ilTemplate("tpl.il_progress.html", true, true, "components/ILIAS/UIComponent/ProgressBar"); $tpl->setVariable("MIN", $this->min); $tpl->setVariable("MAX", $this->max); @@ -158,7 +158,7 @@ public function render(): string } if ($this->ajax_url !== '' && $this->ajax_timeout) { - $this->main_tpl->addJavaScript("Services/UIComponent/ProgressBar/js/progress_bar.js"); + $this->main_tpl->addJavaScript("components/ILIAS/UIComponent/ProgressBar/js/progress_bar.js"); $tpl->setCurrentBlock('async_status'); $tpl->setVariable('ASYNC_STATUS_ID', $this->unique_id); $tpl->setVariable('ICON_OK', ilUtil::getImagePath('standard/icon_ok.svg')); diff --git a/components/ILIAS/UIComponent/SplitButton/classes/class.ilSplitButtonGUI.php b/components/ILIAS/UIComponent/SplitButton/classes/class.ilSplitButtonGUI.php index f042738a1367..d28b9fc3ea45 100644 --- a/components/ILIAS/UIComponent/SplitButton/classes/class.ilSplitButtonGUI.php +++ b/components/ILIAS/UIComponent/SplitButton/classes/class.ilSplitButtonGUI.php @@ -104,7 +104,7 @@ public function setDefaultButton(ilButtonBase $default_button): void */ public function render(): string { - $tpl = new ilTemplate('tpl.split_button.html', true, true, 'Services/UIComponent/SplitButton'); + $tpl = new ilTemplate('tpl.split_button.html', true, true, 'components/ILIAS/UIComponent/SplitButton'); if (!$this->hasDefaultButton()) { throw new ilSplitButtonException( diff --git a/components/ILIAS/UIComponent/Tabs/classes/class.ilTabsGUI.php b/components/ILIAS/UIComponent/Tabs/classes/class.ilTabsGUI.php index b2b532f6ca04..2280d83b5ea7 100644 --- a/components/ILIAS/UIComponent/Tabs/classes/class.ilTabsGUI.php +++ b/components/ILIAS/UIComponent/Tabs/classes/class.ilTabsGUI.php @@ -369,12 +369,12 @@ private function __getHTML( } if ($a_get_sub_tabs) { - $tpl = new ilTemplate("tpl.sub_tabs.html", true, true, "Services/UIComponent/Tabs"); + $tpl = new ilTemplate("tpl.sub_tabs.html", true, true, "components/ILIAS/UIComponent/Tabs"); $pre = "sub"; $pre2 = "SUB_"; $sr_pre = "sub_"; } else { - $tpl = new ilTemplate("tpl.tabs.html", true, true, "Services/UIComponent/Tabs"); + $tpl = new ilTemplate("tpl.tabs.html", true, true, "components/ILIAS/UIComponent/Tabs"); if ($a_after_tabs_anchor) { $tpl->touchBlock("after_tabs"); } diff --git a/components/ILIAS/UIComponent/TextHighlighter/classes/class.ilTextHighlighterGUI.php b/components/ILIAS/UIComponent/TextHighlighter/classes/class.ilTextHighlighterGUI.php index bd44455d34ad..8adfd393ee98 100644 --- a/components/ILIAS/UIComponent/TextHighlighter/classes/class.ilTextHighlighterGUI.php +++ b/components/ILIAS/UIComponent/TextHighlighter/classes/class.ilTextHighlighterGUI.php @@ -44,7 +44,7 @@ public static function highlight( if ($a_tpl === null) { $a_tpl = $tpl; } - $a_tpl->addJavaScript("./Services/UIComponent/TextHighlighter/js/ilTextHighlighter.js"); + $a_tpl->addJavaScript("./components/ILIAS/UIComponent/TextHighlighter/js/ilTextHighlighter.js"); $a_tpl->addOnLoadCode("il.TextHighlighter.highlight('" . $a_dom_node_id . "','" . $a_text . "');"); } } diff --git a/components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php b/components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php index ed737bf760b5..670b44fa58a1 100644 --- a/components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php +++ b/components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php @@ -286,12 +286,12 @@ public function getHTML(): string $this->applyAutoStickyToSingleElement(); if (count($this->items) || count($this->sticky_items)) { - $tpl = new ilTemplate("tpl.toolbar.html", true, true, "Services/UIComponent/Toolbar"); + $tpl = new ilTemplate("tpl.toolbar.html", true, true, "components/ILIAS/UIComponent/Toolbar"); $tpl->setVariable('TOOLBAR_ID', $this->getId()); $tpl->setVariable('MORE_LABEL', $this->lng->txt('toolbar_more_actions')); if (count($this->sticky_items)) { - $tpl_sticky = new ilTemplate("tpl.toolbar_sticky_items.html", true, true, "Services/UIComponent/Toolbar"); + $tpl_sticky = new ilTemplate("tpl.toolbar_sticky_items.html", true, true, "components/ILIAS/UIComponent/Toolbar"); /** @var ilToolbarItem $sticky_item */ foreach ($this->sticky_items as $sticky_item) { if ($sticky_item['label']) { @@ -323,11 +323,11 @@ public function getHTML(): string $markup_items = ''; foreach ($this->getGroupedItems() as $i => $group) { - $tpl_items = new ilTemplate("tpl.toolbar_items.html", true, true, "Services/UIComponent/Toolbar"); + $tpl_items = new ilTemplate("tpl.toolbar_items.html", true, true, "components/ILIAS/UIComponent/Toolbar"); if ($i > 0) { static $tpl_separator; if ($tpl_separator === null) { - $tpl_separator = new ilTemplate('tpl.toolbar_separator.html', true, true, 'Services/UIComponent/Toolbar'); + $tpl_separator = new ilTemplate('tpl.toolbar_separator.html', true, true, 'components/ILIAS/UIComponent/Toolbar'); } $tpl_separator->touchBlock('separator'); $markup_items .= $tpl_separator->get(); @@ -453,7 +453,7 @@ public function getHTML(): string // form? if ($this->getFormAction() !== "") { // #18947 - $GLOBALS["tpl"]->addJavaScript("Services/Form/js/Form.js"); + $GLOBALS["tpl"]->addJavaScript("components/ILIAS/Form/js/Form.js"); if ($this->getOpenFormTag()) { $tpl->setCurrentBlock("form_open"); diff --git a/components/ILIAS/UIComponent/Tooltip/classes/class.ilTooltipGUI.php b/components/ILIAS/UIComponent/Tooltip/classes/class.ilTooltipGUI.php index b9e7aef854c7..371c7010b2f7 100644 --- a/components/ILIAS/UIComponent/Tooltip/classes/class.ilTooltipGUI.php +++ b/components/ILIAS/UIComponent/Tooltip/classes/class.ilTooltipGUI.php @@ -96,7 +96,7 @@ public static function init(): void if (!self::$initialized) { $tpl->addCss("./node_modules/qtip2/dist/jquery.qtip.min.css"); $tpl->addJavascript("./node_modules/qtip2/dist/jquery.qtip.min.js"); - $tpl->addJavascript("./Services/UIComponent/Tooltip/js/ilTooltip.js"); + $tpl->addJavascript("./components/ILIAS/UIComponent/Tooltip/js/ilTooltip.js"); // use setTimeout as a workaround, since the last parameter is ignored $tpl->addOnLoadCode('setTimeout(function() {il.Tooltip.init();}, 500);', 3); diff --git a/components/ILIAS/UIComponent/classes/class.ilUIHookPluginGUI.php b/components/ILIAS/UIComponent/classes/class.ilUIHookPluginGUI.php index 76430e62e174..effe18aca627 100644 --- a/components/ILIAS/UIComponent/classes/class.ilUIHookPluginGUI.php +++ b/components/ILIAS/UIComponent/classes/class.ilUIHookPluginGUI.php @@ -74,7 +74,7 @@ public function getHTML( * by Global Screen and UI Components instead. * * In ILIAS 6.0 still working for working for: - * - $a_comp="Services/Ini" ; $a_part="init_style" + * - $a_comp="components/ILIAS/Ini" ; $a_part="init_style" * - $a_comp="" ; $a_part="tabs" * - $a_comp="" ; $a_part="sub_tabs" * diff --git a/components/ILIAS/UIComponent/test/ilServicesUIComponentSuite.php b/components/ILIAS/UIComponent/test/ilServicesUIComponentSuite.php index e666d9e76f64..19327185b9f8 100644 --- a/components/ILIAS/UIComponent/test/ilServicesUIComponentSuite.php +++ b/components/ILIAS/UIComponent/test/ilServicesUIComponentSuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/UIComponent/test/UIHookPluginGUITest.php"); + require_once("./components/ILIAS/UIComponent/test/UIHookPluginGUITest.php"); $suite->addTestSuite("UIHookPluginGUITest"); return $suite; diff --git a/components/ILIAS/UICore/artifacts/ctrl_structure.php b/components/ILIAS/UICore/artifacts/ctrl_structure.php index d29aeb57909e..8b3237ff218e 100644 --- a/components/ILIAS/UICore/artifacts/ctrl_structure.php +++ b/components/ILIAS/UICore/artifacts/ctrl_structure.php @@ -26,9 +26,22 @@ 0 => 'ilobjfileaccesssettingsgui', ), ), + 'ilias\\tests\\ctrl\\ilctrlnamespacedtestgui' => + array ( + 'cid' => '10', + 'class_name' => 'ILIAS\\Tests\\Ctrl\\ilCtrlNamespacedTestGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlNamespacedTestGUI.php', + 'children' => + array ( + ), + 'parents' => + array ( + 0 => 'ilctrlbaseclass1testgui', + ), + ), 'mcstimagegallerygui' => array ( - 'cid' => '11', + 'cid' => '12', 'class_name' => 'McstImageGalleryGUI', 'class_path' => './components/ILIAS/MediaCast/Presentation/class.McstImageGalleryGUI.php', 'children' => @@ -41,7 +54,7 @@ ), 'mcstpodcastgui' => array ( - 'cid' => '12', + 'cid' => '13', 'class_name' => 'McstPodcastGUI', 'class_path' => './components/ILIAS/MediaCast/Presentation/class.McstPodcastGUI.php', 'children' => @@ -55,9 +68,9 @@ ), 'skilltreeadmingui' => array ( - 'cid' => '13', + 'cid' => '14', 'class_name' => 'SkillTreeAdminGUI', - 'class_path' => './Services/Skill/Tree/class.SkillTreeAdminGUI.php', + 'class_path' => './components/ILIAS/Skill/Tree/class.SkillTreeAdminGUI.php', 'children' => array ( 0 => 'ilobjskilltreegui', @@ -69,7 +82,7 @@ ), 'surveymatrixquestiongui' => array ( - 'cid' => '15', + 'cid' => '16', 'class_name' => 'SurveyMatrixQuestionGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/Questions/class.SurveyMatrixQuestionGUI.php', 'children' => @@ -83,7 +96,7 @@ ), 'surveymetricquestiongui' => array ( - 'cid' => '16', + 'cid' => '17', 'class_name' => 'SurveyMetricQuestionGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/Questions/class.SurveyMetricQuestionGUI.php', 'children' => @@ -97,7 +110,7 @@ ), 'surveymultiplechoicequestiongui' => array ( - 'cid' => '17', + 'cid' => '18', 'class_name' => 'SurveyMultipleChoiceQuestionGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/Questions/class.SurveyMultipleChoiceQuestionGUI.php', 'children' => @@ -111,7 +124,7 @@ ), 'surveysinglechoicequestiongui' => array ( - 'cid' => '19', + 'cid' => '1a', 'class_name' => 'SurveySingleChoiceQuestionGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/Questions/class.SurveySingleChoiceQuestionGUI.php', 'children' => @@ -125,7 +138,7 @@ ), 'surveytextquestiongui' => array ( - 'cid' => '1a', + 'cid' => '1b', 'class_name' => 'SurveyTextQuestionGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/Questions/class.SurveyTextQuestionGUI.php', 'children' => @@ -139,7 +152,7 @@ ), 'assclozetestgui' => array ( - 'cid' => '1b', + 'cid' => '1c', 'class_name' => 'assClozeTestGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assClozeTestGUI.php', 'children' => @@ -157,7 +170,7 @@ ), 'asserrortextgui' => array ( - 'cid' => '1c', + 'cid' => '1d', 'class_name' => 'assErrorTextGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assErrorTextGUI.php', 'children' => @@ -173,7 +186,7 @@ ), 'assfileuploadgui' => array ( - 'cid' => '1e', + 'cid' => '1f', 'class_name' => 'assFileUploadGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assFileUploadGUI.php', 'children' => @@ -188,7 +201,7 @@ ), 'assformulaquestiongui' => array ( - 'cid' => '1f', + 'cid' => '1g', 'class_name' => 'assFormulaQuestionGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assFormulaQuestionGUI.php', 'children' => @@ -206,7 +219,7 @@ ), 'assimagemapquestiongui' => array ( - 'cid' => '1g', + 'cid' => '1h', 'class_name' => 'assImagemapQuestionGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assImagemapQuestionGUI.php', 'children' => @@ -225,7 +238,7 @@ ), 'asskprimchoicegui' => array ( - 'cid' => '1h', + 'cid' => '1i', 'class_name' => 'assKprimChoiceGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assKprimChoiceGUI.php', 'children' => @@ -242,7 +255,7 @@ ), 'asslongmenugui' => array ( - 'cid' => '1i', + 'cid' => '1j', 'class_name' => 'assLongMenuGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assLongMenuGUI.php', 'children' => @@ -259,7 +272,7 @@ ), 'assmatchingquestiongui' => array ( - 'cid' => '1j', + 'cid' => '1k', 'class_name' => 'assMatchingQuestionGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assMatchingQuestionGUI.php', 'children' => @@ -277,7 +290,7 @@ ), 'assmultiplechoicegui' => array ( - 'cid' => '1k', + 'cid' => '1l', 'class_name' => 'assMultipleChoiceGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assMultipleChoiceGUI.php', 'children' => @@ -295,7 +308,7 @@ ), 'assnumericgui' => array ( - 'cid' => '1l', + 'cid' => '1m', 'class_name' => 'assNumericGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assNumericGUI.php', 'children' => @@ -313,7 +326,7 @@ ), 'assorderinghorizontalgui' => array ( - 'cid' => '1m', + 'cid' => '1n', 'class_name' => 'assOrderingHorizontalGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assOrderingHorizontalGUI.php', 'children' => @@ -330,7 +343,7 @@ ), 'assorderingquestiongui' => array ( - 'cid' => '1n', + 'cid' => '1o', 'class_name' => 'assOrderingQuestionGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assOrderingQuestionGUI.php', 'children' => @@ -348,7 +361,7 @@ ), 'asssinglechoicegui' => array ( - 'cid' => '1p', + 'cid' => '1q', 'class_name' => 'assSingleChoiceGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assSingleChoiceGUI.php', 'children' => @@ -366,7 +379,7 @@ ), 'asstextquestiongui' => array ( - 'cid' => '1q', + 'cid' => '1r', 'class_name' => 'assTextQuestionGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assTextQuestionGUI.php', 'children' => @@ -384,7 +397,7 @@ ), 'asstextsubsetgui' => array ( - 'cid' => '1r', + 'cid' => '1s', 'class_name' => 'assTextSubsetGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.assTextSubsetGUI.php', 'children' => @@ -402,9 +415,9 @@ ), 'iladnnotificationgui' => array ( - 'cid' => '1w', + 'cid' => '1x', 'class_name' => 'ilADNNotificationGUI', - 'class_path' => './Services/AdministrativeNotification/classes/class.ilADNNotificationGUI.php', + 'class_path' => './components/ILIAS/AdministrativeNotification/classes/class.ilADNNotificationGUI.php', 'children' => array ( ), @@ -416,9 +429,9 @@ ), 'ilaccessibilitycontrolconceptgui' => array ( - 'cid' => '22', + 'cid' => '23', 'class_name' => 'ilAccessibilityControlConceptGUI', - 'class_path' => './Services/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php', + 'class_path' => './components/ILIAS/Accessibility/classes/class.ilAccessibilityControlConceptGUI.php', 'children' => array ( ), @@ -429,9 +442,9 @@ ), 'ilaccessibilitydocumentgui' => array ( - 'cid' => '25', + 'cid' => '26', 'class_name' => 'ilAccessibilityDocumentGUI', - 'class_path' => './Services/Accessibility/classes/Document/class.ilAccessibilityDocumentGUI.php', + 'class_path' => './components/ILIAS/Accessibility/classes/Document/class.ilAccessibilityDocumentGUI.php', 'children' => array ( ), @@ -442,7 +455,7 @@ ), 'ilaccessibilitysupportcontactsgui' => array ( - 'cid' => '27', + 'cid' => '28', 'class_name' => 'ilAccessibilitySupportContactsGUI', 'class_path' => './components/ILIAS/SystemFolder/classes/class.ilAccessibilitySupportContactsGUI.php', 'children' => @@ -454,9 +467,9 @@ ), 'ilaccordionpropertiesstoragegui' => array ( - 'cid' => '2b', + 'cid' => '2c', 'class_name' => 'ilAccordionPropertiesStorageGUI', - 'class_path' => './Services/Accordion/classes/class.ilAccordionPropertiesStorageGUI.php', + 'class_path' => './components/ILIAS/Accordion/classes/class.ilAccordionPropertiesStorageGUI.php', 'children' => array ( ), @@ -466,9 +479,9 @@ ), 'ilaccountregistrationgui' => array ( - 'cid' => '2c', + 'cid' => '2d', 'class_name' => 'ilAccountRegistrationGUI', - 'class_path' => './Services/Registration/classes/class.ilAccountRegistrationGUI.php', + 'class_path' => './components/ILIAS/Registration/classes/class.ilAccountRegistrationGUI.php', 'children' => array ( ), @@ -479,9 +492,9 @@ ), 'ilachievementsgui' => array ( - 'cid' => '2d', + 'cid' => '2e', 'class_name' => 'ilAchievementsGUI', - 'class_path' => './Services/Dashboard/Achievements/classes/class.ilAchievementsGUI.php', + 'class_path' => './components/ILIAS/Dashboard/Achievements/classes/class.ilAchievementsGUI.php', 'children' => array ( 0 => 'illearningprogressgui', @@ -497,9 +510,9 @@ ), 'iladministrationgui' => array ( - 'cid' => '2h', + 'cid' => '2i', 'class_name' => 'ilAdministrationGUI', - 'class_path' => './Services/Administration/classes/class.ilAdministrationGUI.php', + 'class_path' => './components/ILIAS/Administration/classes/class.ilAdministrationGUI.php', 'children' => array ( 0 => 'ilobjgroupgui', @@ -636,9 +649,9 @@ ), 'iladvancedmdrecordtranslationgui' => array ( - 'cid' => '2p', + 'cid' => '2q', 'class_name' => 'ilAdvancedMDRecordTranslationGUI', - 'class_path' => './Services/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordTranslationGUI.php', + 'class_path' => './components/ILIAS/AdvancedMetaData/classes/Translation/class.ilAdvancedMDRecordTranslationGUI.php', 'children' => array ( ), @@ -649,9 +662,9 @@ ), 'iladvancedmdsettingsgui' => array ( - 'cid' => '2q', + 'cid' => '2r', 'class_name' => 'ilAdvancedMDSettingsGUI', - 'class_path' => './Services/AdvancedMetaData/classes/class.ilAdvancedMDSettingsGUI.php', + 'class_path' => './components/ILIAS/AdvancedMetaData/classes/class.ilAdvancedMDSettingsGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -665,9 +678,9 @@ ), 'iladvancedsearchgui' => array ( - 'cid' => '2s', + 'cid' => '2t', 'class_name' => 'ilAdvancedSearchGUI', - 'class_path' => './Services/Search/classes/class.ilAdvancedSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilAdvancedSearchGUI.php', 'children' => array ( 0 => 'ilobjectgui', @@ -687,9 +700,9 @@ ), 'ilappointmentpresentationbookingpoolgui' => array ( - 'cid' => '2x', + 'cid' => '2y', 'class_name' => 'ilAppointmentPresentationBookingPoolGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationBookingPoolGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationBookingPoolGUI.php', 'children' => array ( ), @@ -700,9 +713,9 @@ ), 'ilappointmentpresentationconsultationhoursgui' => array ( - 'cid' => '2y', + 'cid' => '2z', 'class_name' => 'ilAppointmentPresentationConsultationHoursGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationConsultationHoursGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationConsultationHoursGUI.php', 'children' => array ( ), @@ -713,9 +726,9 @@ ), 'ilappointmentpresentationcoursegui' => array ( - 'cid' => '2z', + 'cid' => '30', 'class_name' => 'ilAppointmentPresentationCourseGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationCourseGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationCourseGUI.php', 'children' => array ( ), @@ -726,9 +739,9 @@ ), 'ilappointmentpresentationemployeetalkgui' => array ( - 'cid' => '30', + 'cid' => '31', 'class_name' => 'ilAppointmentPresentationEmployeeTalkGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationEmployeeTalkGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationEmployeeTalkGUI.php', 'children' => array ( ), @@ -739,9 +752,9 @@ ), 'ilappointmentpresentationexercisegui' => array ( - 'cid' => '31', + 'cid' => '32', 'class_name' => 'ilAppointmentPresentationExerciseGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationExerciseGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationExerciseGUI.php', 'children' => array ( ), @@ -752,9 +765,9 @@ ), 'ilappointmentpresentationgui' => array ( - 'cid' => '32', + 'cid' => '33', 'class_name' => 'ilAppointmentPresentationGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationGUI.php', 'children' => array ( ), @@ -765,9 +778,9 @@ ), 'ilappointmentpresentationgroupgui' => array ( - 'cid' => '33', + 'cid' => '34', 'class_name' => 'ilAppointmentPresentationGroupGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationGroupGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationGroupGUI.php', 'children' => array ( ), @@ -778,9 +791,9 @@ ), 'ilappointmentpresentationpublicgui' => array ( - 'cid' => '34', + 'cid' => '35', 'class_name' => 'ilAppointmentPresentationPublicGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationPublicGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationPublicGUI.php', 'children' => array ( ), @@ -791,9 +804,9 @@ ), 'ilappointmentpresentationsessiongui' => array ( - 'cid' => '35', + 'cid' => '36', 'class_name' => 'ilAppointmentPresentationSessionGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationSessionGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationSessionGUI.php', 'children' => array ( ), @@ -804,9 +817,9 @@ ), 'ilappointmentpresentationusergui' => array ( - 'cid' => '36', + 'cid' => '37', 'class_name' => 'ilAppointmentPresentationUserGUI', - 'class_path' => './Services/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationUserGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/AppointmentPresentation/class.ilAppointmentPresentationUserGUI.php', 'children' => array ( ), @@ -817,7 +830,7 @@ ), 'ilassgenfeedbackpagegui' => array ( - 'cid' => '3a', + 'cid' => '3b', 'class_name' => 'ilAssGenFeedbackPageGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/feedback/class.ilAssGenFeedbackPageGUI.php', 'children' => @@ -846,7 +859,7 @@ ), 'ilasshintpagegui' => array ( - 'cid' => '3b', + 'cid' => '3c', 'class_name' => 'ilAssHintPageGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssHintPageGUI.php', 'children' => @@ -868,7 +881,7 @@ ), 'ilassquestionfeedbackeditinggui' => array ( - 'cid' => '3l', + 'cid' => '3m', 'class_name' => 'ilAssQuestionFeedbackEditingGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionFeedbackEditingGUI.php', 'children' => @@ -886,7 +899,7 @@ ), 'ilassquestionhintgui' => array ( - 'cid' => '3n', + 'cid' => '3o', 'class_name' => 'ilAssQuestionHintGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionHintGUI.php', 'children' => @@ -900,7 +913,7 @@ ), 'ilassquestionhintrequestgui' => array ( - 'cid' => '3o', + 'cid' => '3p', 'class_name' => 'ilAssQuestionHintRequestGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionHintRequestGUI.php', 'children' => @@ -919,7 +932,7 @@ ), 'ilassquestionhintsgui' => array ( - 'cid' => '3p', + 'cid' => '3q', 'class_name' => 'ilAssQuestionHintsGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionHintsGUI.php', 'children' => @@ -938,7 +951,7 @@ ), 'ilassquestionhintstablegui' => array ( - 'cid' => '3q', + 'cid' => '3r', 'class_name' => 'ilAssQuestionHintsTableGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionHintsTableGUI.php', 'children' => @@ -952,7 +965,7 @@ ), 'ilassquestionpagegui' => array ( - 'cid' => '3r', + 'cid' => '3s', 'class_name' => 'ilAssQuestionPageGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPageGUI.php', 'children' => @@ -982,7 +995,7 @@ ), 'ilassquestionpreviewgui' => array ( - 'cid' => '3s', + 'cid' => '3t', 'class_name' => 'ilAssQuestionPreviewGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPreviewGUI.php', 'children' => @@ -1002,7 +1015,7 @@ ), 'ilassquestionpreviewtoolbargui' => array ( - 'cid' => '3t', + 'cid' => '3u', 'class_name' => 'ilAssQuestionPreviewToolbarGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionPreviewToolbarGUI.php', 'children' => @@ -1015,7 +1028,7 @@ ), 'ilassquestionrelatednavigationbargui' => array ( - 'cid' => '3u', + 'cid' => '3v', 'class_name' => 'ilAssQuestionRelatedNavigationBarGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionRelatedNavigationBarGUI.php', 'children' => @@ -1028,7 +1041,7 @@ ), 'ilassquestionskillassignmentpropertyformgui' => array ( - 'cid' => '3v', + 'cid' => '3w', 'class_name' => 'ilAssQuestionSkillAssignmentPropertyFormGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/forms/class.ilAssQuestionSkillAssignmentPropertyFormGUI.php', 'children' => @@ -1041,7 +1054,7 @@ ), 'ilassquestionskillassignmentsgui' => array ( - 'cid' => '3w', + 'cid' => '3x', 'class_name' => 'ilAssQuestionSkillAssignmentsGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillAssignmentsGUI.php', 'children' => @@ -1061,7 +1074,7 @@ ), 'ilassquestionskillassignmentstablegui' => array ( - 'cid' => '3x', + 'cid' => '3y', 'class_name' => 'ilAssQuestionSkillAssignmentsTableGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/tables/class.ilAssQuestionSkillAssignmentsTableGUI.php', 'children' => @@ -1074,7 +1087,7 @@ ), 'ilassquestionskillusagestablegui' => array ( - 'cid' => '3y', + 'cid' => '3z', 'class_name' => 'ilAssQuestionSkillUsagesTableGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilAssQuestionSkillUsagesTableGUI.php', 'children' => @@ -1087,7 +1100,7 @@ ), 'ilassspecfeedbackpagegui' => array ( - 'cid' => '40', + 'cid' => '41', 'class_name' => 'ilAssSpecFeedbackPageGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/feedback/class.ilAssSpecFeedbackPageGUI.php', 'children' => @@ -1113,7 +1126,7 @@ ), 'ilassignmentpresentationgui' => array ( - 'cid' => '44', + 'cid' => '45', 'class_name' => 'ilAssignmentPresentationGUI', 'class_path' => './components/ILIAS/Exercise/Assignment/class.ilAssignmentPresentationGUI.php', 'children' => @@ -1127,9 +1140,9 @@ ), 'ilauthloginpageeditorgui' => array ( - 'cid' => '48', + 'cid' => '49', 'class_name' => 'ilAuthLoginPageEditorGUI', - 'class_path' => './Services/Authentication/classes/class.ilAuthLoginPageEditorGUI.php', + 'class_path' => './components/ILIAS/Authentication/classes/class.ilAuthLoginPageEditorGUI.php', 'children' => array ( 0 => 'illoginpagegui', @@ -1141,9 +1154,9 @@ ), 'ilauthshibbolethsettingsgui' => array ( - 'cid' => '4a', + 'cid' => '4b', 'class_name' => 'ilAuthShibbolethSettingsGUI', - 'class_path' => './Services/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php', + 'class_path' => './components/ILIAS/AuthShibboleth/classes/class.ilAuthShibbolethSettingsGUI.php', 'children' => array ( ), @@ -1154,9 +1167,9 @@ ), 'ilawarenessgui' => array ( - 'cid' => '4c', + 'cid' => '4d', 'class_name' => 'ilAwarenessGUI', - 'class_path' => './Services/Awareness/classes/class.ilAwarenessGUI.php', + 'class_path' => './components/ILIAS/Awareness/classes/class.ilAwarenessGUI.php', 'children' => array ( ), @@ -1166,9 +1179,9 @@ ), 'ilbtcontrollergui' => array ( - 'cid' => '4d', + 'cid' => '4e', 'class_name' => 'ilBTControllerGUI', - 'class_path' => './Services/BackgroundTasks/classes/class.ilBTControllerGUI.php', + 'class_path' => './components/ILIAS/BackgroundTasks_/classes/class.ilBTControllerGUI.php', 'children' => array ( ), @@ -1178,9 +1191,9 @@ ), 'ilbadgemanagementgui' => array ( - 'cid' => '4i', + 'cid' => '4j', 'class_name' => 'ilBadgeManagementGUI', - 'class_path' => './Services/Badge/classes/class.ilBadgeManagementGUI.php', + 'class_path' => './components/ILIAS/Badge/classes/class.ilBadgeManagementGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -1194,9 +1207,9 @@ ), 'ilbadgeprofilegui' => array ( - 'cid' => '4k', + 'cid' => '4l', 'class_name' => 'ilBadgeProfileGUI', - 'class_path' => './Services/Badge/classes/class.ilBadgeProfileGUI.php', + 'class_path' => './components/ILIAS/Badge/classes/class.ilBadgeProfileGUI.php', 'children' => array ( ), @@ -1207,9 +1220,9 @@ ), 'ilbasicskillgui' => array ( - 'cid' => '4p', + 'cid' => '4q', 'class_name' => 'ilBasicSkillGUI', - 'class_path' => './Services/Skill/Node/class.ilBasicSkillGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilBasicSkillGUI.php', 'children' => array ( ), @@ -1221,9 +1234,9 @@ ), 'ilbasicskilltemplategui' => array ( - 'cid' => '4q', + 'cid' => '4r', 'class_name' => 'ilBasicSkillTemplateGUI', - 'class_path' => './Services/Skill/Node/class.ilBasicSkillTemplateGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilBasicSkillTemplateGUI.php', 'children' => array ( ), @@ -1235,7 +1248,7 @@ ), 'ilbibladminbibtexfieldgui' => array ( - 'cid' => '4s', + 'cid' => '4t', 'class_name' => 'ilBiblAdminBibtexFieldGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Field/class.ilBiblAdminBibtexFieldGUI.php', 'children' => @@ -1249,7 +1262,7 @@ ), 'ilbibladminfieldgui' => array ( - 'cid' => '4t', + 'cid' => '4u', 'class_name' => 'ilBiblAdminFieldGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Field/class.ilBiblAdminFieldGUI.php', 'children' => @@ -1262,7 +1275,7 @@ ), 'ilbibladminrisfieldgui' => array ( - 'cid' => '4v', + 'cid' => '4w', 'class_name' => 'ilBiblAdminRisFieldGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Field/class.ilBiblAdminRisFieldGUI.php', 'children' => @@ -1276,7 +1289,7 @@ ), 'ilbiblentrytablegui' => array ( - 'cid' => '4x', + 'cid' => '4y', 'class_name' => 'ilBiblEntryTableGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Entry/class.ilBiblEntryTableGUI.php', 'children' => @@ -1289,7 +1302,7 @@ ), 'ilbiblfieldfiltergui' => array ( - 'cid' => '50', + 'cid' => '51', 'class_name' => 'ilBiblFieldFilterGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/FieldFilter/class.ilBiblFieldFilterGUI.php', 'children' => @@ -1302,7 +1315,7 @@ ), 'ilbibllibrarygui' => array ( - 'cid' => '54', + 'cid' => '55', 'class_name' => 'ilBiblLibraryGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Admin/Library/class.ilBiblLibraryGUI.php', 'children' => @@ -1315,7 +1328,7 @@ ), 'ilbibltranslationgui' => array ( - 'cid' => '57', + 'cid' => '58', 'class_name' => 'ilBiblTranslationGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/Translation/class.ilBiblTranslationGUI.php', 'children' => @@ -1329,7 +1342,7 @@ ), 'ilblogexercisegui' => array ( - 'cid' => '5b', + 'cid' => '5c', 'class_name' => 'ilBlogExerciseGUI', 'class_path' => './components/ILIAS/Blog/Exercise/class.ilBlogExerciseGUI.php', 'children' => @@ -1342,7 +1355,7 @@ ), 'ilblogpostinggui' => array ( - 'cid' => '5d', + 'cid' => '5e', 'class_name' => 'ilBlogPostingGUI', 'class_path' => './components/ILIAS/Blog/Posting/class.ilBlogPostingGUI.php', 'children' => @@ -1362,7 +1375,7 @@ ), 'ilbookbulkcreationgui' => array ( - 'cid' => '5e', + 'cid' => '5f', 'class_name' => 'ilBookBulkCreationGUI', 'class_path' => './components/ILIAS/BookingManager/Objects/class.ilBookBulkCreationGUI.php', 'children' => @@ -1375,7 +1388,7 @@ ), 'ilbookinggatewaygui' => array ( - 'cid' => '5i', + 'cid' => '5j', 'class_name' => 'ilBookingGatewayGUI', 'class_path' => './components/ILIAS/BookingManager/BookingService/class.ilBookingGatewayGUI.php', 'children' => @@ -1392,7 +1405,7 @@ ), 'ilbookingobjectgui' => array ( - 'cid' => '5j', + 'cid' => '5k', 'class_name' => 'ilBookingObjectGUI', 'class_path' => './components/ILIAS/BookingManager/Objects/class.ilBookingObjectGUI.php', 'children' => @@ -1409,7 +1422,7 @@ ), 'ilbookingobjectservicegui' => array ( - 'cid' => '5k', + 'cid' => '5l', 'class_name' => 'ilBookingObjectServiceGUI', 'class_path' => './components/ILIAS/BookingManager/BookingService/class.ilBookingObjectServiceGUI.php', 'children' => @@ -1425,7 +1438,7 @@ ), 'ilbookingparticipantgui' => array ( - 'cid' => '5m', + 'cid' => '5n', 'class_name' => 'ilBookingParticipantGUI', 'class_path' => './components/ILIAS/BookingManager/Participants/class.ilBookingParticipantGUI.php', 'children' => @@ -1439,7 +1452,7 @@ ), 'ilbookingpreferencesgui' => array ( - 'cid' => '5o', + 'cid' => '5p', 'class_name' => 'ilBookingPreferencesGUI', 'class_path' => './components/ILIAS/BookingManager/Preferences/class.ilBookingPreferencesGUI.php', 'children' => @@ -1452,7 +1465,7 @@ ), 'ilbookingprocesswithschedulegui' => array ( - 'cid' => '5p', + 'cid' => '5q', 'class_name' => 'ilBookingProcessWithScheduleGUI', 'class_path' => './components/ILIAS/BookingManager/BookingProcess/class.ilBookingProcessWithScheduleGUI.php', 'children' => @@ -1466,7 +1479,7 @@ ), 'ilbookingprocesswithoutschedulegui' => array ( - 'cid' => '5q', + 'cid' => '5r', 'class_name' => 'ilBookingProcessWithoutScheduleGUI', 'class_path' => './components/ILIAS/BookingManager/BookingProcess/class.ilBookingProcessWithoutScheduleGUI.php', 'children' => @@ -1480,7 +1493,7 @@ ), 'ilbookingreservationsgui' => array ( - 'cid' => '5r', + 'cid' => '5s', 'class_name' => 'ilBookingReservationsGUI', 'class_path' => './components/ILIAS/BookingManager/Reservations/class.ilBookingReservationsGUI.php', 'children' => @@ -1494,7 +1507,7 @@ ), 'ilbookingschedulegui' => array ( - 'cid' => '5t', + 'cid' => '5u', 'class_name' => 'ilBookingScheduleGUI', 'class_path' => './components/ILIAS/BookingManager/Schedule/class.ilBookingScheduleGUI.php', 'children' => @@ -1507,9 +1520,9 @@ ), 'ilbuddysystemgui' => array ( - 'cid' => '5v', + 'cid' => '5w', 'class_name' => 'ilBuddySystemGUI', - 'class_path' => './Services/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php', + 'class_path' => './components/ILIAS/Contact/BuddySystem/classes/class.ilBuddySystemGUI.php', 'children' => array ( ), @@ -1523,9 +1536,9 @@ ), 'ilcassettingsgui' => array ( - 'cid' => '5x', + 'cid' => '5y', 'class_name' => 'ilCASSettingsGUI', - 'class_path' => './Services/CAS/classes/class.ilCASSettingsGUI.php', + 'class_path' => './components/ILIAS/CAS/classes/class.ilCASSettingsGUI.php', 'children' => array ( ), @@ -1536,9 +1549,9 @@ ), 'ilcalendaragendalistgui' => array ( - 'cid' => '5z', + 'cid' => '60', 'class_name' => 'ilCalendarAgendaListGUI', - 'class_path' => './Services/Calendar/classes/Agenda/class.ilCalendarAgendaListGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/Agenda/class.ilCalendarAgendaListGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentpresentationgui', @@ -1550,9 +1563,9 @@ ), 'ilcalendarappointmentgui' => array ( - 'cid' => '60', + 'cid' => '61', 'class_name' => 'ilCalendarAppointmentGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarAppointmentGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarAppointmentGUI.php', 'children' => array ( ), @@ -1571,9 +1584,9 @@ ), 'ilcalendarappointmentpresentationgui' => array ( - 'cid' => '62', + 'cid' => '63', 'class_name' => 'ilCalendarAppointmentPresentationGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarAppointmentPresentationGUI.php', 'children' => array ( 0 => 'ilinfoscreengui', @@ -1601,9 +1614,9 @@ ), 'ilcalendarblockgui' => array ( - 'cid' => '64', + 'cid' => '65', 'class_name' => 'ilCalendarBlockGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarBlockGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarBlockGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1621,9 +1634,9 @@ ), 'ilcalendarcategorygui' => array ( - 'cid' => '65', + 'cid' => '66', 'class_name' => 'ilCalendarCategoryGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarCategoryGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarCategoryGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1636,9 +1649,9 @@ ), 'ilcalendardaygui' => array ( - 'cid' => '67', + 'cid' => '68', 'class_name' => 'ilCalendarDayGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarDayGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarDayGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1653,9 +1666,9 @@ ), 'ilcalendarinboxgui' => array ( - 'cid' => '69', + 'cid' => '6a', 'class_name' => 'ilCalendarInboxGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarInboxGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarInboxGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1669,9 +1682,9 @@ ), 'ilcalendarmonthgui' => array ( - 'cid' => '6c', + 'cid' => '6d', 'class_name' => 'ilCalendarMonthGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarMonthGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarMonthGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1688,9 +1701,9 @@ ), 'ilcalendarpresentationgui' => array ( - 'cid' => '6d', + 'cid' => '6e', 'class_name' => 'ilCalendarPresentationGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarPresentationGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarPresentationGUI.php', 'children' => array ( 0 => 'ilcalendarmonthgui', @@ -1715,9 +1728,9 @@ ), 'ilcalendarselectionblockgui' => array ( - 'cid' => '6f', + 'cid' => '6g', 'class_name' => 'ilCalendarSelectionBlockGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarSelectionBlockGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarSelectionBlockGUI.php', 'children' => array ( ), @@ -1728,9 +1741,9 @@ ), 'ilcalendarsubscriptiongui' => array ( - 'cid' => '6j', + 'cid' => '6k', 'class_name' => 'ilCalendarSubscriptionGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarSubscriptionGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarSubscriptionGUI.php', 'children' => array ( ), @@ -1741,9 +1754,9 @@ ), 'ilcalendarusersettingsgui' => array ( - 'cid' => '6k', + 'cid' => '6l', 'class_name' => 'ilCalendarUserSettingsGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarUserSettingsGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarUserSettingsGUI.php', 'children' => array ( ), @@ -1754,9 +1767,9 @@ ), 'ilcalendarweekgui' => array ( - 'cid' => '6m', + 'cid' => '6n', 'class_name' => 'ilCalendarWeekGUI', - 'class_path' => './Services/Calendar/classes/class.ilCalendarWeekGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilCalendarWeekGUI.php', 'children' => array ( 0 => 'ilcalendarappointmentgui', @@ -1771,9 +1784,9 @@ ), 'ilcertificategui' => array ( - 'cid' => '6p', + 'cid' => '6q', 'class_name' => 'ilCertificateGUI', - 'class_path' => './Services/Certificate/classes/class.ilCertificateGUI.php', + 'class_path' => './components/ILIAS/Certificate/classes/class.ilCertificateGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -1792,7 +1805,7 @@ ), 'ilchatroomauthinputgui' => array ( - 'cid' => '6s', + 'cid' => '6t', 'class_name' => 'ilChatroomAuthInputGUI', 'class_path' => './components/ILIAS/Chatroom/classes/class.ilChatroomAuthInputGUI.php', 'children' => @@ -1805,9 +1818,9 @@ ), 'ilclassificationblockgui' => array ( - 'cid' => '77', + 'cid' => '78', 'class_name' => 'ilClassificationBlockGUI', - 'class_path' => './Services/Container/Classification/class.ilClassificationBlockGUI.php', + 'class_path' => './components/ILIAS/Container/Classification/class.ilClassificationBlockGUI.php', 'children' => array ( ), @@ -1818,7 +1831,7 @@ ), 'ilcmixapiexportgui' => array ( - 'cid' => '7b', + 'cid' => '7c', 'class_name' => 'ilCmiXapiExportGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiExportGUI.php', 'children' => @@ -1831,7 +1844,7 @@ ), 'ilcmixapilaunchgui' => array ( - 'cid' => '7c', + 'cid' => '7d', 'class_name' => 'ilCmiXapiLaunchGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiLaunchGUI.php', 'children' => @@ -1844,7 +1857,7 @@ ), 'ilcmixapiregistrationgui' => array ( - 'cid' => '7e', + 'cid' => '7f', 'class_name' => 'ilCmiXapiRegistrationGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiRegistrationGUI.php', 'children' => @@ -1857,7 +1870,7 @@ ), 'ilcmixapiscoringgui' => array ( - 'cid' => '7f', + 'cid' => '7g', 'class_name' => 'ilCmiXapiScoringGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiScoringGUI.php', 'children' => @@ -1870,7 +1883,7 @@ ), 'ilcmixapisettingsgui' => array ( - 'cid' => '7h', + 'cid' => '7i', 'class_name' => 'ilCmiXapiSettingsGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiSettingsGUI.php', 'children' => @@ -1884,7 +1897,7 @@ ), 'ilcmixapistatementsgui' => array ( - 'cid' => '7i', + 'cid' => '7j', 'class_name' => 'ilCmiXapiStatementsGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilCmiXapiStatementsGUI.php', 'children' => @@ -1897,9 +1910,9 @@ ), 'ilcolumngui' => array ( - 'cid' => '7m', + 'cid' => '7n', 'class_name' => 'ilColumnGUI', - 'class_path' => './Services/Block/classes/class.ilColumnGUI.php', + 'class_path' => './components/ILIAS/Block/classes/class.ilColumnGUI.php', 'children' => array ( 0 => 'ilcalendarblockgui', @@ -1939,9 +1952,9 @@ ), 'ilcommentgui' => array ( - 'cid' => '7o', + 'cid' => '7p', 'class_name' => 'ilCommentGUI', - 'class_path' => './Services/Notes/Comment/class.ilCommentGUI.php', + 'class_path' => './components/ILIAS/Notes/Comment/class.ilCommentGUI.php', 'children' => array ( ), @@ -1957,9 +1970,9 @@ ), 'ilcommonactiondispatchergui' => array ( - 'cid' => '7p', + 'cid' => '7q', 'class_name' => 'ilCommonActionDispatcherGUI', - 'class_path' => './Services/Object/classes/class.ilCommonActionDispatcherGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilCommonActionDispatcherGUI.php', 'children' => array ( 0 => 'ilnotegui', @@ -2036,9 +2049,9 @@ ), 'ilconditionhandlergui' => array ( - 'cid' => '7q', + 'cid' => '7r', 'class_name' => 'ilConditionHandlerGUI', - 'class_path' => './Services/Conditions/classes/class.ilConditionHandlerGUI.php', + 'class_path' => './components/ILIAS/Conditions/classes/class.ilConditionHandlerGUI.php', 'children' => array ( ), @@ -2052,9 +2065,9 @@ ), 'ilconfirmationgui' => array ( - 'cid' => '7s', + 'cid' => '7t', 'class_name' => 'ilConfirmationGUI', - 'class_path' => './Services/UIComponent/Confirmation/class.ilConfirmationGUI.php', + 'class_path' => './components/ILIAS/UIComponent/Confirmation/class.ilConfirmationGUI.php', 'children' => array ( ), @@ -2071,9 +2084,9 @@ ), 'ilconsultationhoursgui' => array ( - 'cid' => '7w', + 'cid' => '7x', 'class_name' => 'ilConsultationHoursGUI', - 'class_path' => './Services/Calendar/classes/ConsultationHours/class.ilConsultationHoursGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/ConsultationHours/class.ilConsultationHoursGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -2090,9 +2103,9 @@ ), 'ilcontskilladmingui' => array ( - 'cid' => '7z', + 'cid' => '80', 'class_name' => 'ilContSkillAdminGUI', - 'class_path' => './Services/Container/Skills/classes/class.ilContSkillAdminGUI.php', + 'class_path' => './components/ILIAS/Container/Skills/classes/class.ilContSkillAdminGUI.php', 'children' => array ( 0 => 'ilskillprofilegui', @@ -2105,9 +2118,9 @@ ), 'ilcontskillpresentationgui' => array ( - 'cid' => '81', + 'cid' => '82', 'class_name' => 'ilContSkillPresentationGUI', - 'class_path' => './Services/Container/Skills/classes/class.ilContSkillPresentationGUI.php', + 'class_path' => './components/ILIAS/Container/Skills/classes/class.ilContSkillPresentationGUI.php', 'children' => array ( 0 => 'ilpersonalskillsgui', @@ -2119,9 +2132,9 @@ ), 'ilcontactgui' => array ( - 'cid' => '83', + 'cid' => '84', 'class_name' => 'ilContactGUI', - 'class_path' => './Services/Contact/classes/class.ilContactGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilContactGUI.php', 'children' => array ( 0 => 'ilmailsearchcoursesgui', @@ -2138,9 +2151,9 @@ ), 'ilcontainerblockpropertiesstoragegui' => array ( - 'cid' => '84', + 'cid' => '85', 'class_name' => 'ilContainerBlockPropertiesStorageGUI', - 'class_path' => './Services/Container/Content/class.ilContainerBlockPropertiesStorageGUI.php', + 'class_path' => './components/ILIAS/Container/Content/class.ilContainerBlockPropertiesStorageGUI.php', 'children' => array ( 0 => 'ilcontainerblockpropertiesstoragegui', @@ -2152,9 +2165,9 @@ ), 'ilcontainerfilteradmingui' => array ( - 'cid' => '87', + 'cid' => '88', 'class_name' => 'ilContainerFilterAdminGUI', - 'class_path' => './Services/Container/Filter/classes/class.ilContainerFilterAdminGUI.php', + 'class_path' => './components/ILIAS/Container/Filter/classes/class.ilContainerFilterAdminGUI.php', 'children' => array ( ), @@ -2165,9 +2178,9 @@ ), 'ilcontainergui' => array ( - 'cid' => '89', + 'cid' => '8a', 'class_name' => 'ilContainerGUI', - 'class_path' => './Services/Container/classes/class.ilContainerGUI.php', + 'class_path' => './components/ILIAS/Container/classes/class.ilContainerGUI.php', 'children' => array ( ), @@ -2182,9 +2195,9 @@ ), 'ilcontainernewssettingsgui' => array ( - 'cid' => '8b', + 'cid' => '8c', 'class_name' => 'ilContainerNewsSettingsGUI', - 'class_path' => './Services/Container/News/class.ilContainerNewsSettingsGUI.php', + 'class_path' => './components/ILIAS/Container/News/class.ilContainerNewsSettingsGUI.php', 'children' => array ( ), @@ -2198,9 +2211,9 @@ ), 'ilcontainerpagegui' => array ( - 'cid' => '8d', + 'cid' => '8e', 'class_name' => 'ilContainerPageGUI', - 'class_path' => './Services/Container/Page/class.ilContainerPageGUI.php', + 'class_path' => './components/ILIAS/Container/Page/class.ilContainerPageGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -2224,9 +2237,9 @@ ), 'ilcontainerskillgui' => array ( - 'cid' => '8h', + 'cid' => '8i', 'class_name' => 'ilContainerSkillGUI', - 'class_path' => './Services/Container/Skills/classes/class.ilContainerSkillGUI.php', + 'class_path' => './components/ILIAS/Container/Skills/classes/class.ilContainerSkillGUI.php', 'children' => array ( 0 => 'ilcontskillpresentationgui', @@ -2240,9 +2253,9 @@ ), 'ilcontainerstartobjectsgui' => array ( - 'cid' => '8k', + 'cid' => '8l', 'class_name' => 'ilContainerStartObjectsGUI', - 'class_path' => './Services/Container/StartObjects/class.ilContainerStartObjectsGUI.php', + 'class_path' => './components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsGUI.php', 'children' => array ( 0 => 'ilcontainerstartobjectspagegui', @@ -2255,9 +2268,9 @@ ), 'ilcontainerstartobjectspagegui' => array ( - 'cid' => '8l', + 'cid' => '8m', 'class_name' => 'ilContainerStartObjectsPageGUI', - 'class_path' => './Services/Container/StartObjects/class.ilContainerStartObjectsPageGUI.php', + 'class_path' => './components/ILIAS/Container/StartObjects/class.ilContainerStartObjectsPageGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -2277,7 +2290,7 @@ ), 'ilcontentpagepagegui' => array ( - 'cid' => '8n', + 'cid' => '8o', 'class_name' => 'ilContentPagePageGUI', 'class_path' => './components/ILIAS/ContentPage/classes/class.ilContentPagePageGUI.php', 'children' => @@ -2298,9 +2311,9 @@ ), 'ilcontentstyleimagegui' => array ( - 'cid' => '8o', + 'cid' => '8p', 'class_name' => 'ilContentStyleImageGUI', - 'class_path' => './Services/Style/Content/Images/class.ilContentStyleImageGUI.php', + 'class_path' => './components/ILIAS/Style/Content/Images/class.ilContentStyleImageGUI.php', 'children' => array ( ), @@ -2311,9 +2324,9 @@ ), 'ilcontentstylesettingsgui' => array ( - 'cid' => '8p', + 'cid' => '8q', 'class_name' => 'ilContentStyleSettingsGUI', - 'class_path' => './Services/Style/Content/classes/class.ilContentStyleSettingsGUI.php', + 'class_path' => './components/ILIAS/Style/Content/classes/class.ilContentStyleSettingsGUI.php', 'children' => array ( 0 => 'ilobjstylesheetgui', @@ -2325,7 +2338,7 @@ ), 'ilcoursecontentgui' => array ( - 'cid' => '8u', + 'cid' => '8v', 'class_name' => 'ilCourseContentGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilCourseContentGUI.php', 'children' => @@ -2342,7 +2355,7 @@ ), 'ilcoursemembershipgui' => array ( - 'cid' => '90', + 'cid' => '91', 'class_name' => 'ilCourseMembershipGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilCourseMembershipGUI.php', 'children' => @@ -2362,7 +2375,7 @@ ), 'ilcourseobjectivesgui' => array ( - 'cid' => '95', + 'cid' => '96', 'class_name' => 'ilCourseObjectivesGUI', 'class_path' => './components/ILIAS/Course/classes/Objectives/class.ilCourseObjectivesGUI.php', 'children' => @@ -2378,7 +2391,7 @@ ), 'ilcourseparticipantsgroupsgui' => array ( - 'cid' => '97', + 'cid' => '98', 'class_name' => 'ilCourseParticipantsGroupsGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilCourseParticipantsGroupsGUI.php', 'children' => @@ -2394,7 +2407,7 @@ ), 'ilcourseregistrationgui' => array ( - 'cid' => '9b', + 'cid' => '9c', 'class_name' => 'ilCourseRegistrationGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilCourseRegistrationGUI.php', 'children' => @@ -2407,9 +2420,9 @@ ), 'ilcronmanagergui' => array ( - 'cid' => '9e', + 'cid' => '9f', 'class_name' => 'ilCronManagerGUI', - 'class_path' => './Services/Cron/classes/class.ilCronManagerGUI.php', + 'class_path' => './components/ILIAS/Cron/classes/class.ilCronManagerGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -2420,11 +2433,69 @@ 1 => 'ilobjsystemfoldergui', ), ), - 'ilcustomuserfieldsgui' => + 'ilctrlbaseclass1testgui' => + array ( + 'cid' => '9h', + 'class_name' => 'ilCtrlBaseClass1TestGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlBaseClass1TestGUI.php', + 'children' => + array ( + 0 => 'ilctrlcommandclass1testgui', + 1 => 'ilias\\tests\\ctrl\\ilctrlnamespacedtestgui', + 2 => 'ilvalidtestplugingui', + ), + 'parents' => + array ( + ), + ), + 'ilctrlbaseclass2testgui' => array ( 'cid' => '9i', + 'class_name' => 'ilCtrlBaseClass2TestGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlBaseClass2TestGUI.php', + 'children' => + array ( + 0 => 'ilctrlcommandclass1testgui', + ), + 'parents' => + array ( + 0 => 'ilctrlcommandclass1testgui', + ), + ), + 'ilctrlcommandclass1testgui' => + array ( + 'cid' => '9j', + 'class_name' => 'ilCtrlCommandClass1TestGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlCommandClass1TestGUI.php', + 'children' => + array ( + 0 => 'ilctrlbaseclass2testgui', + 1 => 'ilctrlcommandclass2testgui', + ), + 'parents' => + array ( + 0 => 'ilctrlbaseclass1testgui', + 1 => 'ilctrlbaseclass2testgui', + ), + ), + 'ilctrlcommandclass2testgui' => + array ( + 'cid' => '9k', + 'class_name' => 'ilCtrlCommandClass2TestGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlCommandClass2TestGUI.php', + 'children' => + array ( + ), + 'parents' => + array ( + 0 => 'ilctrlcommandclass1testgui', + ), + ), + 'ilcustomuserfieldsgui' => + array ( + 'cid' => '9n', 'class_name' => 'ilCustomUserFieldsGUI', - 'class_path' => './Services/User/classes/class.ilCustomUserFieldsGUI.php', + 'class_path' => './components/ILIAS/User/classes/class.ilCustomUserFieldsGUI.php', 'children' => array ( ), @@ -2435,9 +2506,9 @@ ), 'ildashboardblockgui' => array ( - 'cid' => '9k', + 'cid' => '9p', 'class_name' => 'ilDashboardBlockGUI', - 'class_path' => './Services/Dashboard/Block/classes/class.ilDashboardBlockGUI.php', + 'class_path' => './components/ILIAS/Dashboard/Block/classes/class.ilDashboardBlockGUI.php', 'children' => array ( 0 => 'ilcommonactiondispatchergui', @@ -2449,9 +2520,9 @@ ), 'ildashboardgui' => array ( - 'cid' => '9m', + 'cid' => '9r', 'class_name' => 'ilDashboardGUI', - 'class_path' => './Services/Dashboard/classes/class.ilDashboardGUI.php', + 'class_path' => './components/ILIAS/Dashboard/classes/class.ilDashboardGUI.php', 'children' => array ( 0 => 'ilpersonalprofilegui', @@ -2487,7 +2558,7 @@ ), 'ildashboardlearningsequencegui' => array ( - 'cid' => '9n', + 'cid' => '9s', 'class_name' => 'ilDashboardLearningSequenceGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/class.ilDashboardLearningSequenceGUI.php', 'children' => @@ -2502,9 +2573,9 @@ ), 'ildashboardrecommendedcontentgui' => array ( - 'cid' => '9o', + 'cid' => '9t', 'class_name' => 'ilDashboardRecommendedContentGUI', - 'class_path' => './Services/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php', + 'class_path' => './components/ILIAS/Repository/RecommendedContent/classes/class.ilDashboardRecommendedContentGUI.php', 'children' => array ( ), @@ -2515,7 +2586,7 @@ ), 'ildclcreateviewdefinitiongui' => array ( - 'cid' => '9t', + 'cid' => '9y', 'class_name' => 'ilDclCreateViewDefinitionGUI', 'class_path' => './components/ILIAS/DataCollection/classes/CreateView/class.ilDclCreateViewDefinitionGUI.php', 'children' => @@ -2532,7 +2603,7 @@ ), 'ildcldetailedviewdefinitiongui' => array ( - 'cid' => '9v', + 'cid' => 'a0', 'class_name' => 'ilDclDetailedViewDefinitionGUI', 'class_path' => './components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewDefinitionGUI.php', 'children' => @@ -2550,7 +2621,7 @@ ), 'ildcldetailedviewgui' => array ( - 'cid' => '9w', + 'cid' => 'a1', 'class_name' => 'ilDclDetailedViewGUI', 'class_path' => './components/ILIAS/DataCollection/classes/DetailedView/class.ilDclDetailedViewGUI.php', 'children' => @@ -2565,7 +2636,7 @@ ), 'ildcleditviewdefinitiongui' => array ( - 'cid' => '9x', + 'cid' => 'a2', 'class_name' => 'ilDclEditViewDefinitionGUI', 'class_path' => './components/ILIAS/DataCollection/classes/EditView/class.ilDclEditViewDefinitionGUI.php', 'children' => @@ -2582,7 +2653,7 @@ ), 'ildclexportgui' => array ( - 'cid' => '9z', + 'cid' => 'a4', 'class_name' => 'ilDclExportGUI', 'class_path' => './components/ILIAS/DataCollection/classes/class.ilDclExportGUI.php', 'children' => @@ -2595,7 +2666,7 @@ ), 'ildclfieldeditgui' => array ( - 'cid' => 'a1', + 'cid' => 'a6', 'class_name' => 'ilDclFieldEditGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Fields/class.ilDclFieldEditGUI.php', 'children' => @@ -2608,7 +2679,7 @@ ), 'ildclfieldlistgui' => array ( - 'cid' => 'a2', + 'cid' => 'a7', 'class_name' => 'ilDclFieldListGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Fields/class.ilDclFieldListGUI.php', 'children' => @@ -2621,7 +2692,7 @@ ), 'ildclpropertyformgui' => array ( - 'cid' => 'a5', + 'cid' => 'aa', 'class_name' => 'ilDclPropertyFormGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Helpers/class.ilDclPropertyFormGUI.php', 'children' => @@ -2635,7 +2706,7 @@ ), 'ildclrecordeditgui' => array ( - 'cid' => 'a6', + 'cid' => 'ab', 'class_name' => 'ilDclRecordEditGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Content/class.ilDclRecordEditGUI.php', 'children' => @@ -2648,7 +2719,7 @@ ), 'ildclrecordlistgui' => array ( - 'cid' => 'a7', + 'cid' => 'ac', 'class_name' => 'ilDclRecordListGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Content/class.ilDclRecordListGUI.php', 'children' => @@ -2661,7 +2732,7 @@ ), 'ildcltableeditgui' => array ( - 'cid' => 'a9', + 'cid' => 'ae', 'class_name' => 'ilDclTableEditGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Table/class.ilDclTableEditGUI.php', 'children' => @@ -2674,7 +2745,7 @@ ), 'ildcltablelistgui' => array ( - 'cid' => 'aa', + 'cid' => 'af', 'class_name' => 'ilDclTableListGUI', 'class_path' => './components/ILIAS/DataCollection/classes/Table/class.ilDclTableListGUI.php', 'children' => @@ -2691,7 +2762,7 @@ ), 'ildcltablevieweditgui' => array ( - 'cid' => 'ae', + 'cid' => 'aj', 'class_name' => 'ilDclTableViewEditGUI', 'class_path' => './components/ILIAS/DataCollection/classes/TableView/class.ilDclTableViewEditGUI.php', 'children' => @@ -2707,7 +2778,7 @@ ), 'ildcltableviewgui' => array ( - 'cid' => 'af', + 'cid' => 'ak', 'class_name' => 'ilDclTableViewGUI', 'class_path' => './components/ILIAS/DataCollection/classes/TableView/class.ilDclTableViewGUI.php', 'children' => @@ -2721,9 +2792,9 @@ ), 'ilderivedtasksgui' => array ( - 'cid' => 'ai', + 'cid' => 'an', 'class_name' => 'ilDerivedTasksGUI', - 'class_path' => './Services/Tasks/DerivedTasks/classes/class.ilDerivedTasksGUI.php', + 'class_path' => './components/ILIAS/Tasks/DerivedTasks/classes/class.ilDerivedTasksGUI.php', 'children' => array ( ), @@ -2734,9 +2805,9 @@ ), 'ildidactictemplategui' => array ( - 'cid' => 'aj', + 'cid' => 'ao', 'class_name' => 'ilDidacticTemplateGUI', - 'class_path' => './Services/DidacticTemplate/classes/class.ilDidacticTemplateGUI.php', + 'class_path' => './components/ILIAS/DidacticTemplate/classes/class.ilDidacticTemplateGUI.php', 'children' => array ( ), @@ -2753,9 +2824,9 @@ ), 'ildidactictemplatesettingsgui' => array ( - 'cid' => 'ak', + 'cid' => 'ap', 'class_name' => 'ilDidacticTemplateSettingsGUI', - 'class_path' => './Services/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php', + 'class_path' => './components/ILIAS/DidacticTemplate/classes/Setting/class.ilDidacticTemplateSettingsGUI.php', 'children' => array ( 0 => 'ilmultilingualismgui', @@ -2769,9 +2840,9 @@ ), 'ilecsmappingsettingsgui' => array ( - 'cid' => 'ar', + 'cid' => 'aw', 'class_name' => 'ilECSMappingSettingsGUI', - 'class_path' => './Services/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php', + 'class_path' => './components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php', 'children' => array ( ), @@ -2782,9 +2853,9 @@ ), 'ilecsparticipantsettingsgui' => array ( - 'cid' => 'at', + 'cid' => 'ay', 'class_name' => 'ilECSParticipantSettingsGUI', - 'class_path' => './Services/WebServices/ECS/classes/class.ilECSParticipantSettingsGUI.php', + 'class_path' => './components/ILIAS/WebServices/ECS/classes/class.ilECSParticipantSettingsGUI.php', 'children' => array ( ), @@ -2795,9 +2866,9 @@ ), 'ilecssettingsgui' => array ( - 'cid' => 'av', + 'cid' => 'b0', 'class_name' => 'ilECSSettingsGUI', - 'class_path' => './Services/WebServices/ECS/classes/class.ilECSSettingsGUI.php', + 'class_path' => './components/ILIAS/WebServices/ECS/classes/class.ilECSSettingsGUI.php', 'children' => array ( 0 => 'ilecsmappingsettingsgui', @@ -2810,9 +2881,9 @@ ), 'ilecsuserconsentmodalgui' => array ( - 'cid' => 'aw', + 'cid' => 'b1', 'class_name' => 'ilECSUserConsentModalGUI', - 'class_path' => './Services/WebServices/ECS/classes/Consent/class.ilECSUserConsentModalGUI.php', + 'class_path' => './components/ILIAS/WebServices/ECS/classes/Consent/class.ilECSUserConsentModalGUI.php', 'children' => array ( ), @@ -2830,7 +2901,7 @@ ), 'ileditclipboardgui' => array ( - 'cid' => 'ay', + 'cid' => 'b3', 'class_name' => 'ilEditClipboardGUI', 'class_path' => './components/ILIAS/MediaPool/Clipboard/class.ilEditClipboardGUI.php', 'children' => @@ -2874,7 +2945,7 @@ ), 'ilemployeetalkappointmentgui' => array ( - 'cid' => 'az', + 'cid' => 'b4', 'class_name' => 'ilEmployeeTalkAppointmentGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/Talk/class.ilEmployeeTalkAppointmentGUI.php', 'children' => @@ -2887,7 +2958,7 @@ ), 'ilemployeetalkmystafflistgui' => array ( - 'cid' => 'b0', + 'cid' => 'b5', 'class_name' => 'ilEmployeeTalkMyStaffListGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/Talk/class.ilEmployeeTalkMyStaffListGUI.php', 'children' => @@ -2903,7 +2974,7 @@ ), 'ilemployeetalkmystaffusergui' => array ( - 'cid' => 'b1', + 'cid' => 'b6', 'class_name' => 'ilEmployeeTalkMyStaffUserGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/Talk/class.ilEmployeeTalkMyStaffUserGUI.php', 'children' => @@ -2919,7 +2990,7 @@ ), 'ilexasstypewikiteamgui' => array ( - 'cid' => 'bb', + 'cid' => 'bg', 'class_name' => 'ilExAssTypeWikiTeamGUI', 'class_path' => './components/ILIAS/Exercise/Assignment/Types/GUI/classes/class.ilExAssTypeWikiTeamGUI.php', 'children' => @@ -2932,7 +3003,7 @@ ), 'ilexassignmenteditorgui' => array ( - 'cid' => 'bc', + 'cid' => 'bh', 'class_name' => 'ilExAssignmentEditorGUI', 'class_path' => './components/ILIAS/Exercise/Assignment/class.ilExAssignmentEditorGUI.php', 'children' => @@ -2949,7 +3020,7 @@ ), 'ilexassignmentfilesystemgui' => array ( - 'cid' => 'bd', + 'cid' => 'bi', 'class_name' => 'ilExAssignmentFileSystemGUI', 'class_path' => './components/ILIAS/Exercise/Assignment/class.ilExAssignmentFileSystemGUI.php', 'children' => @@ -2962,7 +3033,7 @@ ), 'ilexpeerreviewgui' => array ( - 'cid' => 'bn', + 'cid' => 'bs', 'class_name' => 'ilExPeerReviewGUI', 'class_path' => './components/ILIAS/Exercise/PeerReview/class.ilExPeerReviewGUI.php', 'children' => @@ -2982,7 +3053,7 @@ ), 'ilexsubmissionfilegui' => array ( - 'cid' => 'bp', + 'cid' => 'bu', 'class_name' => 'ilExSubmissionFileGUI', 'class_path' => './components/ILIAS/Exercise/Submission/class.ilExSubmissionFileGUI.php', 'children' => @@ -2997,7 +3068,7 @@ ), 'ilexsubmissiongui' => array ( - 'cid' => 'bq', + 'cid' => 'bv', 'class_name' => 'ilExSubmissionGUI', 'class_path' => './components/ILIAS/Exercise/Submission/class.ilExSubmissionGUI.php', 'children' => @@ -3016,7 +3087,7 @@ ), 'ilexsubmissionobjectgui' => array ( - 'cid' => 'br', + 'cid' => 'bw', 'class_name' => 'ilExSubmissionObjectGUI', 'class_path' => './components/ILIAS/Exercise/Submission/class.ilExSubmissionObjectGUI.php', 'children' => @@ -3029,7 +3100,7 @@ ), 'ilexsubmissionteamgui' => array ( - 'cid' => 'bs', + 'cid' => 'bx', 'class_name' => 'ilExSubmissionTeamGUI', 'class_path' => './components/ILIAS/Exercise/Submission/class.ilExSubmissionTeamGUI.php', 'children' => @@ -3044,7 +3115,7 @@ ), 'ilexsubmissiontextgui' => array ( - 'cid' => 'bt', + 'cid' => 'by', 'class_name' => 'ilExSubmissionTextGUI', 'class_path' => './components/ILIAS/Exercise/Submission/class.ilExSubmissionTextGUI.php', 'children' => @@ -3059,7 +3130,7 @@ ), 'ilexccriteriacataloguegui' => array ( - 'cid' => 'bu', + 'cid' => 'bz', 'class_name' => 'ilExcCriteriaCatalogueGUI', 'class_path' => './components/ILIAS/Exercise/PeerReview/Criteria/class.ilExcCriteriaCatalogueGUI.php', 'children' => @@ -3073,7 +3144,7 @@ ), 'ilexccriteriagui' => array ( - 'cid' => 'bw', + 'cid' => 'c1', 'class_name' => 'ilExcCriteriaGUI', 'class_path' => './components/ILIAS/Exercise/PeerReview/Criteria/class.ilExcCriteriaGUI.php', 'children' => @@ -3086,7 +3157,7 @@ ), 'ilexcrandomassignmentgui' => array ( - 'cid' => 'bz', + 'cid' => 'c4', 'class_name' => 'ilExcRandomAssignmentGUI', 'class_path' => './components/ILIAS/Exercise/Assignment/Mandatory/class.ilExcRandomAssignmentGUI.php', 'children' => @@ -3099,7 +3170,7 @@ ), 'ilexercisehandlergui' => array ( - 'cid' => 'c0', + 'cid' => 'c5', 'class_name' => 'ilExerciseHandlerGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilExerciseHandlerGUI.php', 'children' => @@ -3112,7 +3183,7 @@ ), 'ilexercisemanagementgui' => array ( - 'cid' => 'c1', + 'cid' => 'c6', 'class_name' => 'ilExerciseManagementGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilExerciseManagementGUI.php', 'children' => @@ -3133,9 +3204,9 @@ ), 'ilexportgui' => array ( - 'cid' => 'c6', + 'cid' => 'cb', 'class_name' => 'ilExportGUI', - 'class_path' => './Services/Export/classes/class.ilExportGUI.php', + 'class_path' => './components/ILIAS/Export/classes/class.ilExportGUI.php', 'children' => array ( ), @@ -3176,7 +3247,7 @@ ), 'ilextidgui' => array ( - 'cid' => 'ca', + 'cid' => 'cf', 'class_name' => 'ilExtIdGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/ExtId/class.ilExtIdGUI.php', 'children' => @@ -3189,9 +3260,9 @@ ), 'ilfilesystemgui' => array ( - 'cid' => 'cf', + 'cid' => 'ck', 'class_name' => 'ilFileSystemGUI', - 'class_path' => './Services/FileSystem/classes/class.ilFileSystemGUI.php', + 'class_path' => './components/ILIAS/FileSystem/classes/class.ilFileSystemGUI.php', 'children' => array ( ), @@ -3210,7 +3281,7 @@ ), 'ilfileversionsgui' => array ( - 'cid' => 'ci', + 'cid' => 'cn', 'class_name' => 'ilFileVersionsGUI', 'class_path' => './components/ILIAS/File/classes/Versions/class.ilFileVersionsGUI.php', 'children' => @@ -3225,7 +3296,7 @@ ), 'ilfileversionsuploadhandlergui' => array ( - 'cid' => 'ck', + 'cid' => 'cp', 'class_name' => 'ilFileVersionsUploadHandlerGUI', 'class_path' => './components/ILIAS/File/classes/Versions/class.ilFileVersionsUploadHandlerGUI.php', 'children' => @@ -3238,9 +3309,9 @@ ), 'ilformpropertydispatchgui' => array ( - 'cid' => 'co', + 'cid' => 'ct', 'class_name' => 'ilFormPropertyDispatchGUI', - 'class_path' => './Services/Form/classes/class.ilFormPropertyDispatchGUI.php', + 'class_path' => './components/ILIAS/Form/classes/class.ilFormPropertyDispatchGUI.php', 'children' => array ( 0 => 'ilchatroomauthinputgui', @@ -3301,7 +3372,7 @@ ), 'ilforumexportgui' => array ( - 'cid' => 'cu', + 'cid' => 'cz', 'class_name' => 'ilForumExportGUI', 'class_path' => './components/ILIAS/Forum/classes/class.ilForumExportGUI.php', 'children' => @@ -3314,7 +3385,7 @@ ), 'ilforummoderatorsgui' => array ( - 'cid' => 'cv', + 'cid' => 'd0', 'class_name' => 'ilForumModeratorsGUI', 'class_path' => './components/ILIAS/Forum/classes/class.ilForumModeratorsGUI.php', 'children' => @@ -3328,7 +3399,7 @@ ), 'ilforumpagegui' => array ( - 'cid' => 'd0', + 'cid' => 'd5', 'class_name' => 'ilForumPageGUI', 'class_path' => './components/ILIAS/Forum/classes/CoPage/class.ilForumPageGUI.php', 'children' => @@ -3349,7 +3420,7 @@ ), 'ilforumsettingsgui' => array ( - 'cid' => 'd1', + 'cid' => 'd6', 'class_name' => 'ilForumSettingsGUI', 'class_path' => './components/ILIAS/Forum/classes/class.ilForumSettingsGUI.php', 'children' => @@ -3363,7 +3434,7 @@ ), 'ilglobalunitconfigurationgui' => array ( - 'cid' => 'd9', + 'cid' => 'de', 'class_name' => 'ilGlobalUnitConfigurationGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilGlobalUnitConfigurationGUI.php', 'children' => @@ -3376,7 +3447,7 @@ ), 'ilglossarydefpagegui' => array ( - 'cid' => 'db', + 'cid' => 'dg', 'class_name' => 'ilGlossaryDefPageGUI', 'class_path' => './components/ILIAS/Glossary/Definition/class.ilGlossaryDefPageGUI.php', 'children' => @@ -3399,7 +3470,7 @@ ), 'ilglossaryeditorgui' => array ( - 'cid' => 'dc', + 'cid' => 'dh', 'class_name' => 'ilGlossaryEditorGUI', 'class_path' => './components/ILIAS/Glossary/Editing/class.ilGlossaryEditorGUI.php', 'children' => @@ -3412,7 +3483,7 @@ ), 'ilglossaryflashcardboxgui' => array ( - 'cid' => 'dd', + 'cid' => 'di', 'class_name' => 'ilGlossaryFlashcardBoxGUI', 'class_path' => './components/ILIAS/Glossary/Flashcard/class.ilGlossaryFlashcardBoxGUI.php', 'children' => @@ -3426,7 +3497,7 @@ ), 'ilglossaryflashcardgui' => array ( - 'cid' => 'de', + 'cid' => 'dj', 'class_name' => 'ilGlossaryFlashcardGUI', 'class_path' => './components/ILIAS/Glossary/Flashcard/class.ilGlossaryFlashcardGUI.php', 'children' => @@ -3440,7 +3511,7 @@ ), 'ilglossaryforeigntermcollectorgui' => array ( - 'cid' => 'df', + 'cid' => 'dk', 'class_name' => 'ilGlossaryForeignTermCollectorGUI', 'class_path' => './components/ILIAS/Glossary/Term/class.ilGlossaryForeignTermCollectorGUI.php', 'children' => @@ -3453,7 +3524,7 @@ ), 'ilglossarypresentationgui' => array ( - 'cid' => 'di', + 'cid' => 'dn', 'class_name' => 'ilGlossaryPresentationGUI', 'class_path' => './components/ILIAS/Glossary/Presentation/class.ilGlossaryPresentationGUI.php', 'children' => @@ -3472,7 +3543,7 @@ ), 'ilglossarytermgui' => array ( - 'cid' => 'dj', + 'cid' => 'do', 'class_name' => 'ilGlossaryTermGUI', 'class_path' => './components/ILIAS/Glossary/Term/class.ilGlossaryTermGUI.php', 'children' => @@ -3489,7 +3560,7 @@ ), 'ilgroupaddtogroupactiongui' => array ( - 'cid' => 'dn', + 'cid' => 'ds', 'class_name' => 'ilGroupAddToGroupActionGUI', 'class_path' => './components/ILIAS/Group/UserActions/classes/class.ilGroupAddToGroupActionGUI.php', 'children' => @@ -3502,7 +3573,7 @@ ), 'ilgroupmembershipgui' => array ( - 'cid' => 'dp', + 'cid' => 'du', 'class_name' => 'ilGroupMembershipGUI', 'class_path' => './components/ILIAS/Group/classes/class.ilGroupMembershipGUI.php', 'children' => @@ -3522,7 +3593,7 @@ ), 'ilgroupregistrationgui' => array ( - 'cid' => 'dr', + 'cid' => 'dw', 'class_name' => 'ilGroupRegistrationGUI', 'class_path' => './components/ILIAS/Group/classes/class.ilGroupRegistrationGUI.php', 'children' => @@ -3535,7 +3606,7 @@ ), 'ilgroupuseractionsgui' => array ( - 'cid' => 'ds', + 'cid' => 'dx', 'class_name' => 'ilGroupUserActionsGUI', 'class_path' => './components/ILIAS/Group/UserActions/classes/class.ilGroupUserActionsGUI.php', 'children' => @@ -3549,7 +3620,7 @@ ), 'ilhtlmeditorgui' => array ( - 'cid' => 'du', + 'cid' => 'dz', 'class_name' => 'ilHTLMEditorGUI', 'class_path' => './components/ILIAS/HTMLLearningModule/classes/class.ilHTLMEditorGUI.php', 'children' => @@ -3562,7 +3633,7 @@ ), 'ilhtlmpresentationgui' => array ( - 'cid' => 'dv', + 'cid' => 'e0', 'class_name' => 'ilHTLMPresentationGUI', 'class_path' => './components/ILIAS/HTMLLearningModule/classes/class.ilHTLMPresentationGUI.php', 'children' => @@ -3575,9 +3646,9 @@ ), 'ilhelpgui' => array ( - 'cid' => 'dw', + 'cid' => 'e1', 'class_name' => 'ilHelpGUI', - 'class_path' => './Services/Help/classes/class.ilHelpGUI.php', + 'class_path' => './components/ILIAS/Help/classes/class.ilHelpGUI.php', 'children' => array ( 0 => 'illmpagegui', @@ -3588,9 +3659,9 @@ ), 'ilimagemapeditorgui' => array ( - 'cid' => 'e7', + 'cid' => 'ec', 'class_name' => 'ilImageMapEditorGUI', - 'class_path' => './Services/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/ImageMap/class.ilImageMapEditorGUI.php', 'children' => array ( 0 => 'ilinternallinkgui', @@ -3602,9 +3673,9 @@ ), 'ilimprintgui' => array ( - 'cid' => 'ec', + 'cid' => 'eh', 'class_name' => 'ilImprintGUI', - 'class_path' => './Services/Imprint/classes/class.ilImprintGUI.php', + 'class_path' => './components/ILIAS/Imprint/classes/class.ilImprintGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -3619,7 +3690,7 @@ ), 'ilindividualassessmentcommonsettingsgui' => array ( - 'cid' => 'ee', + 'cid' => 'ej', 'class_name' => 'ilIndividualAssessmentCommonSettingsGUI', 'class_path' => './components/ILIAS/IndividualAssessment/classes/Settings/class.ilIndividualAssessmentCommonSettingsGUI.php', 'children' => @@ -3632,7 +3703,7 @@ ), 'ilindividualassessmentmembergui' => array ( - 'cid' => 'ef', + 'cid' => 'ek', 'class_name' => 'ilIndividualAssessmentMemberGUI', 'class_path' => './components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentMemberGUI.php', 'children' => @@ -3645,7 +3716,7 @@ ), 'ilindividualassessmentmembersgui' => array ( - 'cid' => 'eg', + 'cid' => 'el', 'class_name' => 'ilIndividualAssessmentMembersGUI', 'class_path' => './components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentMembersGUI.php', 'children' => @@ -3660,7 +3731,7 @@ ), 'ilindividualassessmentsettingsgui' => array ( - 'cid' => 'ei', + 'cid' => 'en', 'class_name' => 'ilIndividualAssessmentSettingsGUI', 'class_path' => './components/ILIAS/IndividualAssessment/classes/class.ilIndividualAssessmentSettingsGUI.php', 'children' => @@ -3675,9 +3746,9 @@ ), 'ilinfoscreengui' => array ( - 'cid' => 'ej', + 'cid' => 'eo', 'class_name' => 'ilInfoScreenGUI', - 'class_path' => './Services/InfoScreen/classes/class.ilInfoScreenGUI.php', + 'class_path' => './components/ILIAS/InfoScreen/classes/class.ilInfoScreenGUI.php', 'children' => array ( 0 => 'ilcommentgui', @@ -3752,9 +3823,9 @@ ), 'ilinternallinkgui' => array ( - 'cid' => 'el', + 'cid' => 'eq', 'class_name' => 'ilInternalLinkGUI', - 'class_path' => './Services/Link/classes/class.ilInternalLinkGUI.php', + 'class_path' => './components/ILIAS/Link/classes/class.ilInternalLinkGUI.php', 'children' => array ( ), @@ -3782,9 +3853,9 @@ ), 'illdapsettingsgui' => array ( - 'cid' => 'eu', + 'cid' => 'f0', 'class_name' => 'ilLDAPSettingsGUI', - 'class_path' => './Services/LDAP/classes/class.ilLDAPSettingsGUI.php', + 'class_path' => './components/ILIAS/LDAP/classes/class.ilLDAPSettingsGUI.php', 'children' => array ( ), @@ -3795,7 +3866,7 @@ ), 'illmeditshorttitlesgui' => array ( - 'cid' => 'ey', + 'cid' => 'f4', 'class_name' => 'ilLMEditShortTitlesGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilLMEditShortTitlesGUI.php', 'children' => @@ -3809,7 +3880,7 @@ ), 'illmeditorgui' => array ( - 'cid' => 'f1', + 'cid' => 'f7', 'class_name' => 'ilLMEditorGUI', 'class_path' => './components/ILIAS/LearningModule/Editing/class.ilLMEditorGUI.php', 'children' => @@ -3822,7 +3893,7 @@ ), 'illmimportgui' => array ( - 'cid' => 'f4', + 'cid' => 'fa', 'class_name' => 'ilLMImportGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilLMImportGUI.php', 'children' => @@ -3836,7 +3907,7 @@ ), 'illmpagegui' => array ( - 'cid' => 'f9', + 'cid' => 'ff', 'class_name' => 'ilLMPageGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilLMPageGUI.php', 'children' => @@ -3861,7 +3932,7 @@ ), 'illmpageobjectgui' => array ( - 'cid' => 'fa', + 'cid' => 'fg', 'class_name' => 'ilLMPageObjectGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilLMPageObjectGUI.php', 'children' => @@ -3877,7 +3948,7 @@ ), 'illmpresentationgui' => array ( - 'cid' => 'fc', + 'cid' => 'fi', 'class_name' => 'ilLMPresentationGUI', 'class_path' => './components/ILIAS/LearningModule/Presentation/class.ilLMPresentationGUI.php', 'children' => @@ -3897,7 +3968,7 @@ ), 'illoeditorgui' => array ( - 'cid' => 'fh', + 'cid' => 'fn', 'class_name' => 'ilLOEditorGUI', 'class_path' => './components/ILIAS/Course/classes/Objectives/class.ilLOEditorGUI.php', 'children' => @@ -3914,7 +3985,7 @@ ), 'illomembertestresultgui' => array ( - 'cid' => 'fi', + 'cid' => 'fo', 'class_name' => 'ilLOMemberTestResultGUI', 'class_path' => './components/ILIAS/Course/classes/Objectives/class.ilLOMemberTestResultGUI.php', 'children' => @@ -3927,7 +3998,7 @@ ), 'illopagegui' => array ( - 'cid' => 'fk', + 'cid' => 'fq', 'class_name' => 'ilLOPageGUI', 'class_path' => './components/ILIAS/Course/classes/Objectives/class.ilLOPageGUI.php', 'children' => @@ -3949,9 +4020,9 @@ ), 'illplistofobjectsgui' => array ( - 'cid' => 'fn', + 'cid' => 'ft', 'class_name' => 'ilLPListOfObjectsGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfObjectsGUI.php', 'children' => array ( 0 => 'iluserfiltergui', @@ -3967,9 +4038,9 @@ ), 'illplistofprogressgui' => array ( - 'cid' => 'fo', + 'cid' => 'fu', 'class_name' => 'ilLPListOfProgressGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfProgressGUI.php', 'children' => array ( 0 => 'illpprogresstablegui', @@ -3981,9 +4052,9 @@ ), 'illplistofsettingsgui' => array ( - 'cid' => 'fp', + 'cid' => 'fv', 'class_name' => 'ilLPListOfSettingsGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilLPListOfSettingsGUI.php', 'children' => array ( ), @@ -3994,9 +4065,9 @@ ), 'illpobjectstatisticsadmintablegui' => array ( - 'cid' => 'fq', + 'cid' => 'fw', 'class_name' => 'ilLPObjectStatisticsAdminTableGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsAdminTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4007,9 +4078,9 @@ ), 'illpobjectstatisticsdailytablegui' => array ( - 'cid' => 'fr', + 'cid' => 'fx', 'class_name' => 'ilLPObjectStatisticsDailyTableGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsDailyTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4021,9 +4092,9 @@ ), 'illpobjectstatisticsgui' => array ( - 'cid' => 'fs', + 'cid' => 'fy', 'class_name' => 'ilLPObjectStatisticsGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsGUI.php', 'children' => array ( 0 => 'illpobjectstatisticstablegui', @@ -4038,9 +4109,9 @@ ), 'illpobjectstatisticslptablegui' => array ( - 'cid' => 'ft', + 'cid' => 'fz', 'class_name' => 'ilLPObjectStatisticsLPTableGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsLPTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4052,9 +4123,9 @@ ), 'illpobjectstatisticstablegui' => array ( - 'cid' => 'fu', + 'cid' => 'g0', 'class_name' => 'ilLPObjectStatisticsTableGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4066,9 +4137,9 @@ ), 'illpobjectstatisticstypestablegui' => array ( - 'cid' => 'fv', + 'cid' => 'g1', 'class_name' => 'ilLPObjectStatisticsTypesTableGUI', - 'class_path' => './Services/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/object_statistics/class.ilLPObjectStatisticsTypesTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4079,9 +4150,9 @@ ), 'illpprogresstablegui' => array ( - 'cid' => 'fw', + 'cid' => 'g2', 'class_name' => 'ilLPProgressTableGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilLPProgressTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4093,7 +4164,7 @@ ), 'illticonsumeprovidersettingsgui' => array ( - 'cid' => 'g1', + 'cid' => 'g7', 'class_name' => 'ilLTIConsumeProviderSettingsGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumeProviderSettingsGUI.php', 'children' => @@ -4106,7 +4177,7 @@ ), 'illticonsumeradministrationgui' => array ( - 'cid' => 'g2', + 'cid' => 'g8', 'class_name' => 'ilLTIConsumerAdministrationGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerAdministrationGUI.php', 'children' => @@ -4119,7 +4190,7 @@ ), 'illticonsumercontentgui' => array ( - 'cid' => 'g3', + 'cid' => 'g9', 'class_name' => 'ilLTIConsumerContentGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerContentGUI.php', 'children' => @@ -4132,7 +4203,7 @@ ), 'illticonsumergradesynchronizationgui' => array ( - 'cid' => 'g4', + 'cid' => 'ga', 'class_name' => 'ilLTIConsumerGradeSynchronizationGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerGradeSynchronizationGUI.php', 'children' => @@ -4145,7 +4216,7 @@ ), 'illticonsumerscoringgui' => array ( - 'cid' => 'g9', + 'cid' => 'gf', 'class_name' => 'ilLTIConsumerScoringGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerScoringGUI.php', 'children' => @@ -4158,7 +4229,7 @@ ), 'illticonsumersettingsgui' => array ( - 'cid' => 'gc', + 'cid' => 'gi', 'class_name' => 'ilLTIConsumerSettingsGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerSettingsGUI.php', 'children' => @@ -4173,7 +4244,7 @@ ), 'illticonsumerxapistatementsgui' => array ( - 'cid' => 'ge', + 'cid' => 'gk', 'class_name' => 'ilLTIConsumerXapiStatementsGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilLTIConsumerXapiStatementsGUI.php', 'children' => @@ -4186,9 +4257,9 @@ ), 'illtiproviderobjectsettinggui' => array ( - 'cid' => 'gf', + 'cid' => 'gl', 'class_name' => 'ilLTIProviderObjectSettingGUI', - 'class_path' => './Services/LTI/classes/InternalProvider/class.ilLTIProviderObjectSettingGUI.php', + 'class_path' => './components/ILIAS/LTI/classes/InternalProvider/class.ilLTIProviderObjectSettingGUI.php', 'children' => array ( ), @@ -4208,9 +4279,9 @@ ), 'illtiroutergui' => array ( - 'cid' => 'gh', + 'cid' => 'gn', 'class_name' => 'ilLTIRouterGUI', - 'class_path' => './Services/LTI/classes/class.ilLTIRouterGUI.php', + 'class_path' => './components/ILIAS/LTI/classes/class.ilLTIRouterGUI.php', 'children' => array ( 0 => 'illtiviewgui', @@ -4221,9 +4292,9 @@ ), 'illtiviewgui' => array ( - 'cid' => 'gi', + 'cid' => 'go', 'class_name' => 'ilLTIViewGUI', - 'class_path' => './Services/LTI/classes/class.ilLTIViewGUI.php', + 'class_path' => './components/ILIAS/LTI/classes/class.ilLTIViewGUI.php', 'children' => array ( ), @@ -4234,9 +4305,9 @@ ), 'illearninghistorygui' => array ( - 'cid' => 'gl', + 'cid' => 'gr', 'class_name' => 'ilLearningHistoryGUI', - 'class_path' => './Services/LearningHistory/classes/class.ilLearningHistoryGUI.php', + 'class_path' => './components/ILIAS/LearningHistory/classes/class.ilLearningHistoryGUI.php', 'children' => array ( ), @@ -4249,9 +4320,9 @@ ), 'illearningprogressgui' => array ( - 'cid' => 'go', + 'cid' => 'gu', 'class_name' => 'ilLearningProgressGUI', - 'class_path' => './Services/Tracking/classes/class.ilLearningProgressGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/class.ilLearningProgressGUI.php', 'children' => array ( 0 => 'illplistofobjectsgui', @@ -4293,7 +4364,7 @@ ), 'illearningsequencemembershipgui' => array ( - 'cid' => 'gq', + 'cid' => 'gw', 'class_name' => 'ilLearningSequenceMembershipGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/Members/class.ilLearningSequenceMembershipGUI.php', 'children' => @@ -4313,9 +4384,9 @@ ), 'illegaldocumentsadministrationgui' => array ( - 'cid' => 'gt', + 'cid' => 'gz', 'class_name' => 'ilLegalDocumentsAdministrationGUI', - 'class_path' => './Services/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php', + 'class_path' => './components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAdministrationGUI.php', 'children' => array ( ), @@ -4327,9 +4398,9 @@ ), 'illegaldocumentsagreementgui' => array ( - 'cid' => 'gu', + 'cid' => 'h0', 'class_name' => 'ilLegalDocumentsAgreementGUI', - 'class_path' => './Services/LegalDocuments/classes/class.ilLegalDocumentsAgreementGUI.php', + 'class_path' => './components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsAgreementGUI.php', 'children' => array ( ), @@ -4340,9 +4411,9 @@ ), 'illegaldocumentswithdrawalgui' => array ( - 'cid' => 'gv', + 'cid' => 'h1', 'class_name' => 'ilLegalDocumentsWithdrawalGUI', - 'class_path' => './Services/LegalDocuments/classes/class.ilLegalDocumentsWithdrawalGUI.php', + 'class_path' => './components/ILIAS/LegalDocuments/classes/class.ilLegalDocumentsWithdrawalGUI.php', 'children' => array ( ), @@ -4353,9 +4424,9 @@ ), 'illikegui' => array ( - 'cid' => 'gx', + 'cid' => 'h3', 'class_name' => 'ilLikeGUI', - 'class_path' => './Services/Like/classes/class.ilLikeGUI.php', + 'class_path' => './components/ILIAS/Like/classes/class.ilLikeGUI.php', 'children' => array ( ), @@ -4366,9 +4437,9 @@ ), 'illinkinputgui' => array ( - 'cid' => 'gy', + 'cid' => 'h4', 'class_name' => 'ilLinkInputGUI', - 'class_path' => './Services/Form/classes/class.ilLinkInputGUI.php', + 'class_path' => './components/ILIAS/Form/classes/class.ilLinkInputGUI.php', 'children' => array ( 0 => 'ilinternallinkgui', @@ -4380,7 +4451,7 @@ ), 'illinkresourcehandlergui' => array ( - 'cid' => 'gz', + 'cid' => 'h5', 'class_name' => 'ilLinkResourceHandlerGUI', 'class_path' => './components/ILIAS/WebResource/classes/class.ilLinkResourceHandlerGUI.php', 'children' => @@ -4393,7 +4464,7 @@ ), 'illocalunitconfigurationgui' => array ( - 'cid' => 'h4', + 'cid' => 'ha', 'class_name' => 'ilLocalUnitConfigurationGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilLocalUnitConfigurationGUI.php', 'children' => @@ -4407,7 +4478,7 @@ ), 'illocalusergui' => array ( - 'cid' => 'h5', + 'cid' => 'hb', 'class_name' => 'ilLocalUserGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/LocalUser/class.ilLocalUserGUI.php', 'children' => @@ -4420,9 +4491,9 @@ ), 'illoginpagegui' => array ( - 'cid' => 'ha', + 'cid' => 'hg', 'class_name' => 'ilLoginPageGUI', - 'class_path' => './Services/Authentication/classes/class.ilLoginPageGUI.php', + 'class_path' => './components/ILIAS/Authentication/classes/class.ilLoginPageGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -4441,9 +4512,9 @@ ), 'illuceneadvancedsearchgui' => array ( - 'cid' => 'hc', + 'cid' => 'hi', 'class_name' => 'ilLuceneAdvancedSearchGUI', - 'class_path' => './Services/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/Lucene/class.ilLuceneAdvancedSearchGUI.php', 'children' => array ( 0 => 'ilobjectgui', @@ -4462,9 +4533,9 @@ ), 'illucenesearchgui' => array ( - 'cid' => 'he', + 'cid' => 'hk', 'class_name' => 'ilLuceneSearchGUI', - 'class_path' => './Services/Search/classes/Lucene/class.ilLuceneSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -4484,9 +4555,9 @@ ), 'illuceneusersearchgui' => array ( - 'cid' => 'hf', + 'cid' => 'hl', 'class_name' => 'ilLuceneUserSearchGUI', - 'class_path' => './Services/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/Lucene/class.ilLuceneUserSearchGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -4498,9 +4569,9 @@ ), 'ilmdcopyrightimageuploadhandlergui' => array ( - 'cid' => 'hg', + 'cid' => 'hm', 'class_name' => 'ilMDCopyrightImageUploadHandlerGUI', - 'class_path' => './Services/MetaData/classes/Settings/Copyright/class.ilMDCopyrightImageUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightImageUploadHandlerGUI.php', 'children' => array ( ), @@ -4511,9 +4582,9 @@ ), 'ilmdcopyrightselectiongui' => array ( - 'cid' => 'hh', + 'cid' => 'hn', 'class_name' => 'ilMDCopyrightSelectionGUI', - 'class_path' => './Services/MetaData/classes/Settings/Copyright/class.ilMDCopyrightSelectionGUI.php', + 'class_path' => './components/ILIAS/MetaData/classes/Settings/Copyright/class.ilMDCopyrightSelectionGUI.php', 'children' => array ( 0 => 'ilmdcopyrightusagegui', @@ -4526,9 +4597,9 @@ ), 'ilmdcopyrightusagegui' => array ( - 'cid' => 'hj', + 'cid' => 'hp', 'class_name' => 'ilMDCopyrightUsageGUI', - 'class_path' => './Services/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageGUI.php', + 'class_path' => './components/ILIAS/MetaData/classes/Settings/Copyright/Usage/class.ilMDCopyrightUsageGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -4540,9 +4611,9 @@ ), 'ilmdeditorgui' => array ( - 'cid' => 'hl', + 'cid' => 'hr', 'class_name' => 'ilMDEditorGUI', - 'class_path' => './Services/MetaData/classes/Editor/class.ilMDEditorGUI.php', + 'class_path' => './components/ILIAS/MetaData/classes/Editor/class.ilMDEditorGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4569,9 +4640,9 @@ ), 'ilmmitemtranslationgui' => array ( - 'cid' => 'hn', + 'cid' => 'ht', 'class_name' => 'ilMMItemTranslationGUI', - 'class_path' => './Services/MainMenu/classes/Administration/class.ilMMItemTranslationGUI.php', + 'class_path' => './components/ILIAS/MainMenu/classes/Administration/class.ilMMItemTranslationGUI.php', 'children' => array ( ), @@ -4583,9 +4654,9 @@ ), 'ilmmsubitemgui' => array ( - 'cid' => 'hp', + 'cid' => 'hv', 'class_name' => 'ilMMSubItemGUI', - 'class_path' => './Services/MainMenu/classes/Administration/class.ilMMSubItemGUI.php', + 'class_path' => './components/ILIAS/MainMenu/classes/Administration/class.ilMMSubItemGUI.php', 'children' => array ( 0 => 'ilmmitemtranslationgui', @@ -4597,9 +4668,9 @@ ), 'ilmmtopitemgui' => array ( - 'cid' => 'ht', + 'cid' => 'hz', 'class_name' => 'ilMMTopItemGUI', - 'class_path' => './Services/MainMenu/classes/Administration/class.ilMMTopItemGUI.php', + 'class_path' => './components/ILIAS/MainMenu/classes/Administration/class.ilMMTopItemGUI.php', 'children' => array ( 0 => 'ilmmitemtranslationgui', @@ -4611,9 +4682,9 @@ ), 'ilmmuploadhandlergui' => array ( - 'cid' => 'hv', + 'cid' => 'i1', 'class_name' => 'ilMMUploadHandlerGUI', - 'class_path' => './Services/MainMenu/classes/Administration/class.ilMMUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/MainMenu/classes/Administration/class.ilMMUploadHandlerGUI.php', 'children' => array ( ), @@ -4624,9 +4695,9 @@ ), 'ilmstlistcertificatesgui' => array ( - 'cid' => 'hw', + 'cid' => 'i2', 'class_name' => 'ilMStListCertificatesGUI', - 'class_path' => './Services/MyStaff/classes/ListCertificates/class.ilMStListCertificatesGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListCertificates/class.ilMStListCertificatesGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4639,9 +4710,9 @@ ), 'ilmstlistcompetencesgui' => array ( - 'cid' => 'hx', + 'cid' => 'i3', 'class_name' => 'ilMStListCompetencesGUI', - 'class_path' => './Services/MyStaff/classes/ListCompetences/class.ilMStListCompetencesGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListCompetences/class.ilMStListCompetencesGUI.php', 'children' => array ( 0 => 'ilmstlistcompetencesskillsgui', @@ -4653,9 +4724,9 @@ ), 'ilmstlistcompetencesskillsgui' => array ( - 'cid' => 'hy', + 'cid' => 'i4', 'class_name' => 'ilMStListCompetencesSkillsGUI', - 'class_path' => './Services/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListCompetences/Skills/class.ilMStListCompetencesSkillsGUI.php', 'children' => array ( ), @@ -4666,9 +4737,9 @@ ), 'ilmstlistcoursesgui' => array ( - 'cid' => 'hz', + 'cid' => 'i5', 'class_name' => 'ilMStListCoursesGUI', - 'class_path' => './Services/MyStaff/classes/ListCourses/class.ilMStListCoursesGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesGUI.php', 'children' => array ( 0 => 'ilmstlistcoursestablegui', @@ -4680,9 +4751,9 @@ ), 'ilmstlistcoursestablegui' => array ( - 'cid' => 'i0', + 'cid' => 'i6', 'class_name' => 'ilMStListCoursesTableGUI', - 'class_path' => './Services/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListCourses/class.ilMStListCoursesTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4694,9 +4765,9 @@ ), 'ilmstlistusersgui' => array ( - 'cid' => 'i1', + 'cid' => 'i7', 'class_name' => 'ilMStListUsersGUI', - 'class_path' => './Services/MyStaff/classes/ListUsers/class.ilMStListUsersGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ListUsers/class.ilMStListUsersGUI.php', 'children' => array ( ), @@ -4707,9 +4778,9 @@ ), 'ilmstshowusercompetencesgui' => array ( - 'cid' => 'i2', + 'cid' => 'i8', 'class_name' => 'ilMStShowUserCompetencesGUI', - 'class_path' => './Services/MyStaff/classes/ShowUser/Competences/class.ilMStShowUserCompetencesGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ShowUser/Competences/class.ilMStShowUserCompetencesGUI.php', 'children' => array ( ), @@ -4720,9 +4791,9 @@ ), 'ilmstshowusercoursesgui' => array ( - 'cid' => 'i3', + 'cid' => 'i9', 'class_name' => 'ilMStShowUserCoursesGUI', - 'class_path' => './Services/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesGUI.php', 'children' => array ( 0 => 'ilmstshowusercoursestablegui', @@ -4734,9 +4805,9 @@ ), 'ilmstshowusercoursestablegui' => array ( - 'cid' => 'i4', + 'cid' => 'ia', 'class_name' => 'ilMStShowUserCoursesTableGUI', - 'class_path' => './Services/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ShowUser/Courses/class.ilMStShowUserCoursesTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -4748,9 +4819,9 @@ ), 'ilmstshowusergui' => array ( - 'cid' => 'i5', + 'cid' => 'ib', 'class_name' => 'ilMStShowUserGUI', - 'class_path' => './Services/MyStaff/classes/ShowUser/class.ilMStShowUserGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/ShowUser/class.ilMStShowUserGUI.php', 'children' => array ( 0 => 'ilusercertificategui', @@ -4765,9 +4836,9 @@ ), 'ilmailattachmentgui' => array ( - 'cid' => 'i6', + 'cid' => 'ic', 'class_name' => 'ilMailAttachmentGUI', - 'class_path' => './Services/Mail/classes/class.ilMailAttachmentGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailAttachmentGUI.php', 'children' => array ( ), @@ -4779,9 +4850,9 @@ ), 'ilmailfoldergui' => array ( - 'cid' => 'i8', + 'cid' => 'ie', 'class_name' => 'ilMailFolderGUI', - 'class_path' => './Services/Mail/classes/class.ilMailFolderGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailFolderGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -4793,9 +4864,9 @@ ), 'ilmailformgui' => array ( - 'cid' => 'ib', + 'cid' => 'ih', 'class_name' => 'ilMailFormGUI', - 'class_path' => './Services/Mail/classes/class.ilMailFormGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailFormGUI.php', 'children' => array ( 0 => 'ilmailattachmentgui', @@ -4811,9 +4882,9 @@ ), 'ilmailgui' => array ( - 'cid' => 'ic', + 'cid' => 'ii', 'class_name' => 'ilMailGUI', - 'class_path' => './Services/Mail/classes/class.ilMailGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailGUI.php', 'children' => array ( 0 => 'ilmailfoldergui', @@ -4830,9 +4901,9 @@ ), 'ilmailmembersearchgui' => array ( - 'cid' => 'id', + 'cid' => 'ij', 'class_name' => 'ilMailMemberSearchGUI', - 'class_path' => './Services/Contact/classes/class.ilMailMemberSearchGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilMailMemberSearchGUI.php', 'children' => array ( ), @@ -4848,9 +4919,9 @@ ), 'ilmailoptionsgui' => array ( - 'cid' => 'ig', + 'cid' => 'im', 'class_name' => 'ilMailOptionsGUI', - 'class_path' => './Services/Mail/classes/class.ilMailOptionsGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailOptionsGUI.php', 'children' => array ( ), @@ -4862,9 +4933,9 @@ ), 'ilmailsearchcoursesgui' => array ( - 'cid' => 'ii', + 'cid' => 'io', 'class_name' => 'ilMailSearchCoursesGUI', - 'class_path' => './Services/Contact/classes/class.ilMailSearchCoursesGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilMailSearchCoursesGUI.php', 'children' => array ( 0 => 'ilbuddysystemgui', @@ -4878,9 +4949,9 @@ ), 'ilmailsearchgui' => array ( - 'cid' => 'ij', + 'cid' => 'ip', 'class_name' => 'ilMailSearchGUI', - 'class_path' => './Services/Contact/classes/class.ilMailSearchGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilMailSearchGUI.php', 'children' => array ( ), @@ -4894,9 +4965,9 @@ ), 'ilmailsearchgroupsgui' => array ( - 'cid' => 'ik', + 'cid' => 'iq', 'class_name' => 'ilMailSearchGroupsGUI', - 'class_path' => './Services/Contact/classes/class.ilMailSearchGroupsGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilMailSearchGroupsGUI.php', 'children' => array ( 0 => 'ilbuddysystemgui', @@ -4910,9 +4981,9 @@ ), 'ilmailtemplategui' => array ( - 'cid' => 'ip', + 'cid' => 'iv', 'class_name' => 'ilMailTemplateGUI', - 'class_path' => './Services/Mail/classes/class.ilMailTemplateGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilMailTemplateGUI.php', 'children' => array ( ), @@ -4923,9 +4994,9 @@ ), 'ilmailinglistsgui' => array ( - 'cid' => 'is', + 'cid' => 'iy', 'class_name' => 'ilMailingListsGUI', - 'class_path' => './Services/Contact/classes/class.ilMailingListsGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilMailingListsGUI.php', 'children' => array ( ), @@ -4937,7 +5008,7 @@ ), 'ilmarkschemagui' => array ( - 'cid' => 'iy', + 'cid' => 'j4', 'class_name' => 'ilMarkSchemaGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilMarkSchemaGUI.php', 'children' => @@ -4950,9 +5021,9 @@ ), 'ilmathjaxsettingsgui' => array ( - 'cid' => 'j3', + 'cid' => 'j9', 'class_name' => 'ilMathJaxSettingsGUI', - 'class_path' => './Services/MathJax/classes/class.ilMathJaxSettingsGUI.php', + 'class_path' => './components/ILIAS/MathJax/classes/class.ilMathJaxSettingsGUI.php', 'children' => array ( ), @@ -4963,7 +5034,7 @@ ), 'ilmediacasthandlergui' => array ( - 'cid' => 'j5', + 'cid' => 'jb', 'class_name' => 'ilMediaCastHandlerGUI', 'class_path' => './components/ILIAS/MediaCast/classes/class.ilMediaCastHandlerGUI.php', 'children' => @@ -4976,9 +5047,9 @@ ), 'ilmediacreationgui' => array ( - 'cid' => 'j9', + 'cid' => 'jf', 'class_name' => 'ilMediaCreationGUI', - 'class_path' => './Services/MediaObjects/Creation/class.ilMediaCreationGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/Creation/class.ilMediaCreationGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -4992,9 +5063,9 @@ ), 'ilmediaobjectsplayerwrappergui' => array ( - 'cid' => 'jb', + 'cid' => 'jh', 'class_name' => 'ilMediaObjectsPlayerWrapperGUI', - 'class_path' => './Services/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/Player/class.ilMediaObjectsPlayerWrapperGUI.php', 'children' => array ( ), @@ -5005,7 +5076,7 @@ ), 'ilmediapoolimportgui' => array ( - 'cid' => 'jd', + 'cid' => 'jj', 'class_name' => 'ilMediaPoolImportGUI', 'class_path' => './components/ILIAS/MediaPool/classes/class.ilMediaPoolImportGUI.php', 'children' => @@ -5018,7 +5089,7 @@ ), 'ilmediapoolpagegui' => array ( - 'cid' => 'je', + 'cid' => 'jk', 'class_name' => 'ilMediaPoolPageGUI', 'class_path' => './components/ILIAS/MediaPool/classes/class.ilMediaPoolPageGUI.php', 'children' => @@ -5035,7 +5106,7 @@ ), 'ilmediapoolpresentationgui' => array ( - 'cid' => 'jg', + 'cid' => 'jm', 'class_name' => 'ilMediaPoolPresentationGUI', 'class_path' => './components/ILIAS/MediaPool/classes/class.ilMediaPoolPresentationGUI.php', 'children' => @@ -5048,9 +5119,9 @@ ), 'ilmemberagreementgui' => array ( - 'cid' => 'ji', + 'cid' => 'jo', 'class_name' => 'ilMemberAgreementGUI', - 'class_path' => './Services/Membership/classes/class.ilMemberAgreementGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/class.ilMemberAgreementGUI.php', 'children' => array ( ), @@ -5062,9 +5133,9 @@ ), 'ilmemberexportgui' => array ( - 'cid' => 'jk', + 'cid' => 'jq', 'class_name' => 'ilMemberExportGUI', - 'class_path' => './Services/Membership/classes/Export/class.ilMemberExportGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/Export/class.ilMemberExportGUI.php', 'children' => array ( ), @@ -5080,9 +5151,9 @@ ), 'ilmemberexportsettingsgui' => array ( - 'cid' => 'jl', + 'cid' => 'jr', 'class_name' => 'ilMemberExportSettingsGUI', - 'class_path' => './Services/Membership/classes/Export/class.ilMemberExportSettingsGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/Export/class.ilMemberExportSettingsGUI.php', 'children' => array ( ), @@ -5096,9 +5167,9 @@ ), 'ilmembershipblockgui' => array ( - 'cid' => 'jo', + 'cid' => 'ju', 'class_name' => 'ilMembershipBlockGUI', - 'class_path' => './Services/Dashboard/Block/classes/class.ilMembershipBlockGUI.php', + 'class_path' => './components/ILIAS/Dashboard/Block/classes/class.ilMembershipBlockGUI.php', 'children' => array ( ), @@ -5110,9 +5181,9 @@ ), 'ilmembershipmailgui' => array ( - 'cid' => 'jq', + 'cid' => 'jw', 'class_name' => 'ilMembershipMailGUI', - 'class_path' => './Services/Membership/classes/class.ilMembershipMailGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/class.ilMembershipMailGUI.php', 'children' => array ( ), @@ -5123,9 +5194,9 @@ ), 'ilmembershipoverviewgui' => array ( - 'cid' => 'jr', + 'cid' => 'jx', 'class_name' => 'ilMembershipOverviewGUI', - 'class_path' => './Services/Membership/classes/class.ilMembershipOverviewGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/class.ilMembershipOverviewGUI.php', 'children' => array ( 0 => 'ilmembershipblockgui', @@ -5137,9 +5208,9 @@ ), 'ilmessagegui' => array ( - 'cid' => 'jt', + 'cid' => 'jz', 'class_name' => 'ilMessageGUI', - 'class_path' => './Services/Notes/Message/class.ilMessageGUI.php', + 'class_path' => './components/ILIAS/Notes/Message/class.ilMessageGUI.php', 'children' => array ( ), @@ -5150,9 +5221,9 @@ ), 'ilmobmultisrtuploadgui' => array ( - 'cid' => 'jw', + 'cid' => 'k2', 'class_name' => 'ilMobMultiSrtUploadGUI', - 'class_path' => './Services/MediaObjects/SubTitles/class.ilMobMultiSrtUploadGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/SubTitles/class.ilMobMultiSrtUploadGUI.php', 'children' => array ( ), @@ -5165,9 +5236,9 @@ ), 'ilmultilingualismgui' => array ( - 'cid' => 'k2', + 'cid' => 'k8', 'class_name' => 'ilMultilingualismGUI', - 'class_path' => './Services/Multilingualism/classes/class.ilMultilingualismGUI.php', + 'class_path' => './components/ILIAS/Multilingualism/classes/class.ilMultilingualismGUI.php', 'children' => array ( ), @@ -5178,9 +5249,9 @@ ), 'ilmystaffgui' => array ( - 'cid' => 'k8', + 'cid' => 'ke', 'class_name' => 'ilMyStaffGUI', - 'class_path' => './Services/MyStaff/classes/class.ilMyStaffGUI.php', + 'class_path' => './components/ILIAS/MyStaff/classes/class.ilMyStaffGUI.php', 'children' => array ( 0 => 'ilemployeetalkmystafflistgui', @@ -5197,7 +5268,7 @@ ), 'ilmytestresultsgui' => array ( - 'cid' => 'k9', + 'cid' => 'kf', 'class_name' => 'ilMyTestResultsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilMyTestResultsGUI.php', 'children' => @@ -5214,7 +5285,7 @@ ), 'ilmytestsolutionsgui' => array ( - 'cid' => 'ka', + 'cid' => 'kg', 'class_name' => 'ilMyTestSolutionsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilMyTestSolutionsGUI.php', 'children' => @@ -5229,9 +5300,9 @@ ), 'ilnewsforcontextblockgui' => array ( - 'cid' => 'ke', + 'cid' => 'kk', 'class_name' => 'ilNewsForContextBlockGUI', - 'class_path' => './Services/News/classes/class.ilNewsForContextBlockGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilNewsForContextBlockGUI.php', 'children' => array ( 0 => 'ilnewsitemgui', @@ -5243,9 +5314,9 @@ ), 'ilnewsitemgui' => array ( - 'cid' => 'kg', + 'cid' => 'km', 'class_name' => 'ilNewsItemGUI', - 'class_path' => './Services/News/classes/class.ilNewsItemGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilNewsItemGUI.php', 'children' => array ( ), @@ -5258,9 +5329,9 @@ ), 'ilnewstimelinegui' => array ( - 'cid' => 'kh', + 'cid' => 'kn', 'class_name' => 'ilNewsTimelineGUI', - 'class_path' => './Services/News/classes/class.ilNewsTimelineGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilNewsTimelineGUI.php', 'children' => array ( 0 => 'illikegui', @@ -5275,9 +5346,9 @@ ), 'ilnotegui' => array ( - 'cid' => 'kk', + 'cid' => 'kq', 'class_name' => 'ilNoteGUI', - 'class_path' => './Services/Notes/Note/class.ilNoteGUI.php', + 'class_path' => './components/ILIAS/Notes/Note/class.ilNoteGUI.php', 'children' => array ( ), @@ -5315,9 +5386,9 @@ ), 'ilnotificationgui' => array ( - 'cid' => 'kl', + 'cid' => 'kr', 'class_name' => 'ilNotificationGUI', - 'class_path' => './Services/Notifications/classes/class.ilNotificationGUI.php', + 'class_path' => './components/ILIAS/Notifications/classes/class.ilNotificationGUI.php', 'children' => array ( ), @@ -5327,9 +5398,9 @@ ), 'ilobjaccessibilitysettingsgui' => array ( - 'cid' => 'ko', + 'cid' => 'ku', 'class_name' => 'ilObjAccessibilitySettingsGUI', - 'class_path' => './Services/Accessibility/classes/class.ilObjAccessibilitySettingsGUI.php', + 'class_path' => './components/ILIAS/Accessibility/classes/class.ilObjAccessibilitySettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5342,9 +5413,9 @@ ), 'ilobjadministrativenotificationgui' => array ( - 'cid' => 'kp', + 'cid' => 'kv', 'class_name' => 'ilObjAdministrativeNotificationGUI', - 'class_path' => './Services/AdministrativeNotification/classes/class.ilObjAdministrativeNotificationGUI.php', + 'class_path' => './components/ILIAS/AdministrativeNotification/classes/class.ilObjAdministrativeNotificationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5357,9 +5428,9 @@ ), 'ilobjadvancededitinggui' => array ( - 'cid' => 'kq', + 'cid' => 'kw', 'class_name' => 'ilObjAdvancedEditingGUI', - 'class_path' => './Services/AdvancedEditing/classes/class.ilObjAdvancedEditingGUI.php', + 'class_path' => './components/ILIAS/AdvancedEditing/classes/class.ilObjAdvancedEditingGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5371,7 +5442,7 @@ ), 'ilobjassessmentfoldergui' => array ( - 'cid' => 'kr', + 'cid' => 'kx', 'class_name' => 'ilObjAssessmentFolderGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilObjAssessmentFolderGUI.php', 'children' => @@ -5386,9 +5457,9 @@ ), 'ilobjauthsettingsgui' => array ( - 'cid' => 'ks', + 'cid' => 'ky', 'class_name' => 'ilObjAuthSettingsGUI', - 'class_path' => './Services/Authentication/classes/class.ilObjAuthSettingsGUI.php', + 'class_path' => './components/ILIAS/Authentication/classes/class.ilObjAuthSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5407,9 +5478,9 @@ ), 'ilobjawarenessadministrationgui' => array ( - 'cid' => 'ku', + 'cid' => 'l0', 'class_name' => 'ilObjAwarenessAdministrationGUI', - 'class_path' => './Services/Awareness/Administration/class.ilObjAwarenessAdministrationGUI.php', + 'class_path' => './components/ILIAS/Awareness/Administration/class.ilObjAwarenessAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5422,9 +5493,9 @@ ), 'ilobjbadgeadministrationgui' => array ( - 'cid' => 'kv', + 'cid' => 'l1', 'class_name' => 'ilObjBadgeAdministrationGUI', - 'class_path' => './Services/Badge/classes/class.ilObjBadgeAdministrationGUI.php', + 'class_path' => './components/ILIAS/Badge/classes/class.ilObjBadgeAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5437,7 +5508,7 @@ ), 'ilobjbibliographicadmingui' => array ( - 'cid' => 'kw', + 'cid' => 'l2', 'class_name' => 'ilObjBibliographicAdminGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/class.ilObjBibliographicAdminGUI.php', 'children' => @@ -5455,7 +5526,7 @@ ), 'ilobjbibliographicgui' => array ( - 'cid' => 'kx', + 'cid' => 'l3', 'class_name' => 'ilObjBibliographicGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/class.ilObjBibliographicGUI.php', 'children' => @@ -5479,7 +5550,7 @@ ), 'ilobjbibliographicuploadhandlergui' => array ( - 'cid' => 'kz', + 'cid' => 'l5', 'class_name' => 'ilObjBibliographicUploadHandlerGUI', 'class_path' => './components/ILIAS/Bibliographic/classes/class.ilObjBibliographicUploadHandlerGUI.php', 'children' => @@ -5494,7 +5565,7 @@ ), 'ilobjblogadministrationgui' => array ( - 'cid' => 'l0', + 'cid' => 'l6', 'class_name' => 'ilObjBlogAdministrationGUI', 'class_path' => './components/ILIAS/Blog/Administration/class.ilObjBlogAdministrationGUI.php', 'children' => @@ -5508,7 +5579,7 @@ ), 'ilobjbloggui' => array ( - 'cid' => 'l1', + 'cid' => 'l7', 'class_name' => 'ilObjBlogGUI', 'class_path' => './components/ILIAS/Blog/classes/class.ilObjBlogGUI.php', 'children' => @@ -5538,7 +5609,7 @@ ), 'ilobjbookingpoolgui' => array ( - 'cid' => 'l3', + 'cid' => 'l9', 'class_name' => 'ilObjBookingPoolGUI', 'class_path' => './components/ILIAS/BookingManager/classes/class.ilObjBookingPoolGUI.php', 'children' => @@ -5564,9 +5635,9 @@ ), 'ilobjcalendarsettingsgui' => array ( - 'cid' => 'l5', + 'cid' => 'lb', 'class_name' => 'ilObjCalendarSettingsGUI', - 'class_path' => './Services/Calendar/classes/class.ilObjCalendarSettingsGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilObjCalendarSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5578,7 +5649,7 @@ ), 'ilobjcategorygui' => array ( - 'cid' => 'l6', + 'cid' => 'lc', 'class_name' => 'ilObjCategoryGUI', 'class_path' => './components/ILIAS/Category/classes/class.ilObjCategoryGUI.php', 'children' => @@ -5615,7 +5686,7 @@ ), 'ilobjcategoryreferencegui' => array ( - 'cid' => 'l8', + 'cid' => 'le', 'class_name' => 'ilObjCategoryReferenceGUI', 'class_path' => './components/ILIAS/CategoryReference/classes/class.ilObjCategoryReferenceGUI.php', 'children' => @@ -5632,9 +5703,9 @@ ), 'ilobjcertificatesettingsgui' => array ( - 'cid' => 'la', + 'cid' => 'lg', 'class_name' => 'ilObjCertificateSettingsGUI', - 'class_path' => './Services/Certificate/classes/class.ilObjCertificateSettingsGUI.php', + 'class_path' => './components/ILIAS/Certificate/classes/class.ilObjCertificateSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5646,7 +5717,7 @@ ), 'ilobjchatroomadmingui' => array ( - 'cid' => 'lb', + 'cid' => 'lh', 'class_name' => 'ilObjChatroomAdminGUI', 'class_path' => './components/ILIAS/Chatroom/classes/class.ilObjChatroomAdminGUI.php', 'children' => @@ -5666,7 +5737,7 @@ ), 'ilobjchatroomgui' => array ( - 'cid' => 'lc', + 'cid' => 'li', 'class_name' => 'ilObjChatroomGUI', 'class_path' => './components/ILIAS/Chatroom/classes/class.ilObjChatroomGUI.php', 'children' => @@ -5690,7 +5761,7 @@ ), 'ilobjcloudgui' => array ( - 'cid' => 'lf', + 'cid' => 'll', 'class_name' => 'ilObjCloudGUI', 'class_path' => './components/ILIAS/Cloud/classes/class.ilObjCloudGUI.php', 'children' => @@ -5714,7 +5785,7 @@ ), 'ilobjcmixapiadministrationgui' => array ( - 'cid' => 'lh', + 'cid' => 'ln', 'class_name' => 'ilObjCmiXapiAdministrationGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilObjCmiXapiAdministrationGUI.php', 'children' => @@ -5728,7 +5799,7 @@ ), 'ilobjcmixapigui' => array ( - 'cid' => 'li', + 'cid' => 'lo', 'class_name' => 'ilObjCmiXapiGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/class.ilObjCmiXapiGUI.php', 'children' => @@ -5754,7 +5825,7 @@ ), 'ilobjcmixapiverificationgui' => array ( - 'cid' => 'lk', + 'cid' => 'lq', 'class_name' => 'ilObjCmiXapiVerificationGUI', 'class_path' => './components/ILIAS/CmiXapi/classes/Verification/class.ilObjCmiXapiVerificationGUI.php', 'children' => @@ -5767,9 +5838,9 @@ ), 'ilobjcommentssettingsgui' => array ( - 'cid' => 'lm', + 'cid' => 'ls', 'class_name' => 'ilObjCommentsSettingsGUI', - 'class_path' => './Services/Notes/Administration/classes/class.ilObjCommentsSettingsGUI.php', + 'class_path' => './components/ILIAS/Notes/Administration/classes/class.ilObjCommentsSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5781,9 +5852,9 @@ ), 'ilobjcomponentsettingsgui' => array ( - 'cid' => 'ln', + 'cid' => 'lt', 'class_name' => 'ilObjComponentSettingsGUI', - 'class_path' => './Services/Component/classes/Settings/class.ilObjComponentSettingsGUI.php', + 'class_path' => './components/ILIAS/Component/classes/Settings/class.ilObjComponentSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5795,9 +5866,9 @@ ), 'ilobjcontactadministrationgui' => array ( - 'cid' => 'lo', + 'cid' => 'lu', 'class_name' => 'ilObjContactAdministrationGUI', - 'class_path' => './Services/Contact/classes/class.ilObjContactAdministrationGUI.php', + 'class_path' => './components/ILIAS/Contact/classes/class.ilObjContactAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -5809,7 +5880,7 @@ ), 'ilobjcontentobjectgui' => array ( - 'cid' => 'lp', + 'cid' => 'lv', 'class_name' => 'ilObjContentObjectGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilObjContentObjectGUI.php', 'children' => @@ -5837,7 +5908,7 @@ ), 'ilobjcontentpageadministrationgui' => array ( - 'cid' => 'lq', + 'cid' => 'lw', 'class_name' => 'ilObjContentPageAdministrationGUI', 'class_path' => './components/ILIAS/ContentPage/classes/class.ilObjContentPageAdministrationGUI.php', 'children' => @@ -5851,7 +5922,7 @@ ), 'ilobjcontentpagegui' => array ( - 'cid' => 'lr', + 'cid' => 'lx', 'class_name' => 'ilObjContentPageGUI', 'class_path' => './components/ILIAS/ContentPage/classes/class.ilObjContentPageGUI.php', 'children' => @@ -5877,7 +5948,7 @@ ), 'ilobjcourseadministrationgui' => array ( - 'cid' => 'lt', + 'cid' => 'lz', 'class_name' => 'ilObjCourseAdministrationGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilObjCourseAdministrationGUI.php', 'children' => @@ -5893,7 +5964,7 @@ ), 'ilobjcoursegui' => array ( - 'cid' => 'lu', + 'cid' => 'm0', 'class_name' => 'ilObjCourseGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilObjCourseGUI.php', 'children' => @@ -5955,7 +6026,7 @@ ), 'ilobjcoursegroupinggui' => array ( - 'cid' => 'lv', + 'cid' => 'm1', 'class_name' => 'ilObjCourseGroupingGUI', 'class_path' => './components/ILIAS/Course/classes/class.ilObjCourseGroupingGUI.php', 'children' => @@ -5969,7 +6040,7 @@ ), 'ilobjcoursereferencegui' => array ( - 'cid' => 'lx', + 'cid' => 'm3', 'class_name' => 'ilObjCourseReferenceGUI', 'class_path' => './components/ILIAS/CourseReference/classes/class.ilObjCourseReferenceGUI.php', 'children' => @@ -5988,7 +6059,7 @@ ), 'ilobjcourseverificationgui' => array ( - 'cid' => 'lz', + 'cid' => 'm5', 'class_name' => 'ilObjCourseVerificationGUI', 'class_path' => './components/ILIAS/Course/classes/Verification/class.ilObjCourseVerificationGUI.php', 'children' => @@ -6002,9 +6073,9 @@ ), 'ilobjdashboardsettingsgui' => array ( - 'cid' => 'm1', + 'cid' => 'm7', 'class_name' => 'ilObjDashboardSettingsGUI', - 'class_path' => './Services/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php', + 'class_path' => './components/ILIAS/Dashboard/Administration/classes/class.ilObjDashboardSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6016,7 +6087,7 @@ ), 'ilobjdatacollectiongui' => array ( - 'cid' => 'm2', + 'cid' => 'm8', 'class_name' => 'ilObjDataCollectionGUI', 'class_path' => './components/ILIAS/DataCollection/classes/class.ilObjDataCollectionGUI.php', 'children' => @@ -6045,9 +6116,9 @@ ), 'ilobjdataprotectiongui' => array ( - 'cid' => 'm4', + 'cid' => 'ma', 'class_name' => 'ilObjDataProtectionGUI', - 'class_path' => './Services/DataProtection/classes/class.ilObjDataProtectionGUI.php', + 'class_path' => './components/ILIAS/DataProtection/classes/class.ilObjDataProtectionGUI.php', 'children' => array ( 0 => 'illegaldocumentsadministrationgui', @@ -6060,9 +6131,9 @@ ), 'ilobjecssettingsgui' => array ( - 'cid' => 'm5', + 'cid' => 'mb', 'class_name' => 'ilObjECSSettingsGUI', - 'class_path' => './Services/WebServices/ECS/classes/class.ilObjECSSettingsGUI.php', + 'class_path' => './components/ILIAS/WebServices/ECS/classes/class.ilObjECSSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6075,7 +6146,7 @@ ), 'ilobjemployeetalkgui' => array ( - 'cid' => 'm6', + 'cid' => 'mc', 'class_name' => 'ilObjEmployeeTalkGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/Talk/class.ilObjEmployeeTalkGUI.php', 'children' => @@ -6098,7 +6169,7 @@ ), 'ilobjemployeetalkseriesgui' => array ( - 'cid' => 'm8', + 'cid' => 'me', 'class_name' => 'ilObjEmployeeTalkSeriesGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/TalkSeries/class.ilObjEmployeeTalkSeriesGUI.php', 'children' => @@ -6123,7 +6194,7 @@ ), 'ilobjemployeetalkserieslistgui' => array ( - 'cid' => 'm9', + 'cid' => 'mf', 'class_name' => 'ilObjEmployeeTalkSeriesListGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/TalkSeries/class.ilObjEmployeeTalkSeriesListGUI.php', 'children' => @@ -6136,7 +6207,7 @@ ), 'ilobjexerciseadministrationgui' => array ( - 'cid' => 'ma', + 'cid' => 'mg', 'class_name' => 'ilObjExerciseAdministrationGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilObjExerciseAdministrationGUI.php', 'children' => @@ -6150,7 +6221,7 @@ ), 'ilobjexercisegui' => array ( - 'cid' => 'mb', + 'cid' => 'mh', 'class_name' => 'ilObjExerciseGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilObjExerciseGUI.php', 'children' => @@ -6181,7 +6252,7 @@ ), 'ilobjexerciseverificationgui' => array ( - 'cid' => 'me', + 'cid' => 'mk', 'class_name' => 'ilObjExerciseVerificationGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilObjExerciseVerificationGUI.php', 'children' => @@ -6196,9 +6267,9 @@ ), 'ilobjexternaltoolssettingsgui' => array ( - 'cid' => 'mg', + 'cid' => 'mm', 'class_name' => 'ilObjExternalToolsSettingsGUI', - 'class_path' => './Services/Administration/classes/class.ilObjExternalToolsSettingsGUI.php', + 'class_path' => './components/ILIAS/Administration/classes/class.ilObjExternalToolsSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6212,7 +6283,7 @@ ), 'ilobjfileaccesssettingsgui' => array ( - 'cid' => 'mh', + 'cid' => 'mn', 'class_name' => 'ilObjFileAccessSettingsGUI', 'class_path' => './components/ILIAS/File/classes/class.ilObjFileAccessSettingsGUI.php', 'children' => @@ -6227,7 +6298,7 @@ ), 'ilobjfilebasedlmgui' => array ( - 'cid' => 'mi', + 'cid' => 'mo', 'class_name' => 'ilObjFileBasedLMGUI', 'class_path' => './components/ILIAS/HTMLLearningModule/classes/class.ilObjFileBasedLMGUI.php', 'children' => @@ -6251,7 +6322,7 @@ ), 'ilobjfilegui' => array ( - 'cid' => 'mk', + 'cid' => 'mq', 'class_name' => 'ilObjFileGUI', 'class_path' => './components/ILIAS/File/classes/class.ilObjFileGUI.php', 'children' => @@ -6283,7 +6354,7 @@ ), 'ilobjfilepreviewrenderergui' => array ( - 'cid' => 'mm', + 'cid' => 'ms', 'class_name' => 'ilObjFilePreviewRendererGUI', 'class_path' => './components/ILIAS/File/classes/Preview/class.ilObjFilePreviewRendererGUI.php', 'children' => @@ -6295,9 +6366,9 @@ ), 'ilobjfileservicesgui' => array ( - 'cid' => 'mn', + 'cid' => 'mt', 'class_name' => 'ilObjFileServicesGUI', - 'class_path' => './Services/FileServices/classes/class.ilObjFileServicesGUI.php', + 'class_path' => './components/ILIAS/FileServices/classes/class.ilObjFileServicesGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6311,7 +6382,7 @@ ), 'ilobjfileuploadhandlergui' => array ( - 'cid' => 'mo', + 'cid' => 'mu', 'class_name' => 'ilObjFileUploadHandlerGUI', 'class_path' => './components/ILIAS/File/classes/class.ilObjFileUploadHandlerGUI.php', 'children' => @@ -6328,7 +6399,7 @@ ), 'ilobjfoldergui' => array ( - 'cid' => 'mp', + 'cid' => 'mv', 'class_name' => 'ilObjFolderGUI', 'class_path' => './components/ILIAS/Folder/classes/class.ilObjFolderGUI.php', 'children' => @@ -6360,7 +6431,7 @@ ), 'ilobjforumadministrationgui' => array ( - 'cid' => 'mr', + 'cid' => 'mx', 'class_name' => 'ilObjForumAdministrationGUI', 'class_path' => './components/ILIAS/Forum/classes/class.ilObjForumAdministrationGUI.php', 'children' => @@ -6374,7 +6445,7 @@ ), 'ilobjforumgui' => array ( - 'cid' => 'ms', + 'cid' => 'my', 'class_name' => 'ilObjForumGUI', 'class_path' => './components/ILIAS/Forum/classes/class.ilObjForumGUI.php', 'children' => @@ -6404,7 +6475,7 @@ ), 'ilobjglossarygui' => array ( - 'cid' => 'mw', + 'cid' => 'n2', 'class_name' => 'ilObjGlossaryGUI', 'class_path' => './components/ILIAS/Glossary/classes/class.ilObjGlossaryGUI.php', 'children' => @@ -6431,7 +6502,7 @@ ), 'ilobjgroupadministrationgui' => array ( - 'cid' => 'mz', + 'cid' => 'n5', 'class_name' => 'ilObjGroupAdministrationGUI', 'class_path' => './components/ILIAS/Group/classes/class.ilObjGroupAdministrationGUI.php', 'children' => @@ -6447,7 +6518,7 @@ ), 'ilobjgroupgui' => array ( - 'cid' => 'n0', + 'cid' => 'n6', 'class_name' => 'ilObjGroupGUI', 'class_path' => './components/ILIAS/Group/classes/class.ilObjGroupGUI.php', 'children' => @@ -6494,7 +6565,7 @@ ), 'ilobjgroupreferencegui' => array ( - 'cid' => 'n2', + 'cid' => 'n8', 'class_name' => 'ilObjGroupReferenceGUI', 'class_path' => './components/ILIAS/GroupReference/classes/class.ilObjGroupReferenceGUI.php', 'children' => @@ -6511,9 +6582,9 @@ ), 'ilobjhelpsettingsgui' => array ( - 'cid' => 'n4', + 'cid' => 'na', 'class_name' => 'ilObjHelpSettingsGUI', - 'class_path' => './Services/Help/Administration/class.ilObjHelpSettingsGUI.php', + 'class_path' => './components/ILIAS/Help/Administration/class.ilObjHelpSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6525,7 +6596,7 @@ ), 'ilobjindividualassessmentgui' => array ( - 'cid' => 'n5', + 'cid' => 'nb', 'class_name' => 'ilObjIndividualAssessmentGUI', 'class_path' => './components/ILIAS/IndividualAssessment/classes/class.ilObjIndividualAssessmentGUI.php', 'children' => @@ -6549,7 +6620,7 @@ ), 'ilobjitemgroupgui' => array ( - 'cid' => 'n7', + 'cid' => 'nd', 'class_name' => 'ilObjItemGroupGUI', 'class_path' => './components/ILIAS/ItemGroup/classes/class.ilObjItemGroupGUI.php', 'children' => @@ -6568,9 +6639,9 @@ ), 'ilobjltiadministrationgui' => array ( - 'cid' => 'n9', + 'cid' => 'nf', 'class_name' => 'ilObjLTIAdministrationGUI', - 'class_path' => './Services/LTI/classes/class.ilObjLTIAdministrationGUI.php', + 'class_path' => './components/ILIAS/LTI/classes/class.ilObjLTIAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6583,7 +6654,7 @@ ), 'ilobjlticonsumergui' => array ( - 'cid' => 'na', + 'cid' => 'ng', 'class_name' => 'ilObjLTIConsumerGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/class.ilObjLTIConsumerGUI.php', 'children' => @@ -6608,7 +6679,7 @@ ), 'ilobjlticonsumerverificationgui' => array ( - 'cid' => 'nc', + 'cid' => 'ni', 'class_name' => 'ilObjLTIConsumerVerificationGUI', 'class_path' => './components/ILIAS/LTIConsumer/classes/Verification/class.ilObjLTIConsumerVerificationGUI.php', 'children' => @@ -6621,9 +6692,9 @@ ), 'ilobjlanguageextgui' => array ( - 'cid' => 'ne', + 'cid' => 'nk', 'class_name' => 'ilObjLanguageExtGUI', - 'class_path' => './Services/Language/classes/class.ilObjLanguageExtGUI.php', + 'class_path' => './components/ILIAS/Language_/classes/class.ilObjLanguageExtGUI.php', 'children' => array ( ), @@ -6635,9 +6706,9 @@ ), 'ilobjlanguagefoldergui' => array ( - 'cid' => 'nf', + 'cid' => 'nl', 'class_name' => 'ilObjLanguageFolderGUI', - 'class_path' => './Services/Language/classes/class.ilObjLanguageFolderGUI.php', + 'class_path' => './components/ILIAS/Language_/classes/class.ilObjLanguageFolderGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6649,9 +6720,9 @@ ), 'ilobjlearninghistorysettingsgui' => array ( - 'cid' => 'nh', + 'cid' => 'nn', 'class_name' => 'ilObjLearningHistorySettingsGUI', - 'class_path' => './Services/LearningHistory/Administration/classes/class.ilObjLearningHistorySettingsGUI.php', + 'class_path' => './components/ILIAS/LearningHistory/Administration/classes/class.ilObjLearningHistorySettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6663,7 +6734,7 @@ ), 'ilobjlearningmodulegui' => array ( - 'cid' => 'ni', + 'cid' => 'no', 'class_name' => 'ilObjLearningModuleGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilObjLearningModuleGUI.php', 'children' => @@ -6695,7 +6766,7 @@ ), 'ilobjlearningresourcessettingsgui' => array ( - 'cid' => 'nl', + 'cid' => 'nr', 'class_name' => 'ilObjLearningResourcesSettingsGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilObjLearningResourcesSettingsGUI.php', 'children' => @@ -6709,7 +6780,7 @@ ), 'ilobjlearningsequenceadmingui' => array ( - 'cid' => 'nm', + 'cid' => 'ns', 'class_name' => 'ilObjLearningSequenceAdminGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceAdminGUI.php', 'children' => @@ -6723,7 +6794,7 @@ ), 'ilobjlearningsequencecontentgui' => array ( - 'cid' => 'nn', + 'cid' => 'nt', 'class_name' => 'ilObjLearningSequenceContentGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/Content/class.ilObjLearningSequenceContentGUI.php', 'children' => @@ -6736,7 +6807,7 @@ ), 'ilobjlearningsequenceeditextrogui' => array ( - 'cid' => 'np', + 'cid' => 'nv', 'class_name' => 'ilObjLearningSequenceEditExtroGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/PageEditor/class.ilObjLearningSequenceEditExtroGUI.php', 'children' => @@ -6751,7 +6822,7 @@ ), 'ilobjlearningsequenceeditintrogui' => array ( - 'cid' => 'nq', + 'cid' => 'nw', 'class_name' => 'ilObjLearningSequenceEditIntroGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/PageEditor/class.ilObjLearningSequenceEditIntroGUI.php', 'children' => @@ -6766,7 +6837,7 @@ ), 'ilobjlearningsequencegui' => array ( - 'cid' => 'nr', + 'cid' => 'nx', 'class_name' => 'ilObjLearningSequenceGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/class.ilObjLearningSequenceGUI.php', 'children' => @@ -6805,7 +6876,7 @@ ), 'ilobjlearningsequencelppollinggui' => array ( - 'cid' => 'ns', + 'cid' => 'ny', 'class_name' => 'ilObjLearningSequenceLPPollingGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/Player/class.ilObjLearningSequenceLPPollingGUI.php', 'children' => @@ -6818,7 +6889,7 @@ ), 'ilobjlearningsequencelearnergui' => array ( - 'cid' => 'nt', + 'cid' => 'nz', 'class_name' => 'ilObjLearningSequenceLearnerGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/Player/class.ilObjLearningSequenceLearnerGUI.php', 'children' => @@ -6831,7 +6902,7 @@ ), 'ilobjlearningsequencesettingsgui' => array ( - 'cid' => 'nv', + 'cid' => 'o1', 'class_name' => 'ilObjLearningSequenceSettingsGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/Settings/class.ilObjLearningSequenceSettingsGUI.php', 'children' => @@ -6844,9 +6915,9 @@ ), 'ilobjlegaldocumentsgui' => array ( - 'cid' => 'nw', + 'cid' => 'o2', 'class_name' => 'ilObjLegalDocumentsGUI', - 'class_path' => './Services/LegalDocuments/classes/class.ilObjLegalDocumentsGUI.php', + 'class_path' => './components/ILIAS/LegalDocuments/classes/class.ilObjLegalDocumentsGUI.php', 'children' => array ( ), @@ -6858,9 +6929,9 @@ ), 'ilobjlegalnoticegui' => array ( - 'cid' => 'nx', + 'cid' => 'o3', 'class_name' => 'ilObjLegalNoticeGUI', - 'class_path' => './Services/Imprint/classes/class.ilObjLegalNoticeGUI.php', + 'class_path' => './components/ILIAS/Imprint/classes/class.ilObjLegalNoticeGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6873,7 +6944,7 @@ ), 'ilobjlinkresourcegui' => array ( - 'cid' => 'ny', + 'cid' => 'o4', 'class_name' => 'ilObjLinkResourceGUI', 'class_path' => './components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php', 'children' => @@ -6899,9 +6970,9 @@ ), 'ilobjloggingsettingsgui' => array ( - 'cid' => 'o1', + 'cid' => 'o7', 'class_name' => 'ilObjLoggingSettingsGUI', - 'class_path' => './Services/Logging/classes/class.ilObjLoggingSettingsGUI.php', + 'class_path' => './components/ILIAS/Logging/classes/class.ilObjLoggingSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6913,9 +6984,9 @@ ), 'ilobjmdsettingsgui' => array ( - 'cid' => 'o2', + 'cid' => 'o8', 'class_name' => 'ilObjMDSettingsGUI', - 'class_path' => './Services/MetaData/classes/Settings/class.ilObjMDSettingsGUI.php', + 'class_path' => './components/ILIAS/MetaData/classes/Settings/class.ilObjMDSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6929,9 +7000,9 @@ ), 'ilobjmailgui' => array ( - 'cid' => 'o3', + 'cid' => 'o9', 'class_name' => 'ilObjMailGUI', - 'class_path' => './Services/Mail/classes/class.ilObjMailGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilObjMailGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6944,9 +7015,9 @@ ), 'ilobjmainmenugui' => array ( - 'cid' => 'o4', + 'cid' => 'oa', 'class_name' => 'ilObjMainMenuGUI', - 'class_path' => './Services/MainMenu/classes/class.ilObjMainMenuGUI.php', + 'class_path' => './components/ILIAS/MainMenu/classes/class.ilObjMainMenuGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -6961,7 +7032,7 @@ ), 'ilobjmediacastgui' => array ( - 'cid' => 'o5', + 'cid' => 'ob', 'class_name' => 'ilObjMediaCastGUI', 'class_path' => './components/ILIAS/MediaCast/classes/class.ilObjMediaCastGUI.php', 'children' => @@ -6986,7 +7057,7 @@ ), 'ilobjmediacastsettingsgui' => array ( - 'cid' => 'o7', + 'cid' => 'od', 'class_name' => 'ilObjMediaCastSettingsGUI', 'class_path' => './components/ILIAS/MediaCast/classes/class.ilObjMediaCastSettingsGUI.php', 'children' => @@ -7000,9 +7071,9 @@ ), 'ilobjmediaobjectgui' => array ( - 'cid' => 'o8', + 'cid' => 'oe', 'class_name' => 'ilObjMediaObjectGUI', - 'class_path' => './Services/MediaObjects/classes/class.ilObjMediaObjectGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectGUI.php', 'children' => array ( 0 => 'ilobjectmetadatagui', @@ -7019,9 +7090,9 @@ ), 'ilobjmediaobjectssettingsgui' => array ( - 'cid' => 'o9', + 'cid' => 'of', 'class_name' => 'ilObjMediaObjectsSettingsGUI', - 'class_path' => './Services/MediaObjects/classes/class.ilObjMediaObjectsSettingsGUI.php', + 'class_path' => './components/ILIAS/MediaObjects/classes/class.ilObjMediaObjectsSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7033,7 +7104,7 @@ ), 'ilobjmediapoolgui' => array ( - 'cid' => 'oa', + 'cid' => 'og', 'class_name' => 'ilObjMediaPoolGUI', 'class_path' => './components/ILIAS/MediaPool/classes/class.ilObjMediaPoolGUI.php', 'children' => @@ -7064,9 +7135,9 @@ ), 'ilobjnewssettingsgui' => array ( - 'cid' => 'od', + 'cid' => 'oj', 'class_name' => 'ilObjNewsSettingsGUI', - 'class_path' => './Services/News/classes/class.ilObjNewsSettingsGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilObjNewsSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7078,9 +7149,9 @@ ), 'ilobjnotessettingsgui' => array ( - 'cid' => 'oe', + 'cid' => 'ok', 'class_name' => 'ilObjNotesSettingsGUI', - 'class_path' => './Services/Notes/Administration/classes/class.ilObjNotesSettingsGUI.php', + 'class_path' => './components/ILIAS/Notes/Administration/classes/class.ilObjNotesSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7092,9 +7163,9 @@ ), 'ilobjnotificationadmingui' => array ( - 'cid' => 'of', + 'cid' => 'ol', 'class_name' => 'ilObjNotificationAdminGUI', - 'class_path' => './Services/Notifications/classes/class.ilObjNotificationAdminGUI.php', + 'class_path' => './components/ILIAS/Notifications/classes/class.ilObjNotificationAdminGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7106,9 +7177,9 @@ ), 'ilobjnotificationsettingsgui' => array ( - 'cid' => 'og', + 'cid' => 'om', 'class_name' => 'ilObjNotificationSettingsGUI', - 'class_path' => './Services/Notification/classes/class.ilObjNotificationSettingsGUI.php', + 'class_path' => './components/ILIAS/Notification/classes/class.ilObjNotificationSettingsGUI.php', 'children' => array ( ), @@ -7120,9 +7191,9 @@ ), 'ilobjobjectfoldergui' => array ( - 'cid' => 'oh', + 'cid' => 'on', 'class_name' => 'ilObjObjectFolderGUI', - 'class_path' => './Services/Object/classes/class.ilObjObjectFolderGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjObjectFolderGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7134,9 +7205,9 @@ ), 'ilobjobjecttemplateadministrationgui' => array ( - 'cid' => 'oi', + 'cid' => 'oo', 'class_name' => 'ilObjObjectTemplateAdministrationGUI', - 'class_path' => './Services/DidacticTemplate/classes/class.ilObjObjectTemplateAdministrationGUI.php', + 'class_path' => './components/ILIAS/DidacticTemplate/classes/class.ilObjObjectTemplateAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7149,7 +7220,7 @@ ), 'ilobjorgunitgui' => array ( - 'cid' => 'oj', + 'cid' => 'op', 'class_name' => 'ilObjOrgUnitGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/class.ilObjOrgUnitGUI.php', 'children' => @@ -7187,9 +7258,9 @@ ), 'ilobjpersonalworkspacesettingsgui' => array ( - 'cid' => 'on', + 'cid' => 'ot', 'class_name' => 'ilObjPersonalWorkspaceSettingsGUI', - 'class_path' => './Services/PersonalWorkspace/Administration/classes/class.ilObjPersonalWorkspaceSettingsGUI.php', + 'class_path' => './components/ILIAS/PersonalWorkspace/Administration/classes/class.ilObjPersonalWorkspaceSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7201,9 +7272,9 @@ ), 'ilobjplugindispatchgui' => array ( - 'cid' => 'oo', + 'cid' => 'ou', 'class_name' => 'ilObjPluginDispatchGUI', - 'class_path' => './Services/Repository/PluginSlot/class.ilObjPluginDispatchGUI.php', + 'class_path' => './components/ILIAS/Repository/PluginSlot/class.ilObjPluginDispatchGUI.php', 'children' => array ( 0 => 'ilobjorgunitgui', @@ -7214,7 +7285,7 @@ ), 'ilobjpollgui' => array ( - 'cid' => 'op', + 'cid' => 'ov', 'class_name' => 'ilObjPollGUI', 'class_path' => './components/ILIAS/Poll/classes/class.ilObjPollGUI.php', 'children' => @@ -7234,7 +7305,7 @@ ), 'ilobjportfolioadministrationgui' => array ( - 'cid' => 'or', + 'cid' => 'ox', 'class_name' => 'ilObjPortfolioAdministrationGUI', 'class_path' => './components/ILIAS/Portfolio/Administration/class.ilObjPortfolioAdministrationGUI.php', 'children' => @@ -7249,7 +7320,7 @@ ), 'ilobjportfoliogui' => array ( - 'cid' => 'ot', + 'cid' => 'oz', 'class_name' => 'ilObjPortfolioGUI', 'class_path' => './components/ILIAS/Portfolio/classes/class.ilObjPortfolioGUI.php', 'children' => @@ -7271,7 +7342,7 @@ ), 'ilobjportfoliotemplategui' => array ( - 'cid' => 'ou', + 'cid' => 'p0', 'class_name' => 'ilObjPortfolioTemplateGUI', 'class_path' => './components/ILIAS/Portfolio/Template/class.ilObjPortfolioTemplateGUI.php', 'children' => @@ -7295,9 +7366,9 @@ ), 'ilobjprivacysecuritygui' => array ( - 'cid' => 'ow', + 'cid' => 'p2', 'class_name' => 'ilObjPrivacySecurityGUI', - 'class_path' => './Services/PrivacySecurity/classes/class.ilObjPrivacySecurityGUI.php', + 'class_path' => './components/ILIAS/PrivacySecurity/classes/class.ilObjPrivacySecurityGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7309,7 +7380,7 @@ ), 'ilobjquestionpoolgui' => array ( - 'cid' => 'ox', + 'cid' => 'p3', 'class_name' => 'ilObjQuestionPoolGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolGUI.php', 'children' => @@ -7358,7 +7429,7 @@ ), 'ilobjquestionpoolsettingsgeneralgui' => array ( - 'cid' => 'oz', + 'cid' => 'p5', 'class_name' => 'ilObjQuestionPoolSettingsGeneralGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilObjQuestionPoolSettingsGeneralGUI.php', 'children' => @@ -7372,9 +7443,9 @@ ), 'ilobjrecoveryfoldergui' => array ( - 'cid' => 'p0', + 'cid' => 'p6', 'class_name' => 'ilObjRecoveryFolderGUI', - 'class_path' => './Services/Administration/classes/class.ilObjRecoveryFolderGUI.php', + 'class_path' => './components/ILIAS/Administration/classes/class.ilObjRecoveryFolderGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7386,7 +7457,7 @@ ), 'ilobjremotecategorygui' => array ( - 'cid' => 'p2', + 'cid' => 'p8', 'class_name' => 'ilObjRemoteCategoryGUI', 'class_path' => './components/ILIAS/RemoteCategory/classes/class.ilObjRemoteCategoryGUI.php', 'children' => @@ -7404,7 +7475,7 @@ ), 'ilobjremotecoursegui' => array ( - 'cid' => 'p4', + 'cid' => 'pa', 'class_name' => 'ilObjRemoteCourseGUI', 'class_path' => './components/ILIAS/RemoteCourse/classes/class.ilObjRemoteCourseGUI.php', 'children' => @@ -7422,7 +7493,7 @@ ), 'ilobjremotefilegui' => array ( - 'cid' => 'p6', + 'cid' => 'pc', 'class_name' => 'ilObjRemoteFileGUI', 'class_path' => './components/ILIAS/RemoteFile/classes/class.ilObjRemoteFileGUI.php', 'children' => @@ -7440,7 +7511,7 @@ ), 'ilobjremoteglossarygui' => array ( - 'cid' => 'p8', + 'cid' => 'pe', 'class_name' => 'ilObjRemoteGlossaryGUI', 'class_path' => './components/ILIAS/RemoteGlossary/classes/class.ilObjRemoteGlossaryGUI.php', 'children' => @@ -7458,7 +7529,7 @@ ), 'ilobjremotegroupgui' => array ( - 'cid' => 'pa', + 'cid' => 'pg', 'class_name' => 'ilObjRemoteGroupGUI', 'class_path' => './components/ILIAS/RemoteGroup/classes/class.ilObjRemoteGroupGUI.php', 'children' => @@ -7476,7 +7547,7 @@ ), 'ilobjremotelearningmodulegui' => array ( - 'cid' => 'pc', + 'cid' => 'pi', 'class_name' => 'ilObjRemoteLearningModuleGUI', 'class_path' => './components/ILIAS/RemoteLearningModule/classes/class.ilObjRemoteLearningModuleGUI.php', 'children' => @@ -7494,7 +7565,7 @@ ), 'ilobjremotetestgui' => array ( - 'cid' => 'pe', + 'cid' => 'pk', 'class_name' => 'ilObjRemoteTestGUI', 'class_path' => './components/ILIAS/RemoteTest/classes/class.ilObjRemoteTestGUI.php', 'children' => @@ -7512,7 +7583,7 @@ ), 'ilobjremotewikigui' => array ( - 'cid' => 'pg', + 'cid' => 'pm', 'class_name' => 'ilObjRemoteWikiGUI', 'class_path' => './components/ILIAS/RemoteWiki/classes/class.ilObjRemoteWikiGUI.php', 'children' => @@ -7530,9 +7601,9 @@ ), 'ilobjrepositorysettingsgui' => array ( - 'cid' => 'pi', + 'cid' => 'po', 'class_name' => 'ilObjRepositorySettingsGUI', - 'class_path' => './Services/Repository/Administration/class.ilObjRepositorySettingsGUI.php', + 'class_path' => './components/ILIAS/Repository/Administration/class.ilObjRepositorySettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7544,9 +7615,9 @@ ), 'ilobjrolefoldergui' => array ( - 'cid' => 'pj', + 'cid' => 'pp', 'class_name' => 'ilObjRoleFolderGUI', - 'class_path' => './Services/AccessControl/classes/class.ilObjRoleFolderGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilObjRoleFolderGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7559,9 +7630,9 @@ ), 'ilobjrolegui' => array ( - 'cid' => 'pk', + 'cid' => 'pq', 'class_name' => 'ilObjRoleGUI', - 'class_path' => './Services/AccessControl/classes/class.ilObjRoleGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilObjRoleGUI.php', 'children' => array ( 0 => 'ilrepositorysearchgui', @@ -7577,9 +7648,9 @@ ), 'ilobjroletemplategui' => array ( - 'cid' => 'pl', + 'cid' => 'pr', 'class_name' => 'ilObjRoleTemplateGUI', - 'class_path' => './Services/AccessControl/classes/class.ilObjRoleTemplateGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilObjRoleTemplateGUI.php', 'children' => array ( ), @@ -7590,7 +7661,7 @@ ), 'ilobjrootfoldergui' => array ( - 'cid' => 'pn', + 'cid' => 'pt', 'class_name' => 'ilObjRootFolderGUI', 'class_path' => './components/ILIAS/RootFolder/classes/class.ilObjRootFolderGUI.php', 'children' => @@ -7617,7 +7688,7 @@ ), 'ilobjsahslearningmodulegui' => array ( - 'cid' => 'pp', + 'cid' => 'pv', 'class_name' => 'ilObjSAHSLearningModuleGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilObjSAHSLearningModuleGUI.php', 'children' => @@ -7641,7 +7712,7 @@ ), 'ilobjscorm2004learningmodulegui' => array ( - 'cid' => 'pr', + 'cid' => 'px', 'class_name' => 'ilObjSCORM2004LearningModuleGUI', 'class_path' => './components/ILIAS/Scorm2004/classes/class.ilObjSCORM2004LearningModuleGUI.php', 'children' => @@ -7669,7 +7740,7 @@ ), 'ilobjscormlearningmodulegui' => array ( - 'cid' => 'ps', + 'cid' => 'py', 'class_name' => 'ilObjSCORMLearningModuleGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilObjSCORMLearningModuleGUI.php', 'children' => @@ -7693,7 +7764,7 @@ ), 'ilobjscormverificationgui' => array ( - 'cid' => 'pt', + 'cid' => 'pz', 'class_name' => 'ilObjSCORMVerificationGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/Verification/class.ilObjSCORMVerificationGUI.php', 'children' => @@ -7707,9 +7778,9 @@ ), 'ilobjsearchlucenesettingsformgui' => array ( - 'cid' => 'pv', + 'cid' => 'q1', 'class_name' => 'ilObjSearchLuceneSettingsFormGUI', - 'class_path' => './Services/Search/classes/ObjGUI/class.ilObjSearchLuceneSettingsFormGUI.php', + 'class_path' => './components/ILIAS/Search/classes/ObjGUI/class.ilObjSearchLuceneSettingsFormGUI.php', 'children' => array ( ), @@ -7720,9 +7791,9 @@ ), 'ilobjsearchsettingsformgui' => array ( - 'cid' => 'pw', + 'cid' => 'q2', 'class_name' => 'ilObjSearchSettingsFormGUI', - 'class_path' => './Services/Search/classes/ObjGUI/class.ilObjSearchSettingsFormGUI.php', + 'class_path' => './components/ILIAS/Search/classes/ObjGUI/class.ilObjSearchSettingsFormGUI.php', 'children' => array ( ), @@ -7733,9 +7804,9 @@ ), 'ilobjsearchsettingsgui' => array ( - 'cid' => 'px', + 'cid' => 'q3', 'class_name' => 'ilObjSearchSettingsGUI', - 'class_path' => './Services/Search/classes/ObjGUI/class.ilObjSearchSettingsGUI.php', + 'class_path' => './components/ILIAS/Search/classes/ObjGUI/class.ilObjSearchSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7749,7 +7820,7 @@ ), 'ilobjsessiongui' => array ( - 'cid' => 'py', + 'cid' => 'q4', 'class_name' => 'ilObjSessionGUI', 'class_path' => './components/ILIAS/Session/classes/class.ilObjSessionGUI.php', 'children' => @@ -7774,9 +7845,9 @@ ), 'ilobjskillmanagementgui' => array ( - 'cid' => 'q0', + 'cid' => 'q6', 'class_name' => 'ilObjSkillManagementGUI', - 'class_path' => './Services/Skill/classes/class.ilObjSkillManagementGUI.php', + 'class_path' => './components/ILIAS/Skill/classes/class.ilObjSkillManagementGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7795,9 +7866,9 @@ ), 'ilobjskilltreegui' => array ( - 'cid' => 'q1', + 'cid' => 'q7', 'class_name' => 'ilObjSkillTreeGUI', - 'class_path' => './Services/Skill/Tree/class.ilObjSkillTreeGUI.php', + 'class_path' => './components/ILIAS/Skill/Tree/class.ilObjSkillTreeGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7818,7 +7889,7 @@ ), 'ilobjstudyprogrammeadmingui' => array ( - 'cid' => 'q2', + 'cid' => 'q8', 'class_name' => 'ilObjStudyProgrammeAdminGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAdminGUI.php', 'children' => @@ -7833,7 +7904,7 @@ ), 'ilobjstudyprogrammeautocategoriesgui' => array ( - 'cid' => 'q3', + 'cid' => 'q9', 'class_name' => 'ilObjStudyProgrammeAutoCategoriesGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoCategoriesGUI.php', 'children' => @@ -7847,7 +7918,7 @@ ), 'ilobjstudyprogrammeautomembershipsgui' => array ( - 'cid' => 'q4', + 'cid' => 'qa', 'class_name' => 'ilObjStudyProgrammeAutoMembershipsGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeAutoMembershipsGUI.php', 'children' => @@ -7862,7 +7933,7 @@ ), 'ilobjstudyprogrammegui' => array ( - 'cid' => 'q5', + 'cid' => 'qb', 'class_name' => 'ilObjStudyProgrammeGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeGUI.php', 'children' => @@ -7895,7 +7966,7 @@ ), 'ilobjstudyprogrammeindividualplangui' => array ( - 'cid' => 'q6', + 'cid' => 'qc', 'class_name' => 'ilObjStudyProgrammeIndividualPlanGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeIndividualPlanGUI.php', 'children' => @@ -7908,7 +7979,7 @@ ), 'ilobjstudyprogrammemembersgui' => array ( - 'cid' => 'q8', + 'cid' => 'qe', 'class_name' => 'ilObjStudyProgrammeMembersGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeMembersGUI.php', 'children' => @@ -7928,7 +7999,7 @@ ), 'ilobjstudyprogrammereferencegui' => array ( - 'cid' => 'q9', + 'cid' => 'qf', 'class_name' => 'ilObjStudyProgrammeReferenceGUI', 'class_path' => './components/ILIAS/StudyProgrammeReference/classes/class.ilObjStudyProgrammeReferenceGUI.php', 'children' => @@ -7944,7 +8015,7 @@ ), 'ilobjstudyprogrammesettingsgui' => array ( - 'cid' => 'qb', + 'cid' => 'qh', 'class_name' => 'ilObjStudyProgrammeSettingsGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeSettingsGUI.php', 'children' => @@ -7958,7 +8029,7 @@ ), 'ilobjstudyprogrammetreegui' => array ( - 'cid' => 'qd', + 'cid' => 'qj', 'class_name' => 'ilObjStudyProgrammeTreeGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilObjStudyProgrammeTreeGUI.php', 'children' => @@ -7971,9 +8042,9 @@ ), 'ilobjstylesettingsgui' => array ( - 'cid' => 'qe', + 'cid' => 'qk', 'class_name' => 'ilObjStyleSettingsGUI', - 'class_path' => './Services/Style/classes/class.ilObjStyleSettingsGUI.php', + 'class_path' => './components/ILIAS/Style/classes/class.ilObjStyleSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -7988,9 +8059,9 @@ ), 'ilobjstylesheetgui' => array ( - 'cid' => 'qf', + 'cid' => 'ql', 'class_name' => 'ilObjStyleSheetGUI', - 'class_path' => './Services/Style/Content/classes/class.ilObjStyleSheetGUI.php', + 'class_path' => './components/ILIAS/Style/Content/classes/class.ilObjStyleSheetGUI.php', 'children' => array ( 0 => 'ilexportgui', @@ -8009,7 +8080,7 @@ ), 'ilobjsurveyadministrationgui' => array ( - 'cid' => 'qh', + 'cid' => 'qn', 'class_name' => 'ilObjSurveyAdministrationGUI', 'class_path' => './components/ILIAS/Survey/Administration/class.ilObjSurveyAdministrationGUI.php', 'children' => @@ -8023,7 +8094,7 @@ ), 'ilobjsurveygui' => array ( - 'cid' => 'qi', + 'cid' => 'qo', 'class_name' => 'ilObjSurveyGUI', 'class_path' => './components/ILIAS/Survey/classes/class.ilObjSurveyGUI.php', 'children' => @@ -8053,7 +8124,7 @@ ), 'ilobjsurveyquestionpoolgui' => array ( - 'cid' => 'qk', + 'cid' => 'qq', 'class_name' => 'ilObjSurveyQuestionPoolGUI', 'class_path' => './components/ILIAS/SurveyQuestionPool/classes/class.ilObjSurveyQuestionPoolGUI.php', 'children' => @@ -8077,9 +8148,9 @@ ), 'ilobjsystemcheckgui' => array ( - 'cid' => 'qm', + 'cid' => 'qs', 'class_name' => 'ilObjSystemCheckGUI', - 'class_path' => './Services/SystemCheck/classes/class.ilObjSystemCheckGUI.php', + 'class_path' => './components/ILIAS/SystemCheck/classes/class.ilObjSystemCheckGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8094,7 +8165,7 @@ ), 'ilobjsystemfoldergui' => array ( - 'cid' => 'qn', + 'cid' => 'qt', 'class_name' => 'ilObjSystemFolderGUI', 'class_path' => './components/ILIAS/SystemFolder/classes/class.ilObjSystemFolderGUI.php', 'children' => @@ -8111,9 +8182,9 @@ ), 'ilobjtaggingsettingsgui' => array ( - 'cid' => 'qo', + 'cid' => 'qu', 'class_name' => 'ilObjTaggingSettingsGUI', - 'class_path' => './Services/Tagging/classes/class.ilObjTaggingSettingsGUI.php', + 'class_path' => './components/ILIAS/Tagging/classes/class.ilObjTaggingSettingsGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8125,7 +8196,7 @@ ), 'ilobjtalktemplateadministrationgui' => array ( - 'cid' => 'qp', + 'cid' => 'qv', 'class_name' => 'ilObjTalkTemplateAdministrationGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/class.ilObjTalkTemplateAdministrationGUI.php', 'children' => @@ -8147,7 +8218,7 @@ ), 'ilobjtalktemplateadministrationlistgui' => array ( - 'cid' => 'qq', + 'cid' => 'qw', 'class_name' => 'ilObjTalkTemplateAdministrationListGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/class.ilObjTalkTemplateAdministrationListGUI.php', 'children' => @@ -8161,7 +8232,7 @@ ), 'ilobjtalktemplategui' => array ( - 'cid' => 'qr', + 'cid' => 'qx', 'class_name' => 'ilObjTalkTemplateGUI', 'class_path' => './components/ILIAS/EmployeeTalk/classes/class.ilObjTalkTemplateGUI.php', 'children' => @@ -8181,9 +8252,9 @@ ), 'ilobjtaxonomyadministrationgui' => array ( - 'cid' => 'qt', + 'cid' => 'qz', 'class_name' => 'ilObjTaxonomyAdministrationGUI', - 'class_path' => './Services/Taxonomy/classes/class.ilObjTaxonomyAdministrationGUI.php', + 'class_path' => './components/ILIAS/Taxonomy/classes/class.ilObjTaxonomyAdministrationGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8195,9 +8266,9 @@ ), 'ilobjtaxonomygui' => array ( - 'cid' => 'qu', + 'cid' => 'r0', 'class_name' => 'ilObjTaxonomyGUI', - 'class_path' => './Services/Taxonomy/classes/class.ilObjTaxonomyGUI.php', + 'class_path' => './components/ILIAS/Taxonomy/classes/class.ilObjTaxonomyGUI.php', 'children' => array ( 0 => 'ilobjtaxonomygui', @@ -8211,9 +8282,9 @@ ), 'ilobjtermsofservicegui' => array ( - 'cid' => 'qv', + 'cid' => 'r1', 'class_name' => 'ilObjTermsOfServiceGUI', - 'class_path' => './Services/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php', + 'class_path' => './components/ILIAS/TermsOfService/classes/class.ilObjTermsOfServiceGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8226,7 +8297,7 @@ ), 'ilobjtestgui' => array ( - 'cid' => 'qw', + 'cid' => 'r2', 'class_name' => 'ilObjTestGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilObjTestGUI.php', 'children' => @@ -8301,7 +8372,7 @@ ), 'ilobjtestsettingsmaingui' => array ( - 'cid' => 'qy', + 'cid' => 'r4', 'class_name' => 'ilObjTestSettingsMainGUI', 'class_path' => './components/ILIAS/Test/classes/MainSettings/class.ilObjTestSettingsMainGUI.php', 'children' => @@ -8317,7 +8388,7 @@ ), 'ilobjtestsettingsscoringresultsgui' => array ( - 'cid' => 'qz', + 'cid' => 'r5', 'class_name' => 'ilObjTestSettingsScoringResultsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilObjTestSettingsScoringResultsGUI.php', 'children' => @@ -8332,7 +8403,7 @@ ), 'ilobjtestverificationgui' => array ( - 'cid' => 'r0', + 'cid' => 'r6', 'class_name' => 'ilObjTestVerificationGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilObjTestVerificationGUI.php', 'children' => @@ -8347,9 +8418,9 @@ ), 'ilobjuserfoldergui' => array ( - 'cid' => 'r3', + 'cid' => 'r9', 'class_name' => 'ilObjUserFolderGUI', - 'class_path' => './Services/User/classes/class.ilObjUserFolderGUI.php', + 'class_path' => './components/ILIAS/User/classes/class.ilObjUserFolderGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8368,9 +8439,9 @@ ), 'ilobjusergui' => array ( - 'cid' => 'r4', + 'cid' => 'ra', 'class_name' => 'ilObjUserGUI', - 'class_path' => './Services/User/classes/class.ilObjUserGUI.php', + 'class_path' => './components/ILIAS/User/classes/class.ilObjUserGUI.php', 'children' => array ( 0 => 'illearningprogressgui', @@ -8389,9 +8460,9 @@ ), 'ilobjusertrackinggui' => array ( - 'cid' => 'r5', + 'cid' => 'rb', 'class_name' => 'ilObjUserTrackingGUI', - 'class_path' => './Services/Tracking/classes/class.ilObjUserTrackingGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/class.ilObjUserTrackingGUI.php', 'children' => array ( 0 => 'illearningprogressgui', @@ -8406,9 +8477,9 @@ ), 'ilobjwebdavgui' => array ( - 'cid' => 'r6', + 'cid' => 'rc', 'class_name' => 'ilObjWebDAVGUI', - 'class_path' => './Services/WebDAV/classes/class.ilObjWebDAVGUI.php', + 'class_path' => './components/ILIAS/WebDAV/classes/class.ilObjWebDAVGUI.php', 'children' => array ( 0 => 'ilpermissiongui', @@ -8421,7 +8492,7 @@ ), 'ilobjwebresourceadministrationgui' => array ( - 'cid' => 'r7', + 'cid' => 'rd', 'class_name' => 'ilObjWebResourceAdministrationGUI', 'class_path' => './components/ILIAS/WebResource/classes/class.ilObjWebResourceAdministrationGUI.php', 'children' => @@ -8435,7 +8506,7 @@ ), 'ilobjwikigui' => array ( - 'cid' => 'r8', + 'cid' => 're', 'class_name' => 'ilObjWikiGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilObjWikiGUI.php', 'children' => @@ -8467,7 +8538,7 @@ ), 'ilobjwikisettingsgui' => array ( - 'cid' => 'rb', + 'cid' => 'rh', 'class_name' => 'ilObjWikiSettingsGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilObjWikiSettingsGUI.php', 'children' => @@ -8481,7 +8552,7 @@ ), 'ilobjworkspacefoldergui' => array ( - 'cid' => 'rd', + 'cid' => 'rj', 'class_name' => 'ilObjWorkspaceFolderGUI', 'class_path' => './components/ILIAS/WorkspaceFolder/classes/class.ilObjWorkspaceFolderGUI.php', 'children' => @@ -8496,7 +8567,7 @@ ), 'ilobjworkspacerootfoldergui' => array ( - 'cid' => 'rg', + 'cid' => 'rm', 'class_name' => 'ilObjWorkspaceRootFolderGUI', 'class_path' => './components/ILIAS/WorkspaceRootFolder/classes/class.ilObjWorkspaceRootFolderGUI.php', 'children' => @@ -8511,9 +8582,9 @@ ), 'ilobjectactivationgui' => array ( - 'cid' => 'rj', + 'cid' => 'rp', 'class_name' => 'ilObjectActivationGUI', - 'class_path' => './Services/Object/classes/class.ilObjectActivationGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectActivationGUI.php', 'children' => array ( 0 => 'ilconditionhandlergui', @@ -8525,9 +8596,9 @@ ), 'ilobjectcontentstylesettingsgui' => array ( - 'cid' => 'rn', + 'cid' => 'rt', 'class_name' => 'ilObjectContentStyleSettingsGUI', - 'class_path' => './Services/Style/Content/Object/class.ilObjectContentStyleSettingsGUI.php', + 'class_path' => './components/ILIAS/Style/Content/Object/class.ilObjectContentStyleSettingsGUI.php', 'children' => array ( 0 => 'ilobjstylesheetgui', @@ -8554,9 +8625,9 @@ ), 'ilobjectcopygui' => array ( - 'cid' => 'rp', + 'cid' => 'rv', 'class_name' => 'ilObjectCopyGUI', - 'class_path' => './Services/Object/classes/class.ilObjectCopyGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectCopyGUI.php', 'children' => array ( ), @@ -8614,9 +8685,9 @@ ), 'ilobjectcustomiconuploadhandlergui' => array ( - 'cid' => 'ru', + 'cid' => 's0', 'class_name' => 'ilObjectCustomIconUploadHandlerGUI', - 'class_path' => './Services/Object/classes/Properties/AdditionalProperties/Icon/class.ilObjectCustomIconUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/Object/classes/Properties/AdditionalProperties/Icon/class.ilObjectCustomIconUploadHandlerGUI.php', 'children' => array ( ), @@ -8626,9 +8697,9 @@ ), 'ilobjectcustomuserfieldsgui' => array ( - 'cid' => 'rv', + 'cid' => 's1', 'class_name' => 'ilObjectCustomUserFieldsGUI', - 'class_path' => './Services/Membership/classes/class.ilObjectCustomUserFieldsGUI.php', + 'class_path' => './components/ILIAS/Membership/classes/class.ilObjectCustomUserFieldsGUI.php', 'children' => array ( ), @@ -8643,9 +8714,9 @@ ), 'ilobjectgui' => array ( - 'cid' => 'rx', + 'cid' => 's3', 'class_name' => 'ilObjectGUI', - 'class_path' => './Services/Object/classes/class.ilObjectGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectGUI.php', 'children' => array ( ), @@ -8659,9 +8730,9 @@ ), 'ilobjectmetadatablockgui' => array ( - 'cid' => 'rz', + 'cid' => 's5', 'class_name' => 'ilObjectMetaDataBlockGUI', - 'class_path' => './Services/Object/classes/class.ilObjectMetaDataBlockGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectMetaDataBlockGUI.php', 'children' => array ( ), @@ -8672,9 +8743,9 @@ ), 'ilobjectmetadatagui' => array ( - 'cid' => 's0', + 'cid' => 's6', 'class_name' => 'ilObjectMetaDataGUI', - 'class_path' => './Services/Object/classes/class.ilObjectMetaDataGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectMetaDataGUI.php', 'children' => array ( 0 => 'ilmdeditorgui', @@ -8723,9 +8794,9 @@ ), 'ilobjectownershipmanagementgui' => array ( - 'cid' => 's1', + 'cid' => 's7', 'class_name' => 'ilObjectOwnershipManagementGUI', - 'class_path' => './Services/Object/classes/class.ilObjectOwnershipManagementGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectOwnershipManagementGUI.php', 'children' => array ( ), @@ -8740,9 +8811,9 @@ ), 'ilobjectpermissionstatusgui' => array ( - 'cid' => 's3', + 'cid' => 's9', 'class_name' => 'ilObjectPermissionStatusGUI', - 'class_path' => './Services/AccessControl/classes/class.ilObjectPermissionStatusGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilObjectPermissionStatusGUI.php', 'children' => array ( 0 => 'ilrepositorysearchgui', @@ -8754,9 +8825,9 @@ ), 'ilobjectservicesettingsgui' => array ( - 'cid' => 's9', + 'cid' => 'sf', 'class_name' => 'ilObjectServiceSettingsGUI', - 'class_path' => './Services/Object/classes/class.ilObjectServiceSettingsGUI.php', + 'class_path' => './components/ILIAS/Object/classes/class.ilObjectServiceSettingsGUI.php', 'children' => array ( ), @@ -8768,9 +8839,9 @@ ), 'ilobjecttileimageuploadhandlergui' => array ( - 'cid' => 'sc', + 'cid' => 'si', 'class_name' => 'ilObjectTileImageUploadHandlerGUI', - 'class_path' => './Services/Object/classes/Properties/CoreProperties/TileImage/class.ilObjectTileImageUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/Object/classes/Properties/CoreProperties/TileImage/class.ilObjectTileImageUploadHandlerGUI.php', 'children' => array ( ), @@ -8780,9 +8851,9 @@ ), 'ilobjecttranslationgui' => array ( - 'cid' => 'se', + 'cid' => 'sk', 'class_name' => 'ilObjectTranslationGUI', - 'class_path' => './Services/Object/classes/Translation/class.ilObjectTranslationGUI.php', + 'class_path' => './components/ILIAS/Object/classes/Translation/class.ilObjectTranslationGUI.php', 'children' => array ( ), @@ -8804,9 +8875,9 @@ ), 'ilonscreenchatgui' => array ( - 'cid' => 'sg', + 'cid' => 'sm', 'class_name' => 'ilOnScreenChatGUI', - 'class_path' => './Services/OnScreenChat/classes/class.ilOnScreenChatGUI.php', + 'class_path' => './components/ILIAS/OnScreenChat/classes/class.ilOnScreenChatGUI.php', 'children' => array ( ), @@ -8816,9 +8887,9 @@ ), 'ilopenidconnectsettingsgui' => array ( - 'cid' => 'sh', + 'cid' => 'sn', 'class_name' => 'ilOpenIdConnectSettingsGUI', - 'class_path' => './Services/OpenIdConnect/classes/class.ilOpenIdConnectSettingsGUI.php', + 'class_path' => './components/ILIAS/OpenIdConnect/classes/class.ilOpenIdConnectSettingsGUI.php', 'children' => array ( ), @@ -8829,7 +8900,7 @@ ), 'ilorgunitdefaultpermissiongui' => array ( - 'cid' => 'sm', + 'cid' => 'ss', 'class_name' => 'ilOrgUnitDefaultPermissionGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitDefaultPermissionGUI.php', 'children' => @@ -8842,7 +8913,7 @@ ), 'ilorgunitexportgui' => array ( - 'cid' => 'sp', + 'cid' => 'sv', 'class_name' => 'ilOrgUnitExportGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/class.ilOrgUnitExportGUI.php', 'children' => @@ -8855,7 +8926,7 @@ ), 'ilorgunitglobalsettingsgui' => array ( - 'cid' => 'st', + 'cid' => 'sz', 'class_name' => 'ilOrgUnitGlobalSettingsGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Settings/class.ilOrgUnitGlobalSettingsGUI.php', 'children' => @@ -8868,7 +8939,7 @@ ), 'ilorgunitpermissiongui' => array ( - 'cid' => 'sv', + 'cid' => 't1', 'class_name' => 'ilOrgUnitPermissionGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Positions/Permissions/class.ilOrgUnitPermissionGUI.php', 'children' => @@ -8881,7 +8952,7 @@ ), 'ilorgunitpositiongui' => array ( - 'cid' => 'sy', + 'cid' => 't4', 'class_name' => 'ilOrgUnitPositionGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Positions/class.ilOrgUnitPositionGUI.php', 'children' => @@ -8896,7 +8967,7 @@ ), 'ilorgunitsimpleimportgui' => array ( - 'cid' => 't1', + 'cid' => 't7', 'class_name' => 'ilOrgUnitSimpleImportGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/SimpleImport/class.ilOrgUnitSimpleImportGUI.php', 'children' => @@ -8909,7 +8980,7 @@ ), 'ilorgunitsimpleuserimportgui' => array ( - 'cid' => 't2', + 'cid' => 't8', 'class_name' => 'ilOrgUnitSimpleUserImportGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/SimpleUserImport/class.ilOrgUnitSimpleUserImportGUI.php', 'children' => @@ -8922,7 +8993,7 @@ ), 'ilorgunittypegui' => array ( - 'cid' => 't6', + 'cid' => 'tc', 'class_name' => 'ilOrgUnitTypeGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Types/class.ilOrgUnitTypeGUI.php', 'children' => @@ -8935,7 +9006,7 @@ ), 'ilorgunituserassignmentgui' => array ( - 'cid' => 't8', + 'cid' => 'te', 'class_name' => 'ilOrgUnitUserAssignmentGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Positions/UserAssignment/class.ilOrgUnitUserAssignmentGUI.php', 'children' => @@ -8949,7 +9020,7 @@ ), 'ilpcamdformgui' => array ( - 'cid' => 'tb', + 'cid' => 'th', 'class_name' => 'ilPCAMDFormGUI', 'class_path' => './components/ILIAS/Portfolio/Page/class.ilPCAMDFormGUI.php', 'children' => @@ -8963,7 +9034,7 @@ ), 'ilpcamdpagelistgui' => array ( - 'cid' => 'tc', + 'cid' => 'ti', 'class_name' => 'ilPCAMDPageListGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilPCAMDPageListGUI.php', 'children' => @@ -8976,9 +9047,9 @@ ), 'ilpcbloggui' => array ( - 'cid' => 'td', + 'cid' => 'tj', 'class_name' => 'ilPCBlogGUI', - 'class_path' => './Services/COPage/PC/Blog/class.ilPCBlogGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Blog/class.ilPCBlogGUI.php', 'children' => array ( ), @@ -8989,7 +9060,7 @@ ), 'ilpcconsultationhoursgui' => array ( - 'cid' => 'te', + 'cid' => 'tk', 'class_name' => 'ilPCConsultationHoursGUI', 'class_path' => './components/ILIAS/Portfolio/Page/class.ilPCConsultationHoursGUI.php', 'children' => @@ -9002,9 +9073,9 @@ ), 'ilpccontentincludegui' => array ( - 'cid' => 'tf', + 'cid' => 'tl', 'class_name' => 'ilPCContentIncludeGUI', - 'class_path' => './Services/COPage/PC/ContentInclude/class.ilPCContentIncludeGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/ContentInclude/class.ilPCContentIncludeGUI.php', 'children' => array ( ), @@ -9015,9 +9086,9 @@ ), 'ilpccontenttemplategui' => array ( - 'cid' => 'tg', + 'cid' => 'tm', 'class_name' => 'ilPCContentTemplateGUI', - 'class_path' => './Services/COPage/PC/ContentTemplate/class.ilPCContentTemplateGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/ContentTemplate/class.ilPCContentTemplateGUI.php', 'children' => array ( ), @@ -9028,7 +9099,7 @@ ), 'ilpccurriculumgui' => array ( - 'cid' => 'th', + 'cid' => 'tn', 'class_name' => 'ilPCCurriculumGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/PageEditor/class.ilPCCurriculumGUI.php', 'children' => @@ -9041,9 +9112,9 @@ ), 'ilpcdatatablegui' => array ( - 'cid' => 'tj', + 'cid' => 'tp', 'class_name' => 'ilPCDataTableGUI', - 'class_path' => './Services/COPage/PC/Table/class.ilPCDataTableGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Table/class.ilPCDataTableGUI.php', 'children' => array ( ), @@ -9054,9 +9125,9 @@ ), 'ilpcfileitemgui' => array ( - 'cid' => 'tl', + 'cid' => 'tr', 'class_name' => 'ilPCFileItemGUI', - 'class_path' => './Services/COPage/PC/FileList/class.ilPCFileItemGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/FileList/class.ilPCFileItemGUI.php', 'children' => array ( ), @@ -9067,9 +9138,9 @@ ), 'ilpcfilelistgui' => array ( - 'cid' => 'tm', + 'cid' => 'ts', 'class_name' => 'ilPCFileListGUI', - 'class_path' => './Services/COPage/PC/FileList/class.ilPCFileListGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/FileList/class.ilPCFileListGUI.php', 'children' => array ( ), @@ -9080,9 +9151,9 @@ ), 'ilpcgridcellgui' => array ( - 'cid' => 'to', + 'cid' => 'tu', 'class_name' => 'ilPCGridCellGUI', - 'class_path' => './Services/COPage/PC/Grid/class.ilPCGridCellGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Grid/class.ilPCGridCellGUI.php', 'children' => array ( ), @@ -9093,9 +9164,9 @@ ), 'ilpcgridgui' => array ( - 'cid' => 'tr', + 'cid' => 'tx', 'class_name' => 'ilPCGridGUI', - 'class_path' => './Services/COPage/PC/Grid/class.ilPCGridGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Grid/class.ilPCGridGUI.php', 'children' => array ( ), @@ -9106,9 +9177,9 @@ ), 'ilpciimtriggereditorgui' => array ( - 'cid' => 'tu', + 'cid' => 'u0', 'class_name' => 'ilPCIIMTriggerEditorGUI', - 'class_path' => './Services/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/InteractiveImage/class.ilPCIIMTriggerEditorGUI.php', 'children' => array ( 0 => 'ilinternallinkgui', @@ -9120,9 +9191,9 @@ ), 'ilpcimagemapeditorgui' => array ( - 'cid' => 'tw', + 'cid' => 'u2', 'class_name' => 'ilPCImageMapEditorGUI', - 'class_path' => './Services/COPage/PC/MediaObject/class.ilPCImageMapEditorGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/MediaObject/class.ilPCImageMapEditorGUI.php', 'children' => array ( 0 => 'ilinternallinkgui', @@ -9134,9 +9205,9 @@ ), 'ilpcinteractiveimagegui' => array ( - 'cid' => 'ty', + 'cid' => 'u4', 'class_name' => 'ilPCInteractiveImageGUI', - 'class_path' => './Services/COPage/PC/InteractiveImage/class.ilPCInteractiveImageGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/InteractiveImage/class.ilPCInteractiveImageGUI.php', 'children' => array ( 0 => 'ilpciimtriggereditorgui', @@ -9149,7 +9220,7 @@ ), 'ilpclaunchergui' => array ( - 'cid' => 'tz', + 'cid' => 'u5', 'class_name' => 'ilPCLauncherGUI', 'class_path' => './components/ILIAS/LearningSequence/classes/PageEditor/class.ilPCLauncherGUI.php', 'children' => @@ -9162,9 +9233,9 @@ ), 'ilpclayouttemplategui' => array ( - 'cid' => 'u1', + 'cid' => 'u7', 'class_name' => 'ilPCLayoutTemplateGUI', - 'class_path' => './Services/COPage/PC/LayoutTemplate/class.ilPCLayoutTemplateGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/LayoutTemplate/class.ilPCLayoutTemplateGUI.php', 'children' => array ( ), @@ -9175,9 +9246,9 @@ ), 'ilpclearninghistorygui' => array ( - 'cid' => 'u2', + 'cid' => 'u8', 'class_name' => 'ilPCLearningHistoryGUI', - 'class_path' => './Services/LearningHistory/classes/class.ilPCLearningHistoryGUI.php', + 'class_path' => './components/ILIAS/LearningHistory/classes/class.ilPCLearningHistoryGUI.php', 'children' => array ( ), @@ -9188,9 +9259,9 @@ ), 'ilpclistgui' => array ( - 'cid' => 'u3', + 'cid' => 'u9', 'class_name' => 'ilPCListGUI', - 'class_path' => './Services/COPage/PC/List/class.ilPCListGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/List/class.ilPCListGUI.php', 'children' => array ( ), @@ -9201,9 +9272,9 @@ ), 'ilpclistitemgui' => array ( - 'cid' => 'u4', + 'cid' => 'ua', 'class_name' => 'ilPCListItemGUI', - 'class_path' => './Services/COPage/PC/List/class.ilPCListItemGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/List/class.ilPCListItemGUI.php', 'children' => array ( ), @@ -9214,9 +9285,9 @@ ), 'ilpcloginpageelementgui' => array ( - 'cid' => 'u5', + 'cid' => 'ub', 'class_name' => 'ilPCLoginPageElementGUI', - 'class_path' => './Services/COPage/PC/Login/class.ilPCLoginPageElementGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Login/class.ilPCLoginPageElementGUI.php', 'children' => array ( ), @@ -9227,9 +9298,9 @@ ), 'ilpcmapgui' => array ( - 'cid' => 'u6', + 'cid' => 'uc', 'class_name' => 'ilPCMapGUI', - 'class_path' => './Services/COPage/PC/Map/class.ilPCMapGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Map/class.ilPCMapGUI.php', 'children' => array ( ), @@ -9240,9 +9311,9 @@ ), 'ilpcmediaobjectgui' => array ( - 'cid' => 'u8', + 'cid' => 'ue', 'class_name' => 'ilPCMediaObjectGUI', - 'class_path' => './Services/COPage/PC/MediaObject/class.ilPCMediaObjectGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/MediaObject/class.ilPCMediaObjectGUI.php', 'children' => array ( 0 => 'ilobjmediaobjectgui', @@ -9256,7 +9327,7 @@ ), 'ilpcmycoursesgui' => array ( - 'cid' => 'u9', + 'cid' => 'uf', 'class_name' => 'ilPCMyCoursesGUI', 'class_path' => './components/ILIAS/Portfolio/Page/class.ilPCMyCoursesGUI.php', 'children' => @@ -9269,7 +9340,7 @@ ), 'ilpcprgactionnotegui' => array ( - 'cid' => 'ua', + 'cid' => 'ug', 'class_name' => 'ilPCPRGActionNoteGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/PageEditor/class.ilPCPRGActionNoteGUI.php', 'children' => @@ -9282,7 +9353,7 @@ ), 'ilpcprgstatusinfogui' => array ( - 'cid' => 'ub', + 'cid' => 'uh', 'class_name' => 'ilPCPRGStatusInfoGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/PageEditor/class.ilPCPRGStatusInfoGUI.php', 'children' => @@ -9295,9 +9366,9 @@ ), 'ilpcparagraphgui' => array ( - 'cid' => 'ud', + 'cid' => 'uj', 'class_name' => 'ilPCParagraphGUI', - 'class_path' => './Services/COPage/PC/Paragraph/class.ilPCParagraphGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Paragraph/class.ilPCParagraphGUI.php', 'children' => array ( ), @@ -9308,9 +9379,9 @@ ), 'ilpcplaceholdergui' => array ( - 'cid' => 'uf', + 'cid' => 'ul', 'class_name' => 'ilPCPlaceHolderGUI', - 'class_path' => './Services/COPage/PC/PlaceHolder/class.ilPCPlaceHolderGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/PlaceHolder/class.ilPCPlaceHolderGUI.php', 'children' => array ( 0 => 'ilpcmediaobjectgui', @@ -9322,9 +9393,9 @@ ), 'ilpcpluggedgui' => array ( - 'cid' => 'ug', + 'cid' => 'um', 'class_name' => 'ilPCPluggedGUI', - 'class_path' => './Services/COPage/PC/Plugged/class.ilPCPluggedGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Plugged/class.ilPCPluggedGUI.php', 'children' => array ( ), @@ -9335,9 +9406,9 @@ ), 'ilpcprofilegui' => array ( - 'cid' => 'uh', + 'cid' => 'un', 'class_name' => 'ilPCProfileGUI', - 'class_path' => './Services/COPage/PC/Profile/class.ilPCProfileGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Profile/class.ilPCProfileGUI.php', 'children' => array ( ), @@ -9348,9 +9419,9 @@ ), 'ilpcquestiongui' => array ( - 'cid' => 'ui', + 'cid' => 'uo', 'class_name' => 'ilPCQuestionGUI', - 'class_path' => './Services/COPage/PC/Question/class.ilPCQuestionGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Question/class.ilPCQuestionGUI.php', 'children' => array ( ), @@ -9361,9 +9432,9 @@ ), 'ilpcresourcesgui' => array ( - 'cid' => 'uk', + 'cid' => 'uq', 'class_name' => 'ilPCResourcesGUI', - 'class_path' => './Services/COPage/PC/Resources/class.ilPCResourcesGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Resources/class.ilPCResourcesGUI.php', 'children' => array ( ), @@ -9374,9 +9445,9 @@ ), 'ilpcsectiongui' => array ( - 'cid' => 'um', + 'cid' => 'us', 'class_name' => 'ilPCSectionGUI', - 'class_path' => './Services/COPage/PC/Section/class.ilPCSectionGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Section/class.ilPCSectionGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -9388,9 +9459,9 @@ ), 'ilpcskillsgui' => array ( - 'cid' => 'un', + 'cid' => 'ut', 'class_name' => 'ilPCSkillsGUI', - 'class_path' => './Services/COPage/PC/Skills/class.ilPCSkillsGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Skills/class.ilPCSkillsGUI.php', 'children' => array ( ), @@ -9401,9 +9472,9 @@ ), 'ilpcsourcecodegui' => array ( - 'cid' => 'up', + 'cid' => 'uv', 'class_name' => 'ilPCSourceCodeGUI', - 'class_path' => './Services/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/SourceCode/class.ilPCSourceCodeGUI.php', 'children' => array ( 0 => 'ilrepostandarduploadhandlergui', @@ -9415,9 +9486,9 @@ ), 'ilpctabgui' => array ( - 'cid' => 'uq', + 'cid' => 'uw', 'class_name' => 'ilPCTabGUI', - 'class_path' => './Services/COPage/PC/Tabs/class.ilPCTabGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Tabs/class.ilPCTabGUI.php', 'children' => array ( ), @@ -9428,9 +9499,9 @@ ), 'ilpctabledatagui' => array ( - 'cid' => 'ur', + 'cid' => 'ux', 'class_name' => 'ilPCTableDataGUI', - 'class_path' => './Services/COPage/PC/Table/class.ilPCTableDataGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Table/class.ilPCTableDataGUI.php', 'children' => array ( ), @@ -9441,9 +9512,9 @@ ), 'ilpctablegui' => array ( - 'cid' => 'us', + 'cid' => 'uy', 'class_name' => 'ilPCTableGUI', - 'class_path' => './Services/COPage/PC/Table/class.ilPCTableGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Table/class.ilPCTableGUI.php', 'children' => array ( 0 => 'ilassgenfeedbackpagegui', @@ -9455,9 +9526,9 @@ ), 'ilpctabsgui' => array ( - 'cid' => 'uu', + 'cid' => 'v0', 'class_name' => 'ilPCTabsGUI', - 'class_path' => './Services/COPage/PC/Tabs/class.ilPCTabsGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Tabs/class.ilPCTabsGUI.php', 'children' => array ( ), @@ -9468,9 +9539,9 @@ ), 'ilpcverificationgui' => array ( - 'cid' => 'uw', + 'cid' => 'v2', 'class_name' => 'ilPCVerificationGUI', - 'class_path' => './Services/COPage/PC/Verification/class.ilPCVerificationGUI.php', + 'class_path' => './components/ILIAS/COPage/PC/Verification/class.ilPCVerificationGUI.php', 'children' => array ( ), @@ -9481,9 +9552,9 @@ ), 'ilpdcalendarblockgui' => array ( - 'cid' => 'ux', + 'cid' => 'v3', 'class_name' => 'ilPDCalendarBlockGUI', - 'class_path' => './Services/Calendar/classes/class.ilPDCalendarBlockGUI.php', + 'class_path' => './components/ILIAS/Calendar/classes/class.ilPDCalendarBlockGUI.php', 'children' => array ( 0 => 'ilcalendardaygui', @@ -9502,9 +9573,9 @@ ), 'ilpdmailblockgui' => array ( - 'cid' => 'uy', + 'cid' => 'v4', 'class_name' => 'ilPDMailBlockGUI', - 'class_path' => './Services/Mail/classes/class.ilPDMailBlockGUI.php', + 'class_path' => './components/ILIAS/Mail/classes/class.ilPDMailBlockGUI.php', 'children' => array ( ), @@ -9516,9 +9587,9 @@ ), 'ilpdnewsblockgui' => array ( - 'cid' => 'v0', + 'cid' => 'v6', 'class_name' => 'ilPDNewsBlockGUI', - 'class_path' => './Services/News/classes/class.ilPDNewsBlockGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilPDNewsBlockGUI.php', 'children' => array ( ), @@ -9529,9 +9600,9 @@ ), 'ilpdnewsgui' => array ( - 'cid' => 'v1', + 'cid' => 'v7', 'class_name' => 'ilPDNewsGUI', - 'class_path' => './Services/News/classes/class.ilPDNewsGUI.php', + 'class_path' => './components/ILIAS/News/classes/class.ilPDNewsGUI.php', 'children' => array ( 0 => 'ilnewstimelinegui', @@ -9544,9 +9615,9 @@ ), 'ilpdnotesgui' => array ( - 'cid' => 'v3', + 'cid' => 'v9', 'class_name' => 'ilPDNotesGUI', - 'class_path' => './Services/Notes/Note/class.ilPDNotesGUI.php', + 'class_path' => './components/ILIAS/Notes/Note/class.ilPDNotesGUI.php', 'children' => array ( 0 => 'ilnotegui', @@ -9558,7 +9629,7 @@ ), 'ilpdstudyprogrammeexpandablelistgui' => array ( - 'cid' => 'v4', + 'cid' => 'va', 'class_name' => 'ilPDStudyProgrammeExpandableListGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilPDStudyProgrammeExpandableListGUI.php', 'children' => @@ -9571,7 +9642,7 @@ ), 'ilpdstudyprogrammesimplelistgui' => array ( - 'cid' => 'v5', + 'cid' => 'vb', 'class_name' => 'ilPDStudyProgrammeSimpleListGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilPDStudyProgrammeSimpleListGUI.php', 'children' => @@ -9584,9 +9655,9 @@ ), 'ilpdtasksblockgui' => array ( - 'cid' => 'v6', + 'cid' => 'vc', 'class_name' => 'ilPDTasksBlockGUI', - 'class_path' => './Services/Tasks/classes/class.ilPDTasksBlockGUI.php', + 'class_path' => './components/ILIAS/Tasks/classes/class.ilPDTasksBlockGUI.php', 'children' => array ( ), @@ -9597,7 +9668,7 @@ ), 'ilprgmembersexportgui' => array ( - 'cid' => 'v7', + 'cid' => 'vd', 'class_name' => 'ilPRGMembersExportGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/memberexport/class.ilPRGMembersExportGUI.php', 'children' => @@ -9610,7 +9681,7 @@ ), 'ilprgpageobjectgui' => array ( - 'cid' => 'v8', + 'cid' => 've', 'class_name' => 'ilPRGPageObjectGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/PageEditor/class.ilPRGPageObjectGUI.php', 'children' => @@ -9625,9 +9696,9 @@ ), 'ilpageeditorgui' => array ( - 'cid' => 'vb', + 'cid' => 'vh', 'class_name' => 'ilPageEditorGUI', - 'class_path' => './Services/COPage/classes/class.ilPageEditorGUI.php', + 'class_path' => './components/ILIAS/COPage/classes/class.ilPageEditorGUI.php', 'children' => array ( 0 => 'ilpcparagraphgui', @@ -9707,9 +9778,9 @@ ), 'ilpageeditorserveradaptergui' => array ( - 'cid' => 'vc', + 'cid' => 'vi', 'class_name' => 'ilPageEditorServerAdapterGUI', - 'class_path' => './Services/COPage/Editor/class.ilPageEditorServerAdapterGUI.php', + 'class_path' => './components/ILIAS/COPage/Editor/class.ilPageEditorServerAdapterGUI.php', 'children' => array ( ), @@ -9720,9 +9791,9 @@ ), 'ilpagelayoutadministrationgui' => array ( - 'cid' => 've', + 'cid' => 'vk', 'class_name' => 'ilPageLayoutAdministrationGUI', - 'class_path' => './Services/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php', + 'class_path' => './components/ILIAS/COPage/Layout/Administration/class.ilPageLayoutAdministrationGUI.php', 'children' => array ( 0 => 'ilpagelayoutgui', @@ -9734,9 +9805,9 @@ ), 'ilpagelayoutgui' => array ( - 'cid' => 'vf', + 'cid' => 'vl', 'class_name' => 'ilPageLayoutGUI', - 'class_path' => './Services/COPage/Layout/classes/class.ilPageLayoutGUI.php', + 'class_path' => './components/ILIAS/COPage/Layout/classes/class.ilPageLayoutGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -9751,9 +9822,9 @@ ), 'ilpagemultilanggui' => array ( - 'cid' => 'vh', + 'cid' => 'vn', 'class_name' => 'ilPageMultiLangGUI', - 'class_path' => './Services/COPage/classes/class.ilPageMultiLangGUI.php', + 'class_path' => './components/ILIAS/COPage/classes/class.ilPageMultiLangGUI.php', 'children' => array ( ), @@ -9773,9 +9844,9 @@ ), 'ilpageobjectgui' => array ( - 'cid' => 'vj', + 'cid' => 'vp', 'class_name' => 'ilPageObjectGUI', - 'class_path' => './Services/COPage/classes/class.ilPageObjectGUI.php', + 'class_path' => './components/ILIAS/COPage/classes/class.ilPageObjectGUI.php', 'children' => array ( 0 => 'ilpageeditorgui', @@ -9809,7 +9880,7 @@ ), 'ilparticipantsperassignmenttablegui' => array ( - 'cid' => 'vm', + 'cid' => 'vs', 'class_name' => 'ilParticipantsPerAssignmentTableGUI', 'class_path' => './components/ILIAS/Exercise/classes/class.ilParticipantsPerAssignmentTableGUI.php', 'children' => @@ -9823,7 +9894,7 @@ ), 'ilparticipantstestresultsgui' => array ( - 'cid' => 'vn', + 'cid' => 'vt', 'class_name' => 'ilParticipantsTestResultsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilParticipantsTestResultsGUI.php', 'children' => @@ -9842,9 +9913,9 @@ ), 'ilpasswordassistancegui' => array ( - 'cid' => 'vp', + 'cid' => 'vv', 'class_name' => 'ilPasswordAssistanceGUI', - 'class_path' => './Services/Init/classes/class.ilPasswordAssistanceGUI.php', + 'class_path' => './components/ILIAS/Init/classes/class.ilPasswordAssistanceGUI.php', 'children' => array ( ), @@ -9855,9 +9926,9 @@ ), 'ilpermissiongui' => array ( - 'cid' => 'vu', + 'cid' => 'w0', 'class_name' => 'ilPermissionGUI', - 'class_path' => './Services/AccessControl/classes/class.ilPermissionGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilPermissionGUI.php', 'children' => array ( 0 => 'ilobjrolegui', @@ -9996,9 +10067,9 @@ ), 'ilpersonalprofilegui' => array ( - 'cid' => 'vv', + 'cid' => 'w1', 'class_name' => 'ilPersonalProfileGUI', - 'class_path' => './Services/User/classes/Profile/class.ilPersonalProfileGUI.php', + 'class_path' => './components/ILIAS/User/classes/Profile/class.ilPersonalProfileGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -10013,9 +10084,9 @@ ), 'ilpersonalsettingsgui' => array ( - 'cid' => 'vw', + 'cid' => 'w2', 'class_name' => 'ilPersonalSettingsGUI', - 'class_path' => './Services/User/classes/Settings/class.ilPersonalSettingsGUI.php', + 'class_path' => './components/ILIAS/User/classes/Settings/class.ilPersonalSettingsGUI.php', 'children' => array ( 0 => 'ilmailoptionsgui', @@ -10027,9 +10098,9 @@ ), 'ilpersonalskillsgui' => array ( - 'cid' => 'vz', + 'cid' => 'w5', 'class_name' => 'ilPersonalSkillsGUI', - 'class_path' => './Services/Skill/Personal/class.ilPersonalSkillsGUI.php', + 'class_path' => './components/ILIAS/Skill/Personal/class.ilPersonalSkillsGUI.php', 'children' => array ( ), @@ -10041,9 +10112,9 @@ ), 'ilpersonalworkspacegui' => array ( - 'cid' => 'w0', + 'cid' => 'w6', 'class_name' => 'ilPersonalWorkspaceGUI', - 'class_path' => './Services/PersonalWorkspace/classes/class.ilPersonalWorkspaceGUI.php', + 'class_path' => './components/ILIAS/PersonalWorkspace/classes/class.ilPersonalWorkspaceGUI.php', 'children' => array ( 0 => 'ilobjworkspacerootfoldergui', @@ -10066,7 +10137,7 @@ ), 'ilpollblockgui' => array ( - 'cid' => 'w4', + 'cid' => 'wa', 'class_name' => 'ilPollBlockGUI', 'class_path' => './components/ILIAS/Poll/classes/BlockGUI/class.ilPollBlockGUI.php', 'children' => @@ -10079,7 +10150,7 @@ ), 'ilportfolioexercisegui' => array ( - 'cid' => 'w7', + 'cid' => 'wd', 'class_name' => 'ilPortfolioExerciseGUI', 'class_path' => './components/ILIAS/Portfolio/Exercise/class.ilPortfolioExerciseGUI.php', 'children' => @@ -10093,7 +10164,7 @@ ), 'ilportfoliopagegui' => array ( - 'cid' => 'w8', + 'cid' => 'we', 'class_name' => 'ilPortfolioPageGUI', 'class_path' => './components/ILIAS/Portfolio/Page/class.ilPortfolioPageGUI.php', 'children' => @@ -10117,7 +10188,7 @@ ), 'ilportfoliorepositorygui' => array ( - 'cid' => 'wa', + 'cid' => 'wg', 'class_name' => 'ilPortfolioRepositoryGUI', 'class_path' => './components/ILIAS/Portfolio/classes/class.ilPortfolioRepositoryGUI.php', 'children' => @@ -10132,7 +10203,7 @@ ), 'ilportfolioroleassignmentgui' => array ( - 'cid' => 'wb', + 'cid' => 'wh', 'class_name' => 'ilPortfolioRoleAssignmentGUI', 'class_path' => './components/ILIAS/Portfolio/Administration/class.ilPortfolioRoleAssignmentGUI.php', 'children' => @@ -10146,7 +10217,7 @@ ), 'ilportfoliotemplatepagegui' => array ( - 'cid' => 'we', + 'cid' => 'wk', 'class_name' => 'ilPortfolioTemplatePageGUI', 'class_path' => './components/ILIAS/Portfolio/Template/class.ilPortfolioTemplatePageGUI.php', 'children' => @@ -10165,7 +10236,7 @@ ), 'ilpresentationfullgui' => array ( - 'cid' => 'wf', + 'cid' => 'wl', 'class_name' => 'ilPresentationFullGUI', 'class_path' => './components/ILIAS/Glossary/Presentation/class.ilPresentationFullGUI.php', 'children' => @@ -10178,7 +10249,7 @@ ), 'ilpresentationlisttablegui' => array ( - 'cid' => 'wg', + 'cid' => 'wm', 'class_name' => 'ilPresentationListTableGUI', 'class_path' => './components/ILIAS/Glossary/Presentation/class.ilPresentationListTableGUI.php', 'children' => @@ -10192,9 +10263,9 @@ ), 'ilpropertyformgui' => array ( - 'cid' => 'wi', + 'cid' => 'wo', 'class_name' => 'ilPropertyFormGUI', - 'class_path' => './Services/Form/classes/class.ilPropertyFormGUI.php', + 'class_path' => './components/ILIAS/Form/classes/class.ilPropertyFormGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -10265,9 +10336,9 @@ ), 'ilpublicuserprofilegui' => array ( - 'cid' => 'wl', + 'cid' => 'wr', 'class_name' => 'ilPublicUserProfileGUI', - 'class_path' => './Services/User/classes/Profile/class.ilPublicUserProfileGUI.php', + 'class_path' => './components/ILIAS/User/classes/Profile/class.ilPublicUserProfileGUI.php', 'children' => array ( 0 => 'ilobjportfoliogui', @@ -10318,7 +10389,7 @@ ), 'ilquestionbrowsertablegui' => array ( - 'cid' => 'wm', + 'cid' => 'ws', 'class_name' => 'ilQuestionBrowserTableGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/tables/class.ilQuestionBrowserTableGUI.php', 'children' => @@ -10332,7 +10403,7 @@ ), 'ilquestioneditgui' => array ( - 'cid' => 'wo', + 'cid' => 'wu', 'class_name' => 'ilQuestionEditGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilQuestionEditGUI.php', 'children' => @@ -10360,7 +10431,7 @@ ), 'ilquestionpoolexportgui' => array ( - 'cid' => 'wq', + 'cid' => 'ww', 'class_name' => 'ilQuestionPoolExportGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilQuestionPoolExportGUI.php', 'children' => @@ -10373,7 +10444,7 @@ ), 'ilquestionpoolskilladministrationgui' => array ( - 'cid' => 'wu', + 'cid' => 'x0', 'class_name' => 'ilQuestionPoolSkillAdministrationGUI', 'class_path' => './components/ILIAS/TestQuestionPool/classes/class.ilQuestionPoolSkillAdministrationGUI.php', 'children' => @@ -10388,9 +10459,9 @@ ), 'ilratingcategorygui' => array ( - 'cid' => 'wz', + 'cid' => 'x5', 'class_name' => 'ilRatingCategoryGUI', - 'class_path' => './Services/Rating/classes/class.ilRatingCategoryGUI.php', + 'class_path' => './components/ILIAS/Rating/classes/class.ilRatingCategoryGUI.php', 'children' => array ( ), @@ -10401,9 +10472,9 @@ ), 'ilratinggui' => array ( - 'cid' => 'x1', + 'cid' => 'x7', 'class_name' => 'ilRatingGUI', - 'class_path' => './Services/Rating/classes/class.ilRatingGUI.php', + 'class_path' => './components/ILIAS/Rating/classes/class.ilRatingGUI.php', 'children' => array ( 0 => 'ilratingcategorygui', @@ -10423,9 +10494,9 @@ ), 'ilrecommendedcontentroleconfiggui' => array ( - 'cid' => 'x3', + 'cid' => 'x9', 'class_name' => 'ilRecommendedContentRoleConfigGUI', - 'class_path' => './Services/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleConfigGUI.php', + 'class_path' => './components/ILIAS/Repository/RecommendedContent/classes/class.ilRecommendedContentRoleConfigGUI.php', 'children' => array ( ), @@ -10436,9 +10507,9 @@ ), 'ilregistrationsettingsgui' => array ( - 'cid' => 'x9', + 'cid' => 'xf', 'class_name' => 'ilRegistrationSettingsGUI', - 'class_path' => './Services/Registration/classes/class.ilRegistrationSettingsGUI.php', + 'class_path' => './components/ILIAS/Registration/classes/class.ilRegistrationSettingsGUI.php', 'children' => array ( ), @@ -10449,9 +10520,9 @@ ), 'ilrepostandarduploadhandlergui' => array ( - 'cid' => 'xd', + 'cid' => 'xj', 'class_name' => 'ilRepoStandardUploadHandlerGUI', - 'class_path' => './Services/Repository/Service/Form/class.ilRepoStandardUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/Repository/Service/Form/class.ilRepoStandardUploadHandlerGUI.php', 'children' => array ( ), @@ -10466,9 +10537,9 @@ ), 'ilrepositorygui' => array ( - 'cid' => 'xf', + 'cid' => 'xl', 'class_name' => 'ilRepositoryGUI', - 'class_path' => './Services/Repository/classes/class.ilRepositoryGUI.php', + 'class_path' => './components/ILIAS/Repository/classes/class.ilRepositoryGUI.php', 'children' => array ( 0 => 'ilobjgroupgui', @@ -10534,9 +10605,9 @@ ), 'ilrepositoryobjectsearchgui' => array ( - 'cid' => 'xi', + 'cid' => 'xo', 'class_name' => 'ilRepositoryObjectSearchGUI', - 'class_path' => './Services/Search/classes/class.ilRepositoryObjectSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilRepositoryObjectSearchGUI.php', 'children' => array ( ), @@ -10548,9 +10619,9 @@ ), 'ilrepositorysearchgui' => array ( - 'cid' => 'xk', + 'cid' => 'xq', 'class_name' => 'ilRepositorySearchGUI', - 'class_path' => './Services/Search/classes/class.ilRepositorySearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilRepositorySearchGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -10585,9 +10656,9 @@ ), 'ilrepositoryselector2inputgui' => array ( - 'cid' => 'xl', + 'cid' => 'xr', 'class_name' => 'ilRepositorySelector2InputGUI', - 'class_path' => './Services/Form/classes/class.ilRepositorySelector2InputGUI.php', + 'class_path' => './components/ILIAS/Form/classes/class.ilRepositorySelector2InputGUI.php', 'children' => array ( ), @@ -10598,9 +10669,9 @@ ), 'ilrepositoryselectorexplorergui' => array ( - 'cid' => 'xm', + 'cid' => 'xs', 'class_name' => 'ilRepositorySelectorExplorerGUI', - 'class_path' => './Services/Repository/classes/class.ilRepositorySelectorExplorerGUI.php', + 'class_path' => './components/ILIAS/Repository/classes/class.ilRepositorySelectorExplorerGUI.php', 'children' => array ( ), @@ -10611,9 +10682,9 @@ ), 'ilrepositoryselectorinputgui' => array ( - 'cid' => 'xn', + 'cid' => 'xt', 'class_name' => 'ilRepositorySelectorInputGUI', - 'class_path' => './Services/Form/classes/class.ilRepositorySelectorInputGUI.php', + 'class_path' => './components/ILIAS/Form/classes/class.ilRepositorySelectorInputGUI.php', 'children' => array ( ), @@ -10624,9 +10695,9 @@ ), 'ilrepositorytrashgui' => array ( - 'cid' => 'xo', + 'cid' => 'xu', 'class_name' => 'ilRepositoryTrashGUI', - 'class_path' => './Services/Repository/Trash/class.ilRepositoryTrashGUI.php', + 'class_path' => './components/ILIAS/Repository/Trash/class.ilRepositoryTrashGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -10641,9 +10712,9 @@ ), 'ilresourcecollectiongui' => array ( - 'cid' => 'xq', + 'cid' => 'xw', 'class_name' => 'ilResourceCollectionGUI', - 'class_path' => './Services/ResourceStorage/classes/Collections/class.ilResourceCollectionGUI.php', + 'class_path' => './components/ILIAS/ResourceStorage_/classes/Collections/class.ilResourceCollectionGUI.php', 'children' => array ( ), @@ -10656,9 +10727,9 @@ ), 'ilresourceoverviewgui' => array ( - 'cid' => 'xr', + 'cid' => 'xx', 'class_name' => 'ilResourceOverviewGUI', - 'class_path' => './Services/ResourceStorage/classes/Resources/class.ilResourceOverviewGUI.php', + 'class_path' => './components/ILIAS/ResourceStorage_/classes/Resources/class.ilResourceOverviewGUI.php', 'children' => array ( 0 => 'ilresourcecollectiongui', @@ -10670,7 +10741,7 @@ ), 'ilsahseditgui' => array ( - 'cid' => 'xz', + 'cid' => 'y5', 'class_name' => 'ilSAHSEditGUI', 'class_path' => './components/ILIAS/ScormAicc/Editing/classes/class.ilSAHSEditGUI.php', 'children' => @@ -10690,7 +10761,7 @@ ), 'ilsahspresentationgui' => array ( - 'cid' => 'y0', + 'cid' => 'y6', 'class_name' => 'ilSAHSPresentationGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilSAHSPresentationGUI.php', 'children' => @@ -10708,7 +10779,7 @@ ), 'ilscorm13playergui' => array ( - 'cid' => 'y3', + 'cid' => 'y9', 'class_name' => 'ilSCORM13PlayerGUI', 'class_path' => './components/ILIAS/Scorm2004/classes/class.ilSCORM13PlayerGUI.php', 'children' => @@ -10721,7 +10792,7 @@ ), 'ilscorm2004trackingitemsperscofiltergui' => array ( - 'cid' => 'y4', + 'cid' => 'ya', 'class_name' => 'ilSCORM2004TrackingItemsPerScoFilterGUI', 'class_path' => './components/ILIAS/Scorm2004/classes/class.ilSCORM2004TrackingItemsPerScoFilterGUI.php', 'children' => @@ -10734,7 +10805,7 @@ ), 'ilscorm2004trackingitemsperuserfiltergui' => array ( - 'cid' => 'y5', + 'cid' => 'yb', 'class_name' => 'ilSCORM2004TrackingItemsPerUserFilterGUI', 'class_path' => './components/ILIAS/Scorm2004/classes/class.ilSCORM2004TrackingItemsPerUserFilterGUI.php', 'children' => @@ -10747,7 +10818,7 @@ ), 'ilscorm2004trackingitemstablegui' => array ( - 'cid' => 'y6', + 'cid' => 'yc', 'class_name' => 'ilSCORM2004TrackingItemsTableGUI', 'class_path' => './components/ILIAS/Scorm2004/classes/class.ilSCORM2004TrackingItemsTableGUI.php', 'children' => @@ -10760,7 +10831,7 @@ ), 'ilscormpresentationgui' => array ( - 'cid' => 'yc', + 'cid' => 'yi', 'class_name' => 'ilSCORMPresentationGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/SCORM/class.ilSCORMPresentationGUI.php', 'children' => @@ -10773,7 +10844,7 @@ ), 'ilscormtrackingitemsperscofiltergui' => array ( - 'cid' => 'yg', + 'cid' => 'ym', 'class_name' => 'ilSCORMTrackingItemsPerScoFilterGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilSCORMTrackingItemsPerScoFilterGUI.php', 'children' => @@ -10786,7 +10857,7 @@ ), 'ilscormtrackingitemsperuserfiltergui' => array ( - 'cid' => 'yi', + 'cid' => 'yo', 'class_name' => 'ilSCORMTrackingItemsPerUserFilterGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilSCORMTrackingItemsPerUserFilterGUI.php', 'children' => @@ -10799,7 +10870,7 @@ ), 'ilscormtrackingitemstablegui' => array ( - 'cid' => 'yl', + 'cid' => 'yr', 'class_name' => 'ilSCORMTrackingItemsTableGUI', 'class_path' => './components/ILIAS/ScormAicc/classes/class.ilSCORMTrackingItemsTableGUI.php', 'children' => @@ -10812,9 +10883,9 @@ ), 'ilsctreetasksgui' => array ( - 'cid' => 'yr', + 'cid' => 'yx', 'class_name' => 'ilSCTreeTasksGUI', - 'class_path' => './Services/Tree/classes/SystemCheck/class.ilSCTreeTasksGUI.php', + 'class_path' => './components/ILIAS/Tree/classes/SystemCheck/class.ilSCTreeTasksGUI.php', 'children' => array ( ), @@ -10825,9 +10896,9 @@ ), 'ilsamlsettingsgui' => array ( - 'cid' => 'yv', + 'cid' => 'z1', 'class_name' => 'ilSamlSettingsGUI', - 'class_path' => './Services/Saml/classes/class.ilSamlSettingsGUI.php', + 'class_path' => './components/ILIAS/Saml/classes/class.ilSamlSettingsGUI.php', 'children' => array ( ), @@ -10838,9 +10909,9 @@ ), 'ilsearchbasegui' => array ( - 'cid' => 'yx', + 'cid' => 'z3', 'class_name' => 'ilSearchBaseGUI', - 'class_path' => './Services/Search/classes/class.ilSearchBaseGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilSearchBaseGUI.php', 'children' => array ( ), @@ -10851,9 +10922,9 @@ ), 'ilsearchcontrollergui' => array ( - 'cid' => 'yy', + 'cid' => 'z4', 'class_name' => 'ilSearchControllerGUI', - 'class_path' => './Services/Search/classes/class.ilSearchControllerGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilSearchControllerGUI.php', 'children' => array ( 0 => 'ilsearchgui', @@ -10869,9 +10940,9 @@ ), 'ilsearchgui' => array ( - 'cid' => 'yz', + 'cid' => 'z5', 'class_name' => 'ilSearchGUI', - 'class_path' => './Services/Search/classes/class.ilSearchGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilSearchGUI.php', 'children' => array ( 0 => 'ilpropertyformgui', @@ -10891,9 +10962,9 @@ ), 'ilselecteditemsblockgui' => array ( - 'cid' => 'z3', + 'cid' => 'z9', 'class_name' => 'ilSelectedItemsBlockGUI', - 'class_path' => './Services/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php', + 'class_path' => './components/ILIAS/Dashboard/Block/classes/class.ilSelectedItemsBlockGUI.php', 'children' => array ( ), @@ -10905,7 +10976,7 @@ ), 'ilsessionmembershipgui' => array ( - 'cid' => 'z6', + 'cid' => 'zc', 'class_name' => 'ilSessionMembershipGUI', 'class_path' => './components/ILIAS/Session/classes/class.ilSessionMembershipGUI.php', 'children' => @@ -10923,7 +10994,7 @@ ), 'ilsessionoverviewgui' => array ( - 'cid' => 'z8', + 'cid' => 'ze', 'class_name' => 'ilSessionOverviewGUI', 'class_path' => './components/ILIAS/Session/classes/class.ilSessionOverviewGUI.php', 'children' => @@ -10941,9 +11012,9 @@ ), 'ilsessionstatisticsgui' => array ( - 'cid' => 'zc', + 'cid' => 'zi', 'class_name' => 'ilSessionStatisticsGUI', - 'class_path' => './Services/Authentication/classes/class.ilSessionStatisticsGUI.php', + 'class_path' => './components/ILIAS/Authentication/classes/class.ilSessionStatisticsGUI.php', 'children' => array ( ), @@ -10954,9 +11025,9 @@ ), 'ilsettingspermissiongui' => array ( - 'cid' => 'zd', + 'cid' => 'zj', 'class_name' => 'ilSettingsPermissionGUI', - 'class_path' => './Services/AccessControl/classes/class.ilSettingsPermissionGUI.php', + 'class_path' => './components/ILIAS/AccessControl/classes/class.ilSettingsPermissionGUI.php', 'children' => array ( ), @@ -10967,9 +11038,9 @@ ), 'ilsharedresourcegui' => array ( - 'cid' => 'ze', + 'cid' => 'zk', 'class_name' => 'ilSharedResourceGUI', - 'class_path' => './Services/PersonalWorkspace/classes/class.ilSharedResourceGUI.php', + 'class_path' => './components/ILIAS/PersonalWorkspace/classes/class.ilSharedResourceGUI.php', 'children' => array ( 0 => 'ilobjbloggui', @@ -10985,9 +11056,9 @@ ), 'ilsingleusersharegui' => array ( - 'cid' => 'zh', + 'cid' => 'zn', 'class_name' => 'ilSingleUserShareGUI', - 'class_path' => './Services/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php', + 'class_path' => './components/ILIAS/PersonalWorkspace/classes/class.ilSingleUserShareGUI.php', 'children' => array ( ), @@ -10998,9 +11069,9 @@ ), 'ilskillcategorygui' => array ( - 'cid' => 'zj', + 'cid' => 'zp', 'class_name' => 'ilSkillCategoryGUI', - 'class_path' => './Services/Skill/Node/class.ilSkillCategoryGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilSkillCategoryGUI.php', 'children' => array ( ), @@ -11012,9 +11083,9 @@ ), 'ilskillprofilegui' => array ( - 'cid' => 'zl', + 'cid' => 'zr', 'class_name' => 'ilSkillProfileGUI', - 'class_path' => './Services/Skill/Profile/class.ilSkillProfileGUI.php', + 'class_path' => './components/ILIAS/Skill/Profile/class.ilSkillProfileGUI.php', 'children' => array ( 0 => 'ilrepositorysearchgui', @@ -11027,9 +11098,9 @@ ), 'ilskillprofileuploadhandlergui' => array ( - 'cid' => 'zn', + 'cid' => 'zt', 'class_name' => 'ilSkillProfileUploadHandlerGUI', - 'class_path' => './Services/Skill/Profile/class.ilSkillProfileUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/Skill/Profile/class.ilSkillProfileUploadHandlerGUI.php', 'children' => array ( ), @@ -11041,9 +11112,9 @@ ), 'ilskillrootgui' => array ( - 'cid' => 'zo', + 'cid' => 'zu', 'class_name' => 'ilSkillRootGUI', - 'class_path' => './Services/Skill/Node/class.ilSkillRootGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilSkillRootGUI.php', 'children' => array ( ), @@ -11055,9 +11126,9 @@ ), 'ilskillselectorgui' => array ( - 'cid' => 'zp', + 'cid' => 'zv', 'class_name' => 'ilSkillSelectorGUI', - 'class_path' => './Services/Skill/Tree/class.ilSkillSelectorGUI.php', + 'class_path' => './components/ILIAS/Skill/Tree/class.ilSkillSelectorGUI.php', 'children' => array ( ), @@ -11068,9 +11139,9 @@ ), 'ilskilltemplatecategorygui' => array ( - 'cid' => 'zq', + 'cid' => 'zw', 'class_name' => 'ilSkillTemplateCategoryGUI', - 'class_path' => './Services/Skill/Node/class.ilSkillTemplateCategoryGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilSkillTemplateCategoryGUI.php', 'children' => array ( ), @@ -11082,9 +11153,9 @@ ), 'ilskilltemplatereferencegui' => array ( - 'cid' => 'zr', + 'cid' => 'zx', 'class_name' => 'ilSkillTemplateReferenceGUI', - 'class_path' => './Services/Skill/Node/class.ilSkillTemplateReferenceGUI.php', + 'class_path' => './components/ILIAS/Skill/Node/class.ilSkillTemplateReferenceGUI.php', 'children' => array ( ), @@ -11096,9 +11167,9 @@ ), 'ilstartupgui' => array ( - 'cid' => 'zx', + 'cid' => '103', 'class_name' => 'ilStartUpGUI', - 'class_path' => './Services/Init/classes/class.ilStartUpGUI.php', + 'class_path' => './components/ILIAS/Init/classes/class.ilStartUpGUI.php', 'children' => array ( 0 => 'ilaccountregistrationgui', @@ -11115,7 +11186,7 @@ ), 'ilstructureobjectgui' => array ( - 'cid' => 'zy', + 'cid' => '104', 'class_name' => 'ilStructureObjectGUI', 'class_path' => './components/ILIAS/LearningModule/classes/class.ilStructureObjectGUI.php', 'children' => @@ -11131,7 +11202,7 @@ ), 'ilstudyprogrammechangedeadlinegui' => array ( - 'cid' => '102', + 'cid' => '108', 'class_name' => 'ilStudyProgrammeChangeDeadlineGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeChangeDeadlineGUI.php', 'children' => @@ -11144,7 +11215,7 @@ ), 'ilstudyprogrammechangeexpiredategui' => array ( - 'cid' => '103', + 'cid' => '109', 'class_name' => 'ilStudyProgrammeChangeExpireDateGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeChangeExpireDateGUI.php', 'children' => @@ -11157,7 +11228,7 @@ ), 'ilstudyprogrammecommonsettingsgui' => array ( - 'cid' => '104', + 'cid' => '10a', 'class_name' => 'ilStudyProgrammeCommonSettingsGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeCommonSettingsGUI.php', 'children' => @@ -11170,7 +11241,7 @@ ), 'ilstudyprogrammedashboardviewgui' => array ( - 'cid' => '106', + 'cid' => '10c', 'class_name' => 'ilStudyProgrammeDashboardViewGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeDashboardViewGUI.php', 'children' => @@ -11183,7 +11254,7 @@ ), 'ilstudyprogrammemailmembersearchgui' => array ( - 'cid' => '10a', + 'cid' => '10g', 'class_name' => 'ilStudyProgrammeMailMemberSearchGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeMailMemberSearchGUI.php', 'children' => @@ -11196,7 +11267,7 @@ ), 'ilstudyprogrammerepositorysearchgui' => array ( - 'cid' => '10e', + 'cid' => '10k', 'class_name' => 'ilStudyProgrammeRepositorySearchGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/class.ilStudyProgrammeRepositorySearchGUI.php', 'children' => @@ -11210,7 +11281,7 @@ ), 'ilstudyprogrammetypegui' => array ( - 'cid' => '10h', + 'cid' => '10n', 'class_name' => 'ilStudyProgrammeTypeGUI', 'class_path' => './components/ILIAS/StudyProgramme/classes/types/class.ilStudyProgrammeTypeGUI.php', 'children' => @@ -11223,9 +11294,9 @@ ), 'ilstylecharacteristicgui' => array ( - 'cid' => '10j', + 'cid' => '10p', 'class_name' => 'ilStyleCharacteristicGUI', - 'class_path' => './Services/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php', + 'class_path' => './components/ILIAS/Style/Content/Characteristic/class.ilStyleCharacteristicGUI.php', 'children' => array ( ), @@ -11236,7 +11307,7 @@ ), 'ilsurveyconstraintsgui' => array ( - 'cid' => '10y', + 'cid' => '114', 'class_name' => 'ilSurveyConstraintsGUI', 'class_path' => './components/ILIAS/Survey/Constraints/class.ilSurveyConstraintsGUI.php', 'children' => @@ -11249,7 +11320,7 @@ ), 'ilsurveyeditorgui' => array ( - 'cid' => '110', + 'cid' => '116', 'class_name' => 'ilSurveyEditorGUI', 'class_path' => './components/ILIAS/Survey/Editing/class.ilSurveyEditorGUI.php', 'children' => @@ -11267,7 +11338,7 @@ ), 'ilsurveyevaluationgui' => array ( - 'cid' => '111', + 'cid' => '117', 'class_name' => 'ilSurveyEvaluationGUI', 'class_path' => './components/ILIAS/Survey/Evaluation/class.ilSurveyEvaluationGUI.php', 'children' => @@ -11280,7 +11351,7 @@ ), 'ilsurveyexecutiongui' => array ( - 'cid' => '112', + 'cid' => '118', 'class_name' => 'ilSurveyExecutionGUI', 'class_path' => './components/ILIAS/Survey/Execution/class.ilSurveyExecutionGUI.php', 'children' => @@ -11293,7 +11364,7 @@ ), 'ilsurveyparticipantsgui' => array ( - 'cid' => '114', + 'cid' => '11a', 'class_name' => 'ilSurveyParticipantsGUI', 'class_path' => './components/ILIAS/Survey/Participants/class.ilSurveyParticipantsGUI.php', 'children' => @@ -11308,7 +11379,7 @@ ), 'ilsurveyratergui' => array ( - 'cid' => '11b', + 'cid' => '11h', 'class_name' => 'ilSurveyRaterGUI', 'class_path' => './components/ILIAS/Survey/Participants/class.ilSurveyRaterGUI.php', 'children' => @@ -11322,7 +11393,7 @@ ), 'ilsurveyskilldeterminationgui' => array ( - 'cid' => '11g', + 'cid' => '11m', 'class_name' => 'ilSurveySkillDeterminationGUI', 'class_path' => './components/ILIAS/Survey/Skills/class.ilSurveySkillDeterminationGUI.php', 'children' => @@ -11335,7 +11406,7 @@ ), 'ilsurveyskillgui' => array ( - 'cid' => '11h', + 'cid' => '11n', 'class_name' => 'ilSurveySkillGUI', 'class_path' => './components/ILIAS/Survey/Skills/class.ilSurveySkillGUI.php', 'children' => @@ -11349,7 +11420,7 @@ ), 'ilsurveyskillthresholdsgui' => array ( - 'cid' => '11j', + 'cid' => '11p', 'class_name' => 'ilSurveySkillThresholdsGUI', 'class_path' => './components/ILIAS/Survey/Skills/class.ilSurveySkillThresholdsGUI.php', 'children' => @@ -11362,9 +11433,9 @@ ), 'ilsystemstyleconfiggui' => array ( - 'cid' => '11n', + 'cid' => '11t', 'class_name' => 'ilSystemStyleConfigGUI', - 'class_path' => './Services/Style/System/classes/Config/class.ilSystemStyleConfigGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/Config/class.ilSystemStyleConfigGUI.php', 'children' => array ( ), @@ -11375,9 +11446,9 @@ ), 'ilsystemstyledocumentationgui' => array ( - 'cid' => '11p', + 'cid' => '11v', 'class_name' => 'ilSystemStyleDocumentationGUI', - 'class_path' => './Services/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/Documentation/class.ilSystemStyleDocumentationGUI.php', 'children' => array ( ), @@ -11388,9 +11459,9 @@ ), 'ilsystemstyleiconsgui' => array ( - 'cid' => '11q', + 'cid' => '11w', 'class_name' => 'ilSystemStyleIconsGUI', - 'class_path' => './Services/Style/System/classes/Icons/class.ilSystemStyleIconsGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/Icons/class.ilSystemStyleIconsGUI.php', 'children' => array ( ), @@ -11401,9 +11472,9 @@ ), 'ilsystemstylemaingui' => array ( - 'cid' => '11r', + 'cid' => '11x', 'class_name' => 'ilSystemStyleMainGUI', - 'class_path' => './Services/Style/System/classes/class.ilSystemStyleMainGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/class.ilSystemStyleMainGUI.php', 'children' => array ( 0 => 'ilsystemstyleoverviewgui', @@ -11419,9 +11490,9 @@ ), 'ilsystemstyleoverviewgui' => array ( - 'cid' => '11s', + 'cid' => '11y', 'class_name' => 'ilSystemStyleOverviewGUI', - 'class_path' => './Services/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/Overview/class.ilSystemStyleOverviewGUI.php', 'children' => array ( ), @@ -11432,9 +11503,9 @@ ), 'ilsystemstylescssgui' => array ( - 'cid' => '11t', + 'cid' => '11z', 'class_name' => 'ilSystemStyleScssGUI', - 'class_path' => './Services/Style/System/classes/Scss/class.ilSystemStyleScssGUI.php', + 'class_path' => './components/ILIAS/Style/System/classes/Scss/class.ilSystemStyleScssGUI.php', 'children' => array ( ), @@ -11445,7 +11516,7 @@ ), 'ilsystemsupportcontactsgui' => array ( - 'cid' => '11v', + 'cid' => '121', 'class_name' => 'ilSystemSupportContactsGUI', 'class_path' => './components/ILIAS/SystemFolder/classes/class.ilSystemSupportContactsGUI.php', 'children' => @@ -11457,9 +11528,9 @@ ), 'iltablepropertiesstoragegui' => array ( - 'cid' => '122', + 'cid' => '128', 'class_name' => 'ilTablePropertiesStorageGUI', - 'class_path' => './Services/Table/classes/class.ilTablePropertiesStorageGUI.php', + 'class_path' => './components/ILIAS/Table/classes/class.ilTablePropertiesStorageGUI.php', 'children' => array ( ), @@ -11469,9 +11540,9 @@ ), 'iltagginggui' => array ( - 'cid' => '126', + 'cid' => '12c', 'class_name' => 'ilTaggingGUI', - 'class_path' => './Services/Tagging/classes/class.ilTaggingGUI.php', + 'class_path' => './components/ILIAS/Tagging/classes/class.ilTaggingGUI.php', 'children' => array ( ), @@ -11482,9 +11553,9 @@ ), 'iltaggingslatecontentgui' => array ( - 'cid' => '127', + 'cid' => '12d', 'class_name' => 'ilTaggingSlateContentGUI', - 'class_path' => './Services/Tagging/classes/class.ilTaggingSlateContentGUI.php', + 'class_path' => './components/ILIAS/Tagging/classes/class.ilTaggingSlateContentGUI.php', 'children' => array ( ), @@ -11494,9 +11565,9 @@ ), 'iltaxmdgui' => array ( - 'cid' => '12a', + 'cid' => '12g', 'class_name' => 'ilTaxMDGUI', - 'class_path' => './Services/Taxonomy/classes/class.ilTaxMDGUI.php', + 'class_path' => './components/ILIAS/Taxonomy/classes/class.ilTaxMDGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -11508,9 +11579,9 @@ ), 'iltaxselectinputgui' => array ( - 'cid' => '12b', + 'cid' => '12h', 'class_name' => 'ilTaxSelectInputGUI', - 'class_path' => './Services/Taxonomy/classes/class.ilTaxSelectInputGUI.php', + 'class_path' => './components/ILIAS/Taxonomy/classes/class.ilTaxSelectInputGUI.php', 'children' => array ( ), @@ -11521,9 +11592,9 @@ ), 'iltaxonomysettingsgui' => array ( - 'cid' => '12f', + 'cid' => '12l', 'class_name' => 'ilTaxonomySettingsGUI', - 'class_path' => './Services/Taxonomy/Settings/class.ilTaxonomySettingsGUI.php', + 'class_path' => './components/ILIAS/Taxonomy/Settings/class.ilTaxonomySettingsGUI.php', 'children' => array ( 0 => 'ilobjtaxonomygui', @@ -11537,7 +11608,7 @@ ), 'iltermdefinitionbulkcreationgui' => array ( - 'cid' => '12h', + 'cid' => '12n', 'class_name' => 'ilTermDefinitionBulkCreationGUI', 'class_path' => './components/ILIAS/Glossary/Term/class.ilTermDefinitionBulkCreationGUI.php', 'children' => @@ -11550,7 +11621,7 @@ ), 'iltermdefinitioneditorgui' => array ( - 'cid' => '12j', + 'cid' => '12p', 'class_name' => 'ilTermDefinitionEditorGUI', 'class_path' => './components/ILIAS/Glossary/Term/class.ilTermDefinitionEditorGUI.php', 'children' => @@ -11564,7 +11635,7 @@ ), 'iltestansweroptionalquestionsconfirmationgui' => array ( - 'cid' => '12o', + 'cid' => '12u', 'class_name' => 'ilTestAnswerOptionalQuestionsConfirmationGUI', 'class_path' => './components/ILIAS/Test/classes/confirmations/class.ilTestAnswerOptionalQuestionsConfirmationGUI.php', 'children' => @@ -11578,7 +11649,7 @@ ), 'iltestcorrectionsgui' => array ( - 'cid' => '12q', + 'cid' => '12w', 'class_name' => 'ilTestCorrectionsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestCorrectionsGUI.php', 'children' => @@ -11591,7 +11662,7 @@ ), 'iltestdashboardgui' => array ( - 'cid' => '12r', + 'cid' => '12x', 'class_name' => 'ilTestDashboardGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestDashboardGUI.php', 'children' => @@ -11606,7 +11677,7 @@ ), 'iltestevalobjectiveorientedgui' => array ( - 'cid' => '12t', + 'cid' => '12z', 'class_name' => 'ilTestEvalObjectiveOrientedGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestEvalObjectiveOrientedGUI.php', 'children' => @@ -11621,7 +11692,7 @@ ), 'iltestevaluationgui' => array ( - 'cid' => '12u', + 'cid' => '130', 'class_name' => 'ilTestEvaluationGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestEvaluationGUI.php', 'children' => @@ -11641,7 +11712,7 @@ ), 'iltestexportgui' => array ( - 'cid' => '12v', + 'cid' => '131', 'class_name' => 'ilTestExportGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestExportGUI.php', 'children' => @@ -11655,7 +11726,7 @@ ), 'iltestexpresspageobjectgui' => array ( - 'cid' => '12x', + 'cid' => '133', 'class_name' => 'ilTestExpressPageObjectGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestExpressPageObjectGUI.php', 'children' => @@ -11696,7 +11767,7 @@ ), 'iltestfixedquestionsetconfiggui' => array ( - 'cid' => '12y', + 'cid' => '134', 'class_name' => 'ilTestFixedQuestionSetConfigGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestFixedQuestionSetConfigGUI.php', 'children' => @@ -11712,7 +11783,7 @@ ), 'iltestinfoscreentoolbargui' => array ( - 'cid' => '130', + 'cid' => '136', 'class_name' => 'ilTestInfoScreenToolbarGUI', 'class_path' => './components/ILIAS/Test/classes/toolbars/class.ilTestInfoScreenToolbarGUI.php', 'children' => @@ -11725,7 +11796,7 @@ ), 'iltestpagegui' => array ( - 'cid' => '136', + 'cid' => '13c', 'class_name' => 'ilTestPageGUI', 'class_path' => './components/ILIAS/Test/classes/PageEditor/class.ilTestPageGUI.php', 'children' => @@ -11744,7 +11815,7 @@ ), 'iltestparticipantsgui' => array ( - 'cid' => '137', + 'cid' => '13d', 'class_name' => 'ilTestParticipantsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestParticipantsGUI.php', 'children' => @@ -11760,7 +11831,7 @@ ), 'iltestparticipantstablegui' => array ( - 'cid' => '138', + 'cid' => '13e', 'class_name' => 'ilTestParticipantsTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestParticipantsTableGUI.php', 'children' => @@ -11773,7 +11844,7 @@ ), 'iltestparticipantstimeextensiongui' => array ( - 'cid' => '139', + 'cid' => '13f', 'class_name' => 'ilTestParticipantsTimeExtensionGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestParticipantsTimeExtensionGUI.php', 'children' => @@ -11787,7 +11858,7 @@ ), 'iltestpassdeletionconfirmationgui' => array ( - 'cid' => '13a', + 'cid' => '13g', 'class_name' => 'ilTestPassDeletionConfirmationGUI', 'class_path' => './components/ILIAS/Test/classes/confirmations/class.ilTestPassDeletionConfirmationGUI.php', 'children' => @@ -11800,7 +11871,7 @@ ), 'iltestpassdetailsoverviewtablegui' => array ( - 'cid' => '13b', + 'cid' => '13h', 'class_name' => 'ilTestPassDetailsOverviewTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestPassDetailsOverviewTableGUI.php', 'children' => @@ -11815,7 +11886,7 @@ ), 'iltestpasswordprotectiongui' => array ( - 'cid' => '13e', + 'cid' => '13k', 'class_name' => 'ilTestPasswordProtectionGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestPasswordProtectionGUI.php', 'children' => @@ -11830,7 +11901,7 @@ ), 'iltestpersonalskillsgui' => array ( - 'cid' => '13g', + 'cid' => '13m', 'class_name' => 'ilTestPersonalSkillsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestPersonalSkillsGUI.php', 'children' => @@ -11843,7 +11914,7 @@ ), 'iltestplayerfixedquestionsetgui' => array ( - 'cid' => '13i', + 'cid' => '13o', 'class_name' => 'ilTestPlayerFixedQuestionSetGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestPlayerFixedQuestionSetGUI.php', 'children' => @@ -11864,7 +11935,7 @@ ), 'iltestplayerrandomquestionsetgui' => array ( - 'cid' => '13j', + 'cid' => '13p', 'class_name' => 'ilTestPlayerRandomQuestionSetGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestPlayerRandomQuestionSetGUI.php', 'children' => @@ -11885,7 +11956,7 @@ ), 'iltestquestionbrowsertablegui' => array ( - 'cid' => '13k', + 'cid' => '13q', 'class_name' => 'ilTestQuestionBrowserTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestQuestionBrowserTableGUI.php', 'children' => @@ -11899,7 +11970,7 @@ ), 'iltestrandomquestionsetconfiggui' => array ( - 'cid' => '13n', + 'cid' => '13t', 'class_name' => 'ilTestRandomQuestionSetConfigGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestRandomQuestionSetConfigGUI.php', 'children' => @@ -11918,7 +11989,7 @@ ), 'iltestrandomquestionsetgeneralconfigformgui' => array ( - 'cid' => '13o', + 'cid' => '13u', 'class_name' => 'ilTestRandomQuestionSetGeneralConfigFormGUI', 'class_path' => './components/ILIAS/Test/classes/forms/class.ilTestRandomQuestionSetGeneralConfigFormGUI.php', 'children' => @@ -11932,7 +12003,7 @@ ), 'iltestrandomquestionsetnonavailablepoolstablegui' => array ( - 'cid' => '13p', + 'cid' => '13v', 'class_name' => 'ilTestRandomQuestionSetNonAvailablePoolsTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestRandomQuestionSetNonAvailablePoolsTableGUI.php', 'children' => @@ -11945,7 +12016,7 @@ ), 'iltestrandomquestionsetpooldefinitionformgui' => array ( - 'cid' => '13q', + 'cid' => '13w', 'class_name' => 'ilTestRandomQuestionSetPoolDefinitionFormGUI', 'class_path' => './components/ILIAS/Test/classes/forms/class.ilTestRandomQuestionSetPoolDefinitionFormGUI.php', 'children' => @@ -11959,7 +12030,7 @@ ), 'iltestrandomquestionsetsourcepooldefinitionlisttablegui' => array ( - 'cid' => '13r', + 'cid' => '13x', 'class_name' => 'ilTestRandomQuestionSetSourcePoolDefinitionListTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestRandomQuestionSetSourcePoolDefinitionListTableGUI.php', 'children' => @@ -11972,7 +12043,7 @@ ), 'iltestrandomquestionsetsourcepooldefinitionlisttoolbargui' => array ( - 'cid' => '13s', + 'cid' => '13y', 'class_name' => 'ilTestRandomQuestionSetSourcePoolDefinitionListToolbarGUI', 'class_path' => './components/ILIAS/Test/classes/toolbars/class.ilTestRandomQuestionSetSourcePoolDefinitionListToolbarGUI.php', 'children' => @@ -11985,7 +12056,7 @@ ), 'iltestresultsgui' => array ( - 'cid' => '13t', + 'cid' => '13z', 'class_name' => 'ilTestResultsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestResultsGUI.php', 'children' => @@ -12004,7 +12075,7 @@ ), 'iltestresultstoolbargui' => array ( - 'cid' => '13u', + 'cid' => '140', 'class_name' => 'ilTestResultsToolbarGUI', 'class_path' => './components/ILIAS/Test/classes/toolbars/class.ilTestResultsToolbarGUI.php', 'children' => @@ -12019,7 +12090,7 @@ ), 'iltestscoringbyquestionsgui' => array ( - 'cid' => '13v', + 'cid' => '141', 'class_name' => 'ilTestScoringByQuestionsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestScoringByQuestionsGUI.php', 'children' => @@ -12032,7 +12103,7 @@ ), 'iltestscoringgui' => array ( - 'cid' => '13w', + 'cid' => '142', 'class_name' => 'ilTestScoringGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestScoringGUI.php', 'children' => @@ -12045,7 +12116,7 @@ ), 'iltestscreengui' => array ( - 'cid' => '13x', + 'cid' => '143', 'class_name' => 'ilTestScreenGUI', 'class_path' => './components/ILIAS/Test/classes/TestScreen/class.ilTestScreenGUI.php', 'children' => @@ -12058,7 +12129,7 @@ ), 'iltestservicegui' => array ( - 'cid' => '13y', + 'cid' => '144', 'class_name' => 'ilTestServiceGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestServiceGUI.php', 'children' => @@ -12071,7 +12142,7 @@ ), 'iltestsettingschangeconfirmationgui' => array ( - 'cid' => '13z', + 'cid' => '145', 'class_name' => 'ilTestSettingsChangeConfirmationGUI', 'class_path' => './components/ILIAS/Test/classes/confirmations/class.ilTestSettingsChangeConfirmationGUI.php', 'children' => @@ -12085,7 +12156,7 @@ ), 'iltestskilladministrationgui' => array ( - 'cid' => '141', + 'cid' => '147', 'class_name' => 'ilTestSkillAdministrationGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestSkillAdministrationGUI.php', 'children' => @@ -12100,7 +12171,7 @@ ), 'iltestskillevaluationgui' => array ( - 'cid' => '142', + 'cid' => '148', 'class_name' => 'ilTestSkillEvaluationGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestSkillEvaluationGUI.php', 'children' => @@ -12115,7 +12186,7 @@ ), 'iltestskillevaluationtoolbargui' => array ( - 'cid' => '143', + 'cid' => '149', 'class_name' => 'ilTestSkillEvaluationToolbarGUI', 'class_path' => './components/ILIAS/Test/classes/toolbars/class.ilTestSkillEvaluationToolbarGUI.php', 'children' => @@ -12128,7 +12199,7 @@ ), 'iltestskilllevelthresholdsgui' => array ( - 'cid' => '144', + 'cid' => '14a', 'class_name' => 'ilTestSkillLevelThresholdsGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestSkillLevelThresholdsGUI.php', 'children' => @@ -12142,7 +12213,7 @@ ), 'iltestskilllevelthresholdstablegui' => array ( - 'cid' => '145', + 'cid' => '14b', 'class_name' => 'ilTestSkillLevelThresholdsTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTestSkillLevelThresholdsTableGUI.php', 'children' => @@ -12155,7 +12226,7 @@ ), 'iltestsubmissionreviewgui' => array ( - 'cid' => '146', + 'cid' => '14c', 'class_name' => 'ilTestSubmissionReviewGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestSubmissionReviewGUI.php', 'children' => @@ -12169,7 +12240,7 @@ ), 'iltesttoplistgui' => array ( - 'cid' => '148', + 'cid' => '14e', 'class_name' => 'ilTestToplistGUI', 'class_path' => './components/ILIAS/Test/classes/class.ilTestToplistGUI.php', 'children' => @@ -12182,7 +12253,7 @@ ), 'iltimingoverviewtablegui' => array ( - 'cid' => '14f', + 'cid' => '14l', 'class_name' => 'ilTimingOverviewTableGUI', 'class_path' => './components/ILIAS/Test/classes/tables/class.ilTimingOverviewTableGUI.php', 'children' => @@ -12195,9 +12266,9 @@ ), 'iltoolbargui' => array ( - 'cid' => '14i', + 'cid' => '14o', 'class_name' => 'ilToolbarGUI', - 'class_path' => './Services/UIComponent/Toolbar/classes/class.ilToolbarGUI.php', + 'class_path' => './components/ILIAS/UIComponent/Toolbar/classes/class.ilToolbarGUI.php', 'children' => array ( ), @@ -12210,9 +12281,9 @@ ), 'iltrmatrixtablegui' => array ( - 'cid' => '14k', + 'cid' => '14q', 'class_name' => 'ilTrMatrixTableGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilTrMatrixTableGUI.php', 'children' => array ( ), @@ -12223,9 +12294,9 @@ ), 'iltrobjectuserspropstablegui' => array ( - 'cid' => '14l', + 'cid' => '14r', 'class_name' => 'ilTrObjectUsersPropsTableGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilTrObjectUsersPropsTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -12237,9 +12308,9 @@ ), 'iltrsummarytablegui' => array ( - 'cid' => '14m', + 'cid' => '14s', 'class_name' => 'ilTrSummaryTableGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilTrSummaryTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -12251,9 +12322,9 @@ ), 'iltruserobjectspropstablegui' => array ( - 'cid' => '14n', + 'cid' => '14t', 'class_name' => 'ilTrUserObjectsPropsTableGUI', - 'class_path' => './Services/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php', + 'class_path' => './components/ILIAS/Tracking/classes/repository_statistics/class.ilTrUserObjectsPropsTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -12265,7 +12336,7 @@ ), 'iltranslationgui' => array ( - 'cid' => '14o', + 'cid' => '14u', 'class_name' => 'ilTranslationGUI', 'class_path' => './components/ILIAS/OrgUnit/classes/Translation/class.ilTranslationGUI.php', 'children' => @@ -12278,9 +12349,9 @@ ), 'iluiasyncdemofileuploadhandlergui' => array ( - 'cid' => '14r', + 'cid' => '14x', 'class_name' => 'ilUIAsyncDemoFileUploadHandlerGUI', - 'class_path' => './Services/UI/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/UI_/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php', 'children' => array ( ), @@ -12291,9 +12362,9 @@ ), 'iluidemofileuploadhandlergui' => array ( - 'cid' => '14s', + 'cid' => '14y', 'class_name' => 'ilUIDemoFileUploadHandlerGUI', - 'class_path' => './Services/UI/classes/class.ilUIDemoFileUploadHandlerGUI.php', + 'class_path' => './components/ILIAS/UI_/classes/class.ilUIDemoFileUploadHandlerGUI.php', 'children' => array ( ), @@ -12304,9 +12375,9 @@ ), 'iluimarkdownpreviewgui' => array ( - 'cid' => '14u', + 'cid' => '150', 'class_name' => 'ilUIMarkdownPreviewGUI', - 'class_path' => './Services/UI/classes/class.ilUIMarkdownPreviewGUI.php', + 'class_path' => './components/ILIAS/UI_/classes/class.ilUIMarkdownPreviewGUI.php', 'children' => array ( ), @@ -12316,9 +12387,9 @@ ), 'iluipluginroutergui' => array ( - 'cid' => '14v', + 'cid' => '151', 'class_name' => 'ilUIPluginRouterGUI', - 'class_path' => './Services/UIComponent/classes/class.ilUIPluginRouterGUI.php', + 'class_path' => './components/ILIAS/UIComponent/classes/class.ilUIPluginRouterGUI.php', 'children' => array ( 0 => 'ilbuddysystemgui', @@ -12331,9 +12402,9 @@ ), 'iluploadlimitsoverviewgui' => array ( - 'cid' => '150', + 'cid' => '156', 'class_name' => 'ilUploadLimitsOverviewGUI', - 'class_path' => './Services/FileServices/classes/UploadService/UploadLimits/class.ilUploadLimitsOverviewGUI.php', + 'class_path' => './components/ILIAS/FileServices/classes/UploadService/UploadLimits/class.ilUploadLimitsOverviewGUI.php', 'children' => array ( ), @@ -12344,9 +12415,9 @@ ), 'iluseractionadmingui' => array ( - 'cid' => '152', + 'cid' => '158', 'class_name' => 'ilUserActionAdminGUI', - 'class_path' => './Services/User/classes/Actions/class.ilUserActionAdminGUI.php', + 'class_path' => './components/ILIAS/User/classes/Actions/class.ilUserActionAdminGUI.php', 'children' => array ( ), @@ -12359,9 +12430,9 @@ ), 'ilusercertificateapigui' => array ( - 'cid' => '155', + 'cid' => '15b', 'class_name' => 'ilUserCertificateApiGUI', - 'class_path' => './Services/Certificate/classes/API/Download/class.ilUserCertificateApiGUI.php', + 'class_path' => './components/ILIAS/Certificate/classes/API/Download/class.ilUserCertificateApiGUI.php', 'children' => array ( ), @@ -12372,9 +12443,9 @@ ), 'ilusercertificategui' => array ( - 'cid' => '156', + 'cid' => '15c', 'class_name' => 'ilUserCertificateGUI', - 'class_path' => './Services/Certificate/classes/User/class.ilUserCertificateGUI.php', + 'class_path' => './components/ILIAS/Certificate/classes/User/class.ilUserCertificateGUI.php', 'children' => array ( ), @@ -12386,9 +12457,9 @@ ), 'iluserfiltergui' => array ( - 'cid' => '15a', + 'cid' => '15g', 'class_name' => 'ilUserFilterGUI', - 'class_path' => './Services/Search/classes/class.ilUserFilterGUI.php', + 'class_path' => './components/ILIAS/Search/classes/class.ilUserFilterGUI.php', 'children' => array ( ), @@ -12399,9 +12470,9 @@ ), 'iluserprivacysettingsgui' => array ( - 'cid' => '15e', + 'cid' => '15k', 'class_name' => 'ilUserPrivacySettingsGUI', - 'class_path' => './Services/User/classes/Settings/class.ilUserPrivacySettingsGUI.php', + 'class_path' => './components/ILIAS/User/classes/Settings/class.ilUserPrivacySettingsGUI.php', 'children' => array ( ), @@ -12412,9 +12483,9 @@ ), 'iluserprofileinfosettingsgui' => array ( - 'cid' => '15g', + 'cid' => '15m', 'class_name' => 'ilUserProfileInfoSettingsGUI', - 'class_path' => './Services/User/classes/ProfilePrompt/class.ilUserProfileInfoSettingsGUI.php', + 'class_path' => './components/ILIAS/User/classes/ProfilePrompt/class.ilUserProfileInfoSettingsGUI.php', 'children' => array ( ), @@ -12425,9 +12496,9 @@ ), 'iluserstartingpointgui' => array ( - 'cid' => '15i', + 'cid' => '15o', 'class_name' => 'ilUserStartingPointGUI', - 'class_path' => './Services/User/classes/class.ilUserStartingPointGUI.php', + 'class_path' => './components/ILIAS/User/classes/class.ilUserStartingPointGUI.php', 'children' => array ( ), @@ -12438,9 +12509,9 @@ ), 'ilusertablegui' => array ( - 'cid' => '15j', + 'cid' => '15p', 'class_name' => 'ilUserTableGUI', - 'class_path' => './Services/User/classes/class.ilUserTableGUI.php', + 'class_path' => './components/ILIAS/User/classes/class.ilUserTableGUI.php', 'children' => array ( 0 => 'ilformpropertydispatchgui', @@ -12458,9 +12529,9 @@ ), 'ilusersgallerygui' => array ( - 'cid' => '15k', + 'cid' => '15q', 'class_name' => 'ilUsersGalleryGUI', - 'class_path' => './Services/User/classes/Gallery/class.ilUsersGalleryGUI.php', + 'class_path' => './components/ILIAS/User/classes/Gallery/class.ilUsersGalleryGUI.php', 'children' => array ( 0 => 'ilpublicuserprofilegui', @@ -12474,11 +12545,24 @@ 4 => 'ilsessionmembershipgui', ), ), + 'ilvalidtestplugingui' => + array ( + 'cid' => '15r', + 'class_name' => 'ilValidTestPluginGUI', + 'class_path' => './components/ILIAS/UICore/test/Data/Plugins/Valid/Services/UIComponent/UserInterfaceHook/ValidTestPlugin/classes/class.ilValidTestPluginGUI.php', + 'children' => + array ( + ), + 'parents' => + array ( + 0 => 'ilctrlbaseclass1testgui', + ), + ), 'ilwopiadministrationgui' => array ( - 'cid' => '15m', + 'cid' => '15t', 'class_name' => 'ilWOPIAdministrationGUI', - 'class_path' => './Services/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php', + 'class_path' => './components/ILIAS/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php', 'children' => array ( ), @@ -12489,9 +12573,9 @@ ), 'ilwopiembeddedapplicationgui' => array ( - 'cid' => '15n', + 'cid' => '15u', 'class_name' => 'ilWOPIEmbeddedApplicationGUI', - 'class_path' => './Services/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php', + 'class_path' => './components/ILIAS/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php', 'children' => array ( ), @@ -12503,9 +12587,9 @@ ), 'ilwebdavmountinstructionsuploadgui' => array ( - 'cid' => '15t', + 'cid' => '160', 'class_name' => 'ilWebDAVMountInstructionsUploadGUI', - 'class_path' => './Services/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsUploadGUI.php', + 'class_path' => './components/ILIAS/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsUploadGUI.php', 'children' => array ( ), @@ -12516,7 +12600,7 @@ ), 'ilwikihandlergui' => array ( - 'cid' => '160', + 'cid' => '167', 'class_name' => 'ilWikiHandlerGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilWikiHandlerGUI.php', 'children' => @@ -12529,7 +12613,7 @@ ), 'ilwikipagegui' => array ( - 'cid' => '163', + 'cid' => '16a', 'class_name' => 'ilWikiPageGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilWikiPageGUI.php', 'children' => @@ -12553,7 +12637,7 @@ ), 'ilwikipagetemplategui' => array ( - 'cid' => '164', + 'cid' => '16b', 'class_name' => 'ilWikiPageTemplateGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilWikiPageTemplateGUI.php', 'children' => @@ -12566,7 +12650,7 @@ ), 'ilwikistatgui' => array ( - 'cid' => '169', + 'cid' => '16g', 'class_name' => 'ilWikiStatGUI', 'class_path' => './components/ILIAS/Wiki/classes/class.ilWikiStatGUI.php', 'children' => @@ -12580,9 +12664,9 @@ ), 'ilworkspaceaccessgui' => array ( - 'cid' => '16a', + 'cid' => '16h', 'class_name' => 'ilWorkspaceAccessGUI', - 'class_path' => './Services/PersonalWorkspace/classes/class.ilWorkspaceAccessGUI.php', + 'class_path' => './components/ILIAS/PersonalWorkspace/classes/class.ilWorkspaceAccessGUI.php', 'children' => array ( 0 => 'ilmailsearchcoursesgui', diff --git a/components/ILIAS/UICore/classes/Cache/BlockCache.php b/components/ILIAS/UICore/classes/Cache/BlockCache.php index 6ebfff7e6ea6..1b6e11258473 100644 --- a/components/ILIAS/UICore/classes/Cache/BlockCache.php +++ b/components/ILIAS/UICore/classes/Cache/BlockCache.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\UICore\Cache; +namespace ILIAS\components\UICore\Cache; use ILIAS\Cache\Container\Request; diff --git a/components/ILIAS/UICore/classes/Cache/TemplateCache.php b/components/ILIAS/UICore/classes/Cache/TemplateCache.php index a46639572018..e8486b4c0a70 100644 --- a/components/ILIAS/UICore/classes/Cache/TemplateCache.php +++ b/components/ILIAS/UICore/classes/Cache/TemplateCache.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\UICore\Cache; +namespace ILIAS\components\UICore\Cache; use ILIAS\Cache\Container\Request; diff --git a/components/ILIAS/UICore/classes/Cache/VariableCache.php b/components/ILIAS/UICore/classes/Cache/VariableCache.php index 476fbbc4f209..2660f672aca7 100644 --- a/components/ILIAS/UICore/classes/Cache/VariableCache.php +++ b/components/ILIAS/UICore/classes/Cache/VariableCache.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\UICore\Cache; +namespace ILIAS\components\UICore\Cache; use ILIAS\Cache\Container\Request; diff --git a/components/ILIAS/UICore/classes/MetaTemplate/PageContentGUI.php b/components/ILIAS/UICore/classes/MetaTemplate/PageContentGUI.php index c0782aef7da3..386c8896f0ac 100644 --- a/components/ILIAS/UICore/classes/MetaTemplate/PageContentGUI.php +++ b/components/ILIAS/UICore/classes/MetaTemplate/PageContentGUI.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\UICore\MetaTemplate; +namespace ILIAS\components\UICore\MetaTemplate; use ilGlobalTemplateInterface; use InvalidArgumentException; diff --git a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlBaseClassArtifactObjective.php b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlBaseClassArtifactObjective.php index 3e536127efc0..5f819dfd0ddf 100644 --- a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlBaseClassArtifactObjective.php +++ b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlBaseClassArtifactObjective.php @@ -19,7 +19,7 @@ class ilCtrlBaseClassArtifactObjective extends BuildArtifactObjective /** * @var string relative path to the php artifact file. */ - public const ARTIFACT_PATH = "./Services/UICore/artifacts/ctrl_base_classes.php"; + public const ARTIFACT_PATH = "./components/ILIAS/UICore/artifacts/ctrl_base_classes.php"; /** * @inheritDoc diff --git a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlSecurityArtifactObjective.php b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlSecurityArtifactObjective.php index 91474da8e63e..f991e7662b44 100644 --- a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlSecurityArtifactObjective.php +++ b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlSecurityArtifactObjective.php @@ -4,7 +4,7 @@ /* Copyright (c) 2021 Thibeau Fuhrer Extended GPL, see docs/LICENSE */ -require_once __DIR__ . "/../../../../../libs/composer/vendor/autoload.php"; +require_once __DIR__ . "/../../../../../../libs/composer/vendor/autoload.php"; use ILIAS\Setup\Artifact\BuildArtifactObjective; use ILIAS\Setup\ImplementationOfInterfaceFinder; @@ -21,7 +21,7 @@ class ilCtrlSecurityArtifactObjective extends BuildArtifactObjective /** * @var string relative path to the php artifact file. */ - public const ARTIFACT_PATH = "./Services/UICore/artifacts/ctrl_security.php"; + public const ARTIFACT_PATH = "./components/ILIAS/UICore/artifacts/ctrl_security.php"; /** * @inheritDoc diff --git a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlStructureArtifactObjective.php b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlStructureArtifactObjective.php index 5177af792486..8902ffb20f30 100644 --- a/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlStructureArtifactObjective.php +++ b/components/ILIAS/UICore/classes/Setup/Artifact/class.ilCtrlStructureArtifactObjective.php @@ -19,7 +19,7 @@ class ilCtrlStructureArtifactObjective extends BuildArtifactObjective /** * @var string relative path to the php artifact file. */ - public const ARTIFACT_PATH = "./Services/UICore/artifacts/ctrl_structure.php"; + public const ARTIFACT_PATH = "./components/ILIAS/UICore/artifacts/ctrl_structure.php"; /** * @inheritDoc @@ -34,7 +34,7 @@ public function getArtifactPath(): string */ public function build(): Artifact { - $ilias_path = dirname(__FILE__, 6); + $ilias_path = dirname(__FILE__, 7); $class_map = require $ilias_path . "/libs/composer/vendor/composer/autoload_classmap.php"; return new ArrayArtifact( diff --git a/components/ILIAS/UICore/classes/Structure/class.ilCtrlStructureReader.php b/components/ILIAS/UICore/classes/Structure/class.ilCtrlStructureReader.php index d39597ae4b6b..0a3b304a8675 100644 --- a/components/ILIAS/UICore/classes/Structure/class.ilCtrlStructureReader.php +++ b/components/ILIAS/UICore/classes/Structure/class.ilCtrlStructureReader.php @@ -4,7 +4,7 @@ /* Copyright (c) 2021 Thibeau Fuhrer Extended GPL, see docs/LICENSE */ -require_once __DIR__ . '/../../../../libs/composer/vendor/autoload.php'; +require_once __DIR__ . '/../../../../../libs/composer/vendor/autoload.php'; /** * Class ilCtrlStructureReader is responsible for reading @@ -72,7 +72,7 @@ public function __construct(ilCtrlIteratorInterface $iterator, ilCtrlStructureCi { $this->ilias_path = rtrim( (defined('ILIAS_ABSOLUTE_PATH')) ? - ILIAS_ABSOLUTE_PATH : dirname(__FILE__, 5), + ILIAS_ABSOLUTE_PATH : dirname(__FILE__, 6), '/' ); diff --git a/components/ILIAS/UICore/classes/class.ilCtrl.php b/components/ILIAS/UICore/classes/class.ilCtrl.php index d891e9a19524..0b9bf84d5fac 100644 --- a/components/ILIAS/UICore/classes/class.ilCtrl.php +++ b/components/ILIAS/UICore/classes/class.ilCtrl.php @@ -1000,7 +1000,7 @@ private function modifyUrlWithPluginHooks(string $target_url): string $html = $plugin_instance ->getUIClassInstance() ->getHTML( - 'Services/Utilities', + 'components/ILIAS/Utilities', 'redirect', ["html" => $target_url] ); diff --git a/components/ILIAS/UICore/classes/class.ilGlobalPageTemplate.php b/components/ILIAS/UICore/classes/class.ilGlobalPageTemplate.php index cbbe50d0f0d7..bb10f7916213 100644 --- a/components/ILIAS/UICore/classes/class.ilGlobalPageTemplate.php +++ b/components/ILIAS/UICore/classes/class.ilGlobalPageTemplate.php @@ -22,7 +22,7 @@ use ILIAS\DI\UIServices; use ILIAS\GlobalScreen\Services; use ILIAS\Notifications\ilNotificationOSDGUI; -use ILIAS\Services\UICore\MetaTemplate\PageContentGUI; +use ILIAS\components\UICore\MetaTemplate\PageContentGUI; use ILIAS\UI\NotImplementedException; use ILIAS\UICore\PageContentProvider; use ILIAS\Accessibility\GlobalPageHandler; @@ -97,7 +97,7 @@ protected function prepareBasicJS(): void { iljQueryUtil::initjQuery($this); iljQueryUtil::initjQueryUI($this); - $this->gs->layout()->meta()->addJs("./Services/JavaScript/js/Basic.js", true, 1); + $this->gs->layout()->meta()->addJs("./components/ILIAS/JavaScript/js/Basic.js", true, 1); ilUIFramework::init($this); ilBuddySystemGUI::initializeFrontend($this); ilOnScreenChatGUI::initializeFrontend($this); diff --git a/components/ILIAS/UICore/classes/class.ilGlobalTemplate.php b/components/ILIAS/UICore/classes/class.ilGlobalTemplate.php index a71cbab74448..3c888332ee2f 100644 --- a/components/ILIAS/UICore/classes/class.ilGlobalTemplate.php +++ b/components/ILIAS/UICore/classes/class.ilGlobalTemplate.php @@ -36,7 +36,7 @@ class ilGlobalTemplate implements ilGlobalTemplateInterface * @var string[] */ protected array $js_files = [ - "./Services/JavaScript/js/Basic.js", + "./components/ILIAS/JavaScript/js/Basic.js", ]; /** @@ -44,7 +44,7 @@ class ilGlobalTemplate implements ilGlobalTemplateInterface * @var array */ protected array $js_files_vp = [ - "./Services/JavaScript/js/Basic.js" => true, + "./components/ILIAS/JavaScript/js/Basic.js" => true, ]; /** @@ -52,7 +52,7 @@ class ilGlobalTemplate implements ilGlobalTemplateInterface * @var array */ protected array $js_files_batch = [ - "./Services/JavaScript/js/Basic.js" => 1, + "./components/ILIAS/JavaScript/js/Basic.js" => 1, ]; /** @@ -199,7 +199,7 @@ public function addJavaScript(string $a_js_file, bool $a_add_version_parameter = } // ensure jquery files being loaded first - if (is_int(strpos($a_js_file, "Services/jQuery")) || + if (is_int(strpos($a_js_file, "components/ILIAS/jQuery")) || is_int(strpos($a_js_file, "/jquery.js")) || is_int(strpos($a_js_file, "/jquery/")) || is_int(strpos($a_js_file, "/jquery-ui/")) || @@ -665,7 +665,7 @@ public function setLocator(): void $html = ""; $uip = new ilUIHookProcessor( - "Services/Locator", + "components/ILIAS/Locator", "main_locator", ["locator_gui" => $ilLocator] ); diff --git a/components/ILIAS/UICore/lib/html-it/IT.php b/components/ILIAS/UICore/lib/html-it/IT.php index 57ab53cbbdaa..b84452644e34 100644 --- a/components/ILIAS/UICore/lib/html-it/IT.php +++ b/components/ILIAS/UICore/lib/html-it/IT.php @@ -32,9 +32,9 @@ // | Author: Ulf Wendel | // | Pierre-Alain Joye | // +----------------------------------------------------------------------+ -use ILIAS\Services\UICore\Cache\BlockCache; -use ILIAS\Services\UICore\Cache\VariableCache; -use ILIAS\Services\UICore\Cache\TemplateCache; +use ILIAS\components\UICore\Cache\BlockCache; +use ILIAS\components\UICore\Cache\VariableCache; +use ILIAS\components\UICore\Cache\TemplateCache; use ILIAS\Refinery\Custom\Transformation; use ILIAS\Refinery\To\Transformation\ListTransformation; use ILIAS\Refinery\To\Transformation\StringTransformation; diff --git a/components/ILIAS/UICore/test/Data/ClassMaps/invalid_class_map.php b/components/ILIAS/UICore/test/Data/ClassMaps/invalid_class_map.php index 10d09dfefe71..a8165e2b52fd 100644 --- a/components/ILIAS/UICore/test/Data/ClassMaps/invalid_class_map.php +++ b/components/ILIAS/UICore/test/Data/ClassMaps/invalid_class_map.php @@ -4,7 +4,7 @@ /* Copyright (c) 2021 Thibeau Fuhrer Extended GPL, see docs/LICENSE */ -$data_dir = dirname(__DIR__, 2); +$data_dir = dirname(__DIR__, 3); // the returned data is invalid due to the paths violating // the ILIAS naming scheme 'class.GUI.php'. diff --git a/components/ILIAS/UICore/test/Data/Structure/test_ctrl_structure.php b/components/ILIAS/UICore/test/Data/Structure/test_ctrl_structure.php index f108789ac6b3..eb4dfb593c87 100644 --- a/components/ILIAS/UICore/test/Data/Structure/test_ctrl_structure.php +++ b/components/ILIAS/UICore/test/Data/Structure/test_ctrl_structure.php @@ -23,7 +23,7 @@ 'ilctrlbaseclass1testgui' => [ ilCtrlStructureInterface::KEY_CLASS_CID => '0', ilCtrlStructureInterface::KEY_CLASS_NAME => 'ilCtrlBaseClass1TestGUI', - ilCtrlStructureInterface::KEY_CLASS_PATH => './Services/UICore/test/Data/GUI/class.ilCtrlBaseClass1TestGUI.php', + ilCtrlStructureInterface::KEY_CLASS_PATH => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlBaseClass1TestGUI.php', ilCtrlStructureInterface::KEY_CLASS_PARENTS => [], ilCtrlStructureInterface::KEY_CLASS_CHILDREN => [ 'ilctrlcommandclass1testgui', @@ -34,7 +34,7 @@ 'ilctrlbaseclass2testgui' => [ ilCtrlStructureInterface::KEY_CLASS_CID => '1', ilCtrlStructureInterface::KEY_CLASS_NAME => 'ilCtrlBaseClass2TestGUI', - ilCtrlStructureInterface::KEY_CLASS_PATH => './Services/UICore/test/Data/GUI/class.ilCtrlBaseClass2TestGUI.php', + ilCtrlStructureInterface::KEY_CLASS_PATH => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlBaseClass2TestGUI.php', ilCtrlStructureInterface::KEY_CLASS_PARENTS => [ 'ilctrlcommandclass1testgui' ], @@ -46,7 +46,7 @@ 'ilctrlcommandclass1testgui' => [ ilCtrlStructureInterface::KEY_CLASS_CID => '2', ilCtrlStructureInterface::KEY_CLASS_NAME => 'ilCtrlCommandClass1TestGUI', - ilCtrlStructureInterface::KEY_CLASS_PATH => './Services/UICore/test/Data/GUI/class.ilCtrlCommandClass1TestGUI.php', + ilCtrlStructureInterface::KEY_CLASS_PATH => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlCommandClass1TestGUI.php', ilCtrlStructureInterface::KEY_CLASS_PARENTS => [ 'ilctrlbaseclass1testgui', 'ilctrlbaseclass2testgui', @@ -60,7 +60,7 @@ 'ilctrlcommandclass2testgui' => [ ilCtrlStructureInterface::KEY_CLASS_CID => '3', ilCtrlStructureInterface::KEY_CLASS_NAME => 'ilCtrlCommandClass2TestGUI', - ilCtrlStructureInterface::KEY_CLASS_PATH => './Services/UICore/test/Data/GUI/class.ilCtrlCommandClass2TestGUI.php', + ilCtrlStructureInterface::KEY_CLASS_PATH => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlCommandClass2TestGUI.php', ilCtrlStructureInterface::KEY_CLASS_PARENTS => [ 'ilctrlcommandclass1testgui', ], @@ -70,7 +70,7 @@ 'ilias\\tests\\ctrl\\ilctrlnamespacedtestgui' => [ ilCtrlStructureInterface::KEY_CLASS_CID => '4', ilCtrlStructureInterface::KEY_CLASS_NAME => 'ILIAS\\Tests\\Ctrl\\ilCtrlNamespacedTestGUI', - ilCtrlStructureInterface::KEY_CLASS_PATH => './Services/UICore/test/Data/GUI/class.ilCtrlNamespacedTestGUI.php', + ilCtrlStructureInterface::KEY_CLASS_PATH => './components/ILIAS/UICore/test/Data/GUI/class.ilCtrlNamespacedTestGUI.php', ilCtrlStructureInterface::KEY_CLASS_PARENTS => [ 'ilctrlbaseclass1testgui', ], diff --git a/components/ILIAS/UI/README.md b/components/ILIAS/UI_/README.md similarity index 100% rename from components/ILIAS/UI/README.md rename to components/ILIAS/UI_/README.md diff --git a/components/ILIAS/UI/classes/class.ilUIAsyncDemoFileUploadHandler.php b/components/ILIAS/UI_/classes/class.ilUIAsyncDemoFileUploadHandler.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIAsyncDemoFileUploadHandler.php rename to components/ILIAS/UI_/classes/class.ilUIAsyncDemoFileUploadHandler.php diff --git a/components/ILIAS/UI/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php b/components/ILIAS/UI_/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php rename to components/ILIAS/UI_/classes/class.ilUIAsyncDemoFileUploadHandlerGUI.php diff --git a/components/ILIAS/UI/classes/class.ilUIDemoFileUploadHandlerGUI.php b/components/ILIAS/UI_/classes/class.ilUIDemoFileUploadHandlerGUI.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIDemoFileUploadHandlerGUI.php rename to components/ILIAS/UI_/classes/class.ilUIDemoFileUploadHandlerGUI.php diff --git a/components/ILIAS/UI/classes/class.ilUIFilterRequestAdapter.php b/components/ILIAS/UI_/classes/class.ilUIFilterRequestAdapter.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIFilterRequestAdapter.php rename to components/ILIAS/UI_/classes/class.ilUIFilterRequestAdapter.php diff --git a/components/ILIAS/UI/classes/class.ilUIFilterService.php b/components/ILIAS/UI_/classes/class.ilUIFilterService.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIFilterService.php rename to components/ILIAS/UI_/classes/class.ilUIFilterService.php diff --git a/components/ILIAS/UI/classes/class.ilUIFilterServiceSessionGateway.php b/components/ILIAS/UI_/classes/class.ilUIFilterServiceSessionGateway.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIFilterServiceSessionGateway.php rename to components/ILIAS/UI_/classes/class.ilUIFilterServiceSessionGateway.php diff --git a/components/ILIAS/UI/classes/class.ilUIMarkdownPreviewGUI.php b/components/ILIAS/UI_/classes/class.ilUIMarkdownPreviewGUI.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIMarkdownPreviewGUI.php rename to components/ILIAS/UI_/classes/class.ilUIMarkdownPreviewGUI.php diff --git a/components/ILIAS/UI/classes/class.ilUIService.php b/components/ILIAS/UI_/classes/class.ilUIService.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIService.php rename to components/ILIAS/UI_/classes/class.ilUIService.php diff --git a/components/ILIAS/UI/classes/class.ilUIServiceDependencies.php b/components/ILIAS/UI_/classes/class.ilUIServiceDependencies.php similarity index 100% rename from components/ILIAS/UI/classes/class.ilUIServiceDependencies.php rename to components/ILIAS/UI_/classes/class.ilUIServiceDependencies.php diff --git a/components/ILIAS/UI/test/UIFilterServiceSessionGatewayTest.php b/components/ILIAS/UI_/test/UIFilterServiceSessionGatewayTest.php similarity index 100% rename from components/ILIAS/UI/test/UIFilterServiceSessionGatewayTest.php rename to components/ILIAS/UI_/test/UIFilterServiceSessionGatewayTest.php diff --git a/components/ILIAS/UI/test/ilServiceUISuite.php b/components/ILIAS/UI_/test/ilServiceUISuite.php similarity index 92% rename from components/ILIAS/UI/test/ilServiceUISuite.php rename to components/ILIAS/UI_/test/ilServiceUISuite.php index a1152d51fdc4..f65c52f26670 100644 --- a/components/ILIAS/UI/test/ilServiceUISuite.php +++ b/components/ILIAS/UI_/test/ilServiceUISuite.php @@ -33,7 +33,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Skill/test/ilUIFilterTest.php"); + require_once("./components/ILIAS/Skill/test/ilUIFilterTest.php"); $suite->addTestSuite(UIFilterServiceSessionGatewayTest::class); return $suite; diff --git a/components/ILIAS/User/classes/Actions/class.ilUserActionAdminTableGUI.php b/components/ILIAS/User/classes/Actions/class.ilUserActionAdminTableGUI.php index f5d1e560d4d0..b88aca4e6ef8 100644 --- a/components/ILIAS/User/classes/Actions/class.ilUserActionAdminTableGUI.php +++ b/components/ILIAS/User/classes/Actions/class.ilUserActionAdminTableGUI.php @@ -42,7 +42,7 @@ public function __construct( $this->addColumn($this->lng->txt("active"), "", "1"); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.user_action_admin_row.html", "Services/User"); + $this->setRowTemplate("tpl.user_action_admin_row.html", "components/ILIAS/User"); //$this->addMultiCommand("", $this->lng->txt("")); if ($a_write_permission) { diff --git a/components/ILIAS/User/classes/Actions/class.ilUserActionContextFactory.php b/components/ILIAS/User/classes/Actions/class.ilUserActionContextFactory.php index a6a3fd7c67ae..70a38aaaf9b2 100644 --- a/components/ILIAS/User/classes/Actions/class.ilUserActionContextFactory.php +++ b/components/ILIAS/User/classes/Actions/class.ilUserActionContextFactory.php @@ -24,11 +24,11 @@ class ilUserActionContextFactory { protected static array $contexts = [ [ - "component" => "Services/Awareness", + "component" => "components/ILIAS/Awareness", "class" => "ilAwarenessUserActionContext" ], [ - "component" => "Services/User/Gallery", + "component" => "components/ILIAS/User/Gallery", "class" => "ilGalleryUserActionContext" ] ]; diff --git a/components/ILIAS/User/classes/Actions/class.ilUserActionProviderFactory.php b/components/ILIAS/User/classes/Actions/class.ilUserActionProviderFactory.php index d4b5d91f9aac..291554f25d94 100644 --- a/components/ILIAS/User/classes/Actions/class.ilUserActionProviderFactory.php +++ b/components/ILIAS/User/classes/Actions/class.ilUserActionProviderFactory.php @@ -20,23 +20,23 @@ class ilUserActionProviderFactory { private const PROVIDERS = [ [ - "component" => "Services/Contact/BuddySystem", + "component" => "components/ILIAS/Contact/BuddySystem", "class" => "ilContactUserActionProvider" ], [ - "component" => "Services/User/Actions", + "component" => "components/ILIAS/User/Actions", "class" => "ilMailUserActionProvider" ], [ - "component" => "Services/User/Actions", + "component" => "components/ILIAS/User/Actions", "class" => "ilUserUserActionProvider" ], [ - "component" => "Services/User/Actions", + "component" => "components/ILIAS/User/Actions", "class" => "ilWorkspaceUserActionProvider" ], [ - "component" => "Services/User/Actions", + "component" => "components/ILIAS/User/Actions", "class" => "ilChatUserActionProvider" ], [ diff --git a/components/ILIAS/User/classes/Avatar/class.ilUserAvatarLetter.php b/components/ILIAS/User/classes/Avatar/class.ilUserAvatarLetter.php index 34222f4cdcdd..6a68c798d978 100644 --- a/components/ILIAS/User/classes/Avatar/class.ilUserAvatarLetter.php +++ b/components/ILIAS/User/classes/Avatar/class.ilUserAvatarLetter.php @@ -43,7 +43,7 @@ public function getUrl(): string } // general idea, see https://gist.github.com/vctrfrnndz/fab6f839aaed0de566b0 $color = self::$colors[crc32($this->name) % $amount_of_colors]; - $tpl = new \ilTemplate('tpl.letter_avatar.svg', true, true, 'Services/User'); + $tpl = new \ilTemplate('tpl.letter_avatar.svg', true, true, 'components/ILIAS/User'); $tpl->setVariable('COLOR', $color); $tpl->setVariable('SHORT', $this->name); diff --git a/components/ILIAS/User/classes/ChangedUserFieldAttribute.php b/components/ILIAS/User/classes/ChangedUserFieldAttribute.php index 33d407389992..5e28a96cd027 100644 --- a/components/ILIAS/User/classes/ChangedUserFieldAttribute.php +++ b/components/ILIAS/User/classes/ChangedUserFieldAttribute.php @@ -18,7 +18,7 @@ * *********************************************************************/ -namespace ILIAS\Services\User; +namespace ILIAS\components\User; /** * Class ChangedUserFieldAttribute diff --git a/components/ILIAS/User/classes/Cron/class.ilCronDeleteInactivatedUserAccounts.php b/components/ILIAS/User/classes/Cron/class.ilCronDeleteInactivatedUserAccounts.php index a3572f75f112..e0888f24d45d 100644 --- a/components/ILIAS/User/classes/Cron/class.ilCronDeleteInactivatedUserAccounts.php +++ b/components/ILIAS/User/classes/Cron/class.ilCronDeleteInactivatedUserAccounts.php @@ -24,7 +24,7 @@ /** * This cron deletes user accounts by INACTIVATION period * @author Bjoern Heyser - * @package Services/User + * @package components/ILIAS/User */ class ilCronDeleteInactivatedUserAccounts extends ilCronJob { diff --git a/components/ILIAS/User/classes/Gallery/class.ilUsersGalleryGUI.php b/components/ILIAS/User/classes/Gallery/class.ilUsersGalleryGUI.php index 3315dde11d79..da76b718f4f2 100644 --- a/components/ILIAS/User/classes/Gallery/class.ilUsersGalleryGUI.php +++ b/components/ILIAS/User/classes/Gallery/class.ilUsersGalleryGUI.php @@ -109,7 +109,7 @@ protected function view(): void */ protected function populateTemplate(array $gallery_groups): ilTemplate { - $tpl = new ilTemplate('tpl.users_gallery.html', true, true, 'Services/User'); + $tpl = new ilTemplate('tpl.users_gallery.html', true, true, 'components/ILIAS/User'); $panel = ilPanelGUI::getInstance(); $panel->setBody($this->lng->txt('no_gallery_users_available')); diff --git a/components/ILIAS/User/classes/InterestedUserFieldAttribute.php b/components/ILIAS/User/classes/InterestedUserFieldAttribute.php index 8d1fc14480d0..4d31882dddca 100644 --- a/components/ILIAS/User/classes/InterestedUserFieldAttribute.php +++ b/components/ILIAS/User/classes/InterestedUserFieldAttribute.php @@ -18,7 +18,7 @@ * *********************************************************************/ -namespace ILIAS\Services\User; +namespace ILIAS\components\User; use ilLanguage; use ilObjUserFolderGUI; diff --git a/components/ILIAS/User/classes/InterestedUserFieldChangeListener.php b/components/ILIAS/User/classes/InterestedUserFieldChangeListener.php index e1aa6f829126..c4e6a0786501 100644 --- a/components/ILIAS/User/classes/InterestedUserFieldChangeListener.php +++ b/components/ILIAS/User/classes/InterestedUserFieldChangeListener.php @@ -18,7 +18,7 @@ * *********************************************************************/ -namespace ILIAS\Services\User; +namespace ILIAS\components\User; /** * Class InterestedUserFieldChangeListener diff --git a/components/ILIAS/User/classes/InterestedUserFieldComponent.php b/components/ILIAS/User/classes/InterestedUserFieldComponent.php index c246fda088d4..92ebe85fb6e1 100644 --- a/components/ILIAS/User/classes/InterestedUserFieldComponent.php +++ b/components/ILIAS/User/classes/InterestedUserFieldComponent.php @@ -18,7 +18,7 @@ * *********************************************************************/ -namespace ILIAS\Services\User; +namespace ILIAS\components\User; /** * Class InterestedUserFieldComponent diff --git a/components/ILIAS/User/classes/Profile/class.ilPublicUserProfileGUI.php b/components/ILIAS/User/classes/Profile/class.ilPublicUserProfileGUI.php index c267e2f69378..ae8bbe58d651 100644 --- a/components/ILIAS/User/classes/Profile/class.ilPublicUserProfileGUI.php +++ b/components/ILIAS/User/classes/Profile/class.ilPublicUserProfileGUI.php @@ -292,7 +292,7 @@ public function getEmbeddable(bool $a_add_goto = false): string 'tpl.usr_public_profile.html', true, true, - 'Services/User' + 'components/ILIAS/User' ); diff --git a/components/ILIAS/User/classes/Settings/class.ilUserPrivacySettingsGUI.php b/components/ILIAS/User/classes/Settings/class.ilUserPrivacySettingsGUI.php index aa5d69decdba..4e50c51a37de 100644 --- a/components/ILIAS/User/classes/Settings/class.ilUserPrivacySettingsGUI.php +++ b/components/ILIAS/User/classes/Settings/class.ilUserPrivacySettingsGUI.php @@ -497,7 +497,7 @@ protected function appendChatJsToTemplate( ): ilTemplate { $tpl = new ilTemplate('tpl.personal_chat_settings_form.html', true, true, 'components/ILIAS/Chatroom'); if ($this->shouldShowOnScreenChatOptions() && $this->chatSettings->get('enable_browser_notifications', '0')) { - $pageTemplate->addJavaScript('./Services/Notifications/js/browser_notifications.js'); + $pageTemplate->addJavaScript('./components/ILIAS/Notifications/js/browser_notifications.js'); $tpl->setVariable('ALERT_IMAGE_SRC', ilUtil::getImagePath('standard/icon_alert.svg')); $tpl->setVariable('BROWSER_NOTIFICATION_TOGGLE_LABEL', $this->lng->txt('osc_enable_browser_notifications_label')); diff --git a/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php b/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php index 53c99410ed09..7f3fb33f84e9 100644 --- a/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php +++ b/components/ILIAS/User/classes/Setup/class.ilUserSetupAgent.php @@ -73,7 +73,7 @@ public function getBuildArtifactObjective(): Setup\Objective public function getStatusObjective(Setup\Metrics\Storage $storage): Setup\Objective { return new ObjectiveCollection( - 'Services/User', + 'components/ILIAS/User', true, new ilDatabaseUpdateStepsMetricsCollectedObjective( $storage, diff --git a/components/ILIAS/User/classes/UserFieldAttributesChangeListener.php b/components/ILIAS/User/classes/UserFieldAttributesChangeListener.php index c0f799901e15..814ddf556c8c 100644 --- a/components/ILIAS/User/classes/UserFieldAttributesChangeListener.php +++ b/components/ILIAS/User/classes/UserFieldAttributesChangeListener.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace ILIAS\Services\User; +namespace ILIAS\components\User; use ILIAS\DI\Container; use ilLanguage; @@ -30,7 +30,7 @@ abstract public function getDescriptionForField(string $fieldName, string $attri /** * Should return the component name like it would be used to raise an event * @return string - * @example "Services/Mail" + * @example "components/ILIAS/Mail" */ abstract public function getComponentName(): string; } diff --git a/components/ILIAS/User/classes/class.ilCustomUserFieldSettingsTableGUI.php b/components/ILIAS/User/classes/class.ilCustomUserFieldSettingsTableGUI.php index 65b580ae1801..b35931011699 100644 --- a/components/ILIAS/User/classes/class.ilCustomUserFieldSettingsTableGUI.php +++ b/components/ILIAS/User/classes/class.ilCustomUserFieldSettingsTableGUI.php @@ -61,7 +61,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate('tpl.std_fields_settings_row.html', 'Services/User'); + $this->setRowTemplate('tpl.std_fields_settings_row.html', 'components/ILIAS/User'); $this->disable('footer'); $this->setEnableTitle(true); diff --git a/components/ILIAS/User/classes/class.ilCustomUserFieldsHelper.php b/components/ILIAS/User/classes/class.ilCustomUserFieldsHelper.php index 00a48fc38b1c..1672f9b0bd37 100644 --- a/components/ILIAS/User/classes/class.ilCustomUserFieldsHelper.php +++ b/components/ILIAS/User/classes/class.ilCustomUserFieldsHelper.php @@ -17,7 +17,7 @@ *********************************************************************/ // still needed, since constants are defined in ilUserDefinedFields -include_once("./Services/User/classes/class.ilUserDefinedFields.php"); +include_once("./components/ILIAS/User/classes/class.ilUserDefinedFields.php"); /** * @author Stefan Meyer diff --git a/components/ILIAS/User/classes/class.ilObjUser.php b/components/ILIAS/User/classes/class.ilObjUser.php index 339df5b652fe..334f62332a24 100644 --- a/components/ILIAS/User/classes/class.ilObjUser.php +++ b/components/ILIAS/User/classes/class.ilObjUser.php @@ -436,7 +436,7 @@ public function saveAsNew(): void $mail_options->createMailOptionsEntry(); $ilAppEventHandler->raise( - "Services/User", + "components/ILIAS/User", "afterCreate", ["user_obj" => $this] ); @@ -545,7 +545,7 @@ public function update(): bool $this->read(); $ilAppEventHandler->raise( - "Services/User", + "components/ILIAS/User", "afterUpdate", ["user_obj" => $this] ); @@ -759,7 +759,7 @@ public function refreshLogin(): void [$this->id] ); $this->app_event_handler->raise( - "Services/User", + "components/ILIAS/User", "firstLogin", ["user_obj" => $this] ); @@ -1188,7 +1188,7 @@ public function delete(): bool $ilAppEventHandler = $DIC['ilAppEventHandler']; $ilAppEventHandler->raise( - 'Services/User', + 'components/ILIAS/User', 'deleteUser', ['usr_id' => $this->getId()] ); @@ -3968,7 +3968,7 @@ public function exportPersonalData(): void "personal_data", $this->getId(), "", - "Services/User", + "components/ILIAS/User", $title, $dir ); @@ -4007,24 +4007,24 @@ public function importPersonalData( ): void { $imp = new ilImport(); // bookmarks need to be skipped, importer does not exist anymore - $imp->addSkipImporter("Services/Bookmarks"); + $imp->addSkipImporter("components/ILIAS/Bookmarks"); if (!$a_profile_data) { - $imp->addSkipEntity("Services/User", "usr_profile"); + $imp->addSkipEntity("components/ILIAS/User", "usr_profile"); } if (!$a_settings) { - $imp->addSkipEntity("Services/User", "usr_setting"); + $imp->addSkipEntity("components/ILIAS/User", "usr_setting"); } if (!$a_notes) { - $imp->addSkipEntity("Services/Notes", "user_notes"); + $imp->addSkipEntity("components/ILIAS/Notes", "user_notes"); } if (!$a_calendar) { - $imp->addSkipEntity("Services/Calendar", "calendar"); + $imp->addSkipEntity("components/ILIAS/Calendar", "calendar"); } $imp->importEntity( $a_file["tmp_name"], $a_file["name"], "personal_data", - "Services/User" + "components/ILIAS/User" ); } diff --git a/components/ILIAS/User/classes/class.ilObjUserFolderGUI.php b/components/ILIAS/User/classes/class.ilObjUserFolderGUI.php index 3469b358464a..e021599bd3b2 100644 --- a/components/ILIAS/User/classes/class.ilObjUserFolderGUI.php +++ b/components/ILIAS/User/classes/class.ilObjUserFolderGUI.php @@ -20,9 +20,9 @@ use ILIAS\User\UserGUIRequest; use ILIAS\DI\Container as DIContainer; -use ILIAS\Services\User\UserFieldAttributesChangeListener; -use ILIAS\Services\User\InterestedUserFieldChangeListener; -use ILIAS\Services\User\ChangedUserFieldAttribute; +use ILIAS\components\User\UserFieldAttributesChangeListener; +use ILIAS\components\User\InterestedUserFieldChangeListener; +use ILIAS\components\User\ChangedUserFieldAttribute; use ILIAS\Filesystem\Filesystem; use ILIAS\UI\Renderer; use ILIAS\UI\Factory as UIFactory; @@ -2668,7 +2668,7 @@ public function saveGlobalUserSettingsObject(string $action = ''): void if ($this->usrFieldChangeListenersAccepted && count($changedFields) > 0) { $this->event->raise( - 'Services/User', + 'components/ILIAS/User', 'onUserFieldAttributesChanged', $changedFields ); @@ -2704,7 +2704,7 @@ public function showFieldChangeComponentsListeningConfirmDialog( 'tpl.usr_field_change_listener_confirm.html', true, true, - 'Services/User' + 'components/ILIAS/User' ); foreach ($interestedChangeListeners as $interestedChangeListener) { @@ -3098,7 +3098,7 @@ public function newAccountMailObject(ilPropertyFormGUI $form = null): void 'tpl.usrf_new_account_mail.html', true, true, - 'Services/User' + 'components/ILIAS/User' ); $ftpl->setVariable( 'FORM', diff --git a/components/ILIAS/User/classes/class.ilObjUserGUI.php b/components/ILIAS/User/classes/class.ilObjUserGUI.php index 2c8c80b06432..1eaa9338ee38 100644 --- a/components/ILIAS/User/classes/class.ilObjUserGUI.php +++ b/components/ILIAS/User/classes/class.ilObjUserGUI.php @@ -1670,7 +1670,7 @@ public function roleassignmentObject(): void ilSession::set('filtered_roles', 0); } - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.usr_role_assignment.html', 'Services/User'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.usr_role_assignment.html', 'components/ILIAS/User'); // init table $tab = new ilRoleAssignmentTableGUI($this, 'roleassignment'); diff --git a/components/ILIAS/User/classes/class.ilRoleAssignmentTableGUI.php b/components/ILIAS/User/classes/class.ilRoleAssignmentTableGUI.php index 8b0fc39b1ea7..dcc1e449f68e 100644 --- a/components/ILIAS/User/classes/class.ilRoleAssignmentTableGUI.php +++ b/components/ILIAS/User/classes/class.ilRoleAssignmentTableGUI.php @@ -58,7 +58,7 @@ public function __construct( $this->addColumn($this->lng->txt('path'), 'path'); $this->initFilter(); $this->setEnableHeader(true); - $this->setRowTemplate("tpl.role_assignment_row.html", "Services/User"); + $this->setRowTemplate("tpl.role_assignment_row.html", "components/ILIAS/User"); $this->setEnableTitle(true); if ($rbacsystem->checkAccess("edit_roleassignment", USER_FOLDER_ID)) { diff --git a/components/ILIAS/User/classes/class.ilUserAppEventListener.php b/components/ILIAS/User/classes/class.ilUserAppEventListener.php index 74d86b8bb349..5d2e941941d3 100644 --- a/components/ILIAS/User/classes/class.ilUserAppEventListener.php +++ b/components/ILIAS/User/classes/class.ilUserAppEventListener.php @@ -44,7 +44,7 @@ public static function handleEvent(string $component, string $event, array $para $settings ); - if ('Services/Object' === $component && 'beforeDeletion' === $event) { + if ('components/ILIAS/Object' === $component && 'beforeDeletion' === $event) { if (isset($parameter['object']) && $parameter['object'] instanceof ilObjRole) { $user_starting_point_repository->onRoleDeleted($parameter['object']); } diff --git a/components/ILIAS/User/classes/class.ilUserClipboardTableGUI.php b/components/ILIAS/User/classes/class.ilUserClipboardTableGUI.php index 8aa74c570d3e..7b30a86e36f1 100644 --- a/components/ILIAS/User/classes/class.ilUserClipboardTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserClipboardTableGUI.php @@ -45,7 +45,7 @@ public function init(): void $this->addColumn($this->lng->txt('login'), 'login', '30%'); $this->setOrderColumn('name'); - $this->setRowTemplate('tpl.usr_clipboard_table_row.html', 'Services/User'); + $this->setRowTemplate('tpl.usr_clipboard_table_row.html', 'components/ILIAS/User'); $this->setSelectAllCheckbox('uids'); diff --git a/components/ILIAS/User/classes/class.ilUserDataSet.php b/components/ILIAS/User/classes/class.ilUserDataSet.php index 370661e3ef69..51137c08f583 100644 --- a/components/ILIAS/User/classes/class.ilUserDataSet.php +++ b/components/ILIAS/User/classes/class.ilUserDataSet.php @@ -298,11 +298,11 @@ public function importRecord( case "personal_data": // only users themselves import their profiles! // thus we can map the import id of the dataset to the current user - $a_mapping->addMapping("Services/User", "usr", $a_rec["Id"], $ilUser->getId()); + $a_mapping->addMapping("components/ILIAS/User", "usr", $a_rec["Id"], $ilUser->getId()); break; case "usr_profile": - $usr_id = $a_mapping->getMapping("Services/User", "usr", $a_rec["Id"]); + $usr_id = $a_mapping->getMapping("components/ILIAS/User", "usr", $a_rec["Id"]); if ($usr_id > 0 && ilObject::_lookupType($usr_id) == "usr") { if (!isset($this->users[$usr_id])) { $this->users[$usr_id] = new ilObjUser($usr_id); @@ -347,7 +347,7 @@ public function importRecord( break; case "usr_setting": - $usr_id = $a_mapping->getMapping("Services/User", "usr", $a_rec["UserId"]); + $usr_id = $a_mapping->getMapping("components/ILIAS/User", "usr", $a_rec["UserId"]); if ($usr_id > 0 && ilObject::_lookupType($usr_id) == "usr") { if (!isset($this->users[$usr_id])) { $this->users[$usr_id] = new ilObjUser($usr_id); @@ -358,7 +358,7 @@ public function importRecord( break; case "usr_multi": - $usr_id = $a_mapping->getMapping("Services/User", "usr", $a_rec["UserId"]); + $usr_id = $a_mapping->getMapping("components/ILIAS/User", "usr", $a_rec["UserId"]); if ($usr_id > 0 && ilObject::_lookupType($usr_id) == "usr") { $this->multi[$usr_id][$a_rec["FieldId"]][] = ilUtil::secureString($a_rec["Value"]); } diff --git a/components/ILIAS/User/classes/class.ilUserExportFileTableGUI.php b/components/ILIAS/User/classes/class.ilUserExportFileTableGUI.php index 55dd4eddede9..caf3bfade63f 100644 --- a/components/ILIAS/User/classes/class.ilUserExportFileTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserExportFileTableGUI.php @@ -56,7 +56,7 @@ public function init(): void $this->setDefaultOrderField('dt'); $this->setDefaultOrderDirection('desc'); - $this->setRowTemplate('tpl.usr_export_file_row.html', 'Services/User'); + $this->setRowTemplate('tpl.usr_export_file_row.html', 'components/ILIAS/User'); $this->determineOffsetAndOrder(); $this->addMultiCommand( diff --git a/components/ILIAS/User/classes/class.ilUserExporter.php b/components/ILIAS/User/classes/class.ilUserExporter.php index 23410a3677b9..53dd94158f52 100644 --- a/components/ILIAS/User/classes/class.ilUserExporter.php +++ b/components/ILIAS/User/classes/class.ilUserExporter.php @@ -46,23 +46,23 @@ public function getXmlExportTailDependencies(string $a_entity, string $a_target_ return [ [ - "component" => "Services/User", + "component" => "components/ILIAS/User", "entity" => "usr_profile", "ids" => $a_ids], [ - "component" => "Services/User", + "component" => "components/ILIAS/User", "entity" => "usr_multi", "ids" => $a_ids], [ - "component" => "Services/User", + "component" => "components/ILIAS/User", "entity" => "usr_setting", "ids" => $a_ids], [ - "component" => "Services/Notes", + "component" => "components/ILIAS/Notes", "entity" => "user_notes", "ids" => $a_ids], [ - "component" => "Services/Calendar", + "component" => "components/ILIAS/Calendar", "entity" => "calendar", "ids" => $cal_ids] ]; diff --git a/components/ILIAS/User/classes/class.ilUserFieldSettingsTableGUI.php b/components/ILIAS/User/classes/class.ilUserFieldSettingsTableGUI.php index 2d7b3bafff4f..4f3e764f2b39 100644 --- a/components/ILIAS/User/classes/class.ilUserFieldSettingsTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserFieldSettingsTableGUI.php @@ -55,7 +55,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($a_parent_obj)); - $this->setRowTemplate("tpl.std_fields_settings_row.html", "Services/User"); + $this->setRowTemplate("tpl.std_fields_settings_row.html", "components/ILIAS/User"); $this->disable("footer"); $this->setEnableTitle(true); diff --git a/components/ILIAS/User/classes/class.ilUserImportParser.php b/components/ILIAS/User/classes/class.ilUserImportParser.php index 3d4f89551134..da543c3a4e9c 100644 --- a/components/ILIAS/User/classes/class.ilUserImportParser.php +++ b/components/ILIAS/User/classes/class.ilUserImportParser.php @@ -2025,7 +2025,7 @@ public function getProtocol(): array */ public function getProtocolAsHTML(string $a_log_title): string { - $block = new ilTemplate("tpl.usr_import_log_block.html", true, true, "Services/User"); + $block = new ilTemplate("tpl.usr_import_log_block.html", true, true, "components/ILIAS/User"); $block->setVariable("TXT_LOG_TITLE", $a_log_title); $block->setVariable("TXT_MESSAGE_ID", $this->lng->txt("login")); $block->setVariable("TXT_MESSAGE_TEXT", $this->lng->txt("message")); diff --git a/components/ILIAS/User/classes/class.ilUserLPTableGUI.php b/components/ILIAS/User/classes/class.ilUserLPTableGUI.php index aee3dd465314..780281d1188f 100644 --- a/components/ILIAS/User/classes/class.ilUserLPTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserLPTableGUI.php @@ -50,7 +50,7 @@ public function __construct( $this->setFormAction($ilCtrl->getFormAction($this->parent_obj)); - $this->setRowTemplate("tpl.user_list_lp_row.html", "Services/User"); + $this->setRowTemplate("tpl.user_list_lp_row.html", "components/ILIAS/User"); $this->setDefaultOrderField("login"); $this->setDefaultOrderDirection("asc"); diff --git a/components/ILIAS/User/classes/class.ilUserRoleStartingPointTableGUI.php b/components/ILIAS/User/classes/class.ilUserRoleStartingPointTableGUI.php index dfd52283a4cc..7fa3baa8c779 100644 --- a/components/ILIAS/User/classes/class.ilUserRoleStartingPointTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserRoleStartingPointTableGUI.php @@ -51,7 +51,7 @@ public function __construct( $this->addColumn($this->lng->txt('starting_page')); $this->addColumn($this->lng->txt('actions')); $this->setFormAction($this->ctrl->getFormAction($parent_obj)); - $this->setRowTemplate('tpl.user_role_starting_point_row.html', 'Services/User'); + $this->setRowTemplate('tpl.user_role_starting_point_row.html', 'components/ILIAS/User'); $this->addCommandButton('saveOrder', $this->lng->txt('save_order')); $this->setExternalSorting(true); diff --git a/components/ILIAS/User/classes/class.ilUserTableGUI.php b/components/ILIAS/User/classes/class.ilUserTableGUI.php index 39bfca03c9b4..e0140a4e9b1a 100644 --- a/components/ILIAS/User/classes/class.ilUserTableGUI.php +++ b/components/ILIAS/User/classes/class.ilUserTableGUI.php @@ -86,7 +86,7 @@ public function __construct( $this->setEnableHeader(true); $this->setFormAction($ilCtrl->getFormAction($this->parent_obj, "applyFilter")); - $this->setRowTemplate("tpl.user_list_row.html", "Services/User"); + $this->setRowTemplate("tpl.user_list_row.html", "components/ILIAS/User"); //$this->disable("footer"); $this->setEnableTitle(true); $this->initFilter(); diff --git a/components/ILIAS/User/test/ChangedUserFieldAttributeTest.php b/components/ILIAS/User/test/ChangedUserFieldAttributeTest.php index 53db7090ab72..4f8c09244613 100644 --- a/components/ILIAS/User/test/ChangedUserFieldAttributeTest.php +++ b/components/ILIAS/User/test/ChangedUserFieldAttributeTest.php @@ -18,7 +18,7 @@ * *********************************************************************/ -use ILIAS\Services\User\ChangedUserFieldAttribute; +use ILIAS\components\User\ChangedUserFieldAttribute; /** * Class ChangedUserFieldAttributeTest diff --git a/components/ILIAS/User/test/InterestedUserFieldAttributeTest.php b/components/ILIAS/User/test/InterestedUserFieldAttributeTest.php index 4dfb3006d8bd..fff080b1721a 100644 --- a/components/ILIAS/User/test/InterestedUserFieldAttributeTest.php +++ b/components/ILIAS/User/test/InterestedUserFieldAttributeTest.php @@ -18,7 +18,7 @@ * *********************************************************************/ -use ILIAS\Services\User\InterestedUserFieldAttribute; +use ILIAS\components\User\InterestedUserFieldAttribute; use ILIAS\DI\Container; /** diff --git a/components/ILIAS/User/test/InterestedUserFieldChangeListenerTest.php b/components/ILIAS/User/test/InterestedUserFieldChangeListenerTest.php index e949b7f63700..36af6052395f 100644 --- a/components/ILIAS/User/test/InterestedUserFieldChangeListenerTest.php +++ b/components/ILIAS/User/test/InterestedUserFieldChangeListenerTest.php @@ -18,7 +18,7 @@ * *********************************************************************/ -use ILIAS\Services\User\InterestedUserFieldChangeListener; +use ILIAS\components\User\InterestedUserFieldChangeListener; use ILIAS\DI\Container; /** diff --git a/components/ILIAS/User/test/InterestedUserFieldComponentTest.php b/components/ILIAS/User/test/InterestedUserFieldComponentTest.php index ff66e75753b0..984ff934effa 100644 --- a/components/ILIAS/User/test/InterestedUserFieldComponentTest.php +++ b/components/ILIAS/User/test/InterestedUserFieldComponentTest.php @@ -18,7 +18,7 @@ * *********************************************************************/ -use ILIAS\Services\User\InterestedUserFieldComponent; +use ILIAS\components\User\InterestedUserFieldComponent; /** * Class InterestedUserFieldComponentTest diff --git a/components/ILIAS/User/test/ilObjUserPasswordTest.php b/components/ILIAS/User/test/ilObjUserPasswordTest.php index a5a2455988b4..ac25e3d44fbd 100644 --- a/components/ILIAS/User/test/ilObjUserPasswordTest.php +++ b/components/ILIAS/User/test/ilObjUserPasswordTest.php @@ -21,13 +21,13 @@ use org\bovigo\vfs; require_once 'libs/composer/vendor/autoload.php'; -require_once 'Services/User/classes/class.ilUserPasswordManager.php'; -require_once 'Services/User/classes/class.ilUserPasswordEncoderFactory.php'; -require_once 'Services/Password/classes/class.ilBasePasswordEncoder.php'; -require_once 'Services/Utilities/classes/class.ilUtil.php'; -require_once 'Services/User/classes/class.ilObjUser.php'; -require_once 'Services/User/exceptions/class.ilUserException.php'; -require_once 'Services/User/test/ilUserBaseTest.php'; +require_once 'components/ILIAS/User/classes/class.ilUserPasswordManager.php'; +require_once 'components/ILIAS/User/classes/class.ilUserPasswordEncoderFactory.php'; +require_once 'components/ILIAS/Password/classes/class.ilBasePasswordEncoder.php'; +require_once 'components/ILIAS/Utilities/classes/class.ilUtil.php'; +require_once 'components/ILIAS/User/classes/class.ilObjUser.php'; +require_once 'components/ILIAS/User/exceptions/class.ilUserException.php'; +require_once 'components/ILIAS/User/test/ilUserBaseTest.php'; class ilObjUserPasswordTest extends ilUserBaseTest { diff --git a/components/ILIAS/Utilities/test/ilServicesUtilitiesSuite.php b/components/ILIAS/Utilities/test/ilServicesUtilitiesSuite.php index 96e12007561b..b8bf0595e289 100644 --- a/components/ILIAS/Utilities/test/ilServicesUtilitiesSuite.php +++ b/components/ILIAS/Utilities/test/ilServicesUtilitiesSuite.php @@ -28,11 +28,11 @@ public static function suite() { $suite = new self(); - require 'Services/Utilities/test/ilMimeTypeTest.php'; + require 'components/ILIAS/Utilities/test/ilMimeTypeTest.php'; $suite->addTestSuite('ilMimeTypeTest'); - require 'Services/Utilities/test/ilUtilsPreventTest.php'; + require 'components/ILIAS/Utilities/test/ilUtilsPreventTest.php'; $suite->addTestSuite('ilUtilsPreventTest'); - require 'Services/Utilities/test/ilUtilTest.php'; + require 'components/ILIAS/Utilities/test/ilUtilTest.php'; $suite->addTestSuite(ilUtilTest::class); return $suite; diff --git a/components/ILIAS/Verification/test/ilServicesVerificationSuite.php b/components/ILIAS/Verification/test/ilServicesVerificationSuite.php index d1834e968b81..82f93a405728 100644 --- a/components/ILIAS/Verification/test/ilServicesVerificationSuite.php +++ b/components/ILIAS/Verification/test/ilServicesVerificationSuite.php @@ -28,7 +28,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Verification/test/CertificateVerificationClassMapTest.php"); + require_once("./components/ILIAS/Verification/test/CertificateVerificationClassMapTest.php"); $suite->addTestSuite("CertificateVerificationClassMapTest"); return $suite; diff --git a/components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerConfigStoredObjective.php b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerConfigStoredObjective.php similarity index 97% rename from components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerConfigStoredObjective.php rename to components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerConfigStoredObjective.php index dd6ab7b11b24..391497a7121a 100644 --- a/components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerConfigStoredObjective.php +++ b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerConfigStoredObjective.php @@ -37,7 +37,7 @@ public function getHash(): string public function getLabel(): string { - return "Fill ini with settings for Services/VirusScanner"; + return "Fill ini with settings for components/ILIAS/VirusScanner_"; } public function isNotable(): bool diff --git a/components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerMetricsCollectedObjective.php b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerMetricsCollectedObjective.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerMetricsCollectedObjective.php rename to components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerMetricsCollectedObjective.php diff --git a/components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerSetupAgent.php b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerSetupAgent.php rename to components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupAgent.php diff --git a/components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerSetupConfig.php b/components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupConfig.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/Setup/class.ilVirusScannerSetupConfig.php rename to components/ILIAS/VirusScanner_/classes/Setup/class.ilVirusScannerSetupConfig.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScanner.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScanner.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScanner.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScanner.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerAntiVir.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerAntiVir.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerAntiVir.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerAntiVir.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerClamAV.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerClamAV.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerClamAV.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerClamAV.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerFactory.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerFactory.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerFactory.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerFactory.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapClient.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapClient.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapClient.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapClient.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapRemote.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapRemote.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapRemote.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapRemote.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapRemoteAvClient.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapRemoteAvClient.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerICapRemoteAvClient.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerICapRemoteAvClient.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerPreProcessor.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerPreProcessor.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerPreProcessor.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerPreProcessor.php diff --git a/components/ILIAS/VirusScanner/classes/class.ilVirusScannerSophos.php b/components/ILIAS/VirusScanner_/classes/class.ilVirusScannerSophos.php similarity index 100% rename from components/ILIAS/VirusScanner/classes/class.ilVirusScannerSophos.php rename to components/ILIAS/VirusScanner_/classes/class.ilVirusScannerSophos.php diff --git a/components/ILIAS/VirusScanner/maintenance.json b/components/ILIAS/VirusScanner_/maintenance.json similarity index 87% rename from components/ILIAS/VirusScanner/maintenance.json rename to components/ILIAS/VirusScanner_/maintenance.json index fee8d3126c4d..4f3e1995befc 100644 --- a/components/ILIAS/VirusScanner/maintenance.json +++ b/components/ILIAS/VirusScanner_/maintenance.json @@ -8,7 +8,7 @@ ], "tester": "tloewen(41553)", "testcase_writer": "tloewen(41553)", - "path": "Services/VirusScanner", + "path": "components/ILIAS/VirusScanner_", "belong_to_component": "VirusScanner", "used_in_components": [] } \ No newline at end of file diff --git a/components/ILIAS/VirusScanner/phpunit.xml b/components/ILIAS/VirusScanner_/phpunit.xml similarity index 100% rename from components/ILIAS/VirusScanner/phpunit.xml rename to components/ILIAS/VirusScanner_/phpunit.xml diff --git a/components/ILIAS/VirusScanner/test/VirusScannerBaseTest.php b/components/ILIAS/VirusScanner_/test/VirusScannerBaseTest.php similarity index 100% rename from components/ILIAS/VirusScanner/test/VirusScannerBaseTest.php rename to components/ILIAS/VirusScanner_/test/VirusScannerBaseTest.php diff --git a/components/ILIAS/VirusScanner/test/VirusScannerFactoryTest.php b/components/ILIAS/VirusScanner_/test/VirusScannerFactoryTest.php similarity index 100% rename from components/ILIAS/VirusScanner/test/VirusScannerFactoryTest.php rename to components/ILIAS/VirusScanner_/test/VirusScannerFactoryTest.php diff --git a/components/ILIAS/VirusScanner/test/bootstrap.php b/components/ILIAS/VirusScanner_/test/bootstrap.php similarity index 100% rename from components/ILIAS/VirusScanner/test/bootstrap.php rename to components/ILIAS/VirusScanner_/test/bootstrap.php diff --git a/components/ILIAS/VirusScanner/test/ilServicesVirusScannerSuite.php b/components/ILIAS/VirusScanner_/test/ilServicesVirusScannerSuite.php similarity index 100% rename from components/ILIAS/VirusScanner/test/ilServicesVirusScannerSuite.php rename to components/ILIAS/VirusScanner_/test/ilServicesVirusScannerSuite.php diff --git a/components/ILIAS/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php b/components/ILIAS/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php index 30cea51bfd45..86d083773ce5 100644 --- a/components/ILIAS/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php +++ b/components/ILIAS/WOPI/classes/Administration/class.ilWOPIAdministrationGUI.php @@ -18,10 +18,10 @@ declare(strict_types=1); -use ILIAS\Services\WOPI\Discovery\Crawler; +use ILIAS\components\WOPI\Discovery\Crawler; use ILIAS\Data\URI; -use ILIAS\Services\WOPI\Discovery\AppDBRepository; -use ILIAS\Services\WOPI\Discovery\ActionDBRepository; +use ILIAS\components\WOPI\Discovery\AppDBRepository; +use ILIAS\components\WOPI\Discovery\ActionDBRepository; /** * @author Fabian Schmid diff --git a/components/ILIAS/WOPI/classes/Administration/class.ilWOPISettingsForm.php b/components/ILIAS/WOPI/classes/Administration/class.ilWOPISettingsForm.php index 965b38678baa..bbbd069154e6 100644 --- a/components/ILIAS/WOPI/classes/Administration/class.ilWOPISettingsForm.php +++ b/components/ILIAS/WOPI/classes/Administration/class.ilWOPISettingsForm.php @@ -22,7 +22,7 @@ use ILIAS\UI\Component\Input\Container\Form\Standard; use ILIAS\UI\Component\Input\Field\Section; use Psr\Http\Message\RequestInterface; -use ILIAS\Services\WOPI\Discovery\Crawler; +use ILIAS\components\WOPI\Discovery\Crawler; use ILIAS\Data\URI; /** diff --git a/components/ILIAS/WOPI/classes/Cron/class.ilWOPICrawler.php b/components/ILIAS/WOPI/classes/Cron/class.ilWOPICrawler.php index f9a88b3b7ba7..6be7766735b8 100644 --- a/components/ILIAS/WOPI/classes/Cron/class.ilWOPICrawler.php +++ b/components/ILIAS/WOPI/classes/Cron/class.ilWOPICrawler.php @@ -19,11 +19,11 @@ declare(strict_types=1); use ILIAS\Cron\Schedule\CronJobScheduleType; -use ILIAS\Services\WOPI\Discovery\Crawler; -use ILIAS\Services\WOPI\Discovery\AppDBRepository; -use ILIAS\Services\WOPI\Discovery\ActionDBRepository; -use ILIAS\Services\WOPI\Discovery\AppRepository; -use ILIAS\Services\WOPI\Discovery\ActionRepository; +use ILIAS\components\WOPI\Discovery\Crawler; +use ILIAS\components\WOPI\Discovery\AppDBRepository; +use ILIAS\components\WOPI\Discovery\ActionDBRepository; +use ILIAS\components\WOPI\Discovery\AppRepository; +use ILIAS\components\WOPI\Discovery\ActionRepository; use ILIAS\Data\URI; /** diff --git a/components/ILIAS/WOPI/classes/Discovery/Action.php b/components/ILIAS/WOPI/classes/Discovery/Action.php index 082e102ed776..89b93ba863ae 100644 --- a/components/ILIAS/WOPI/classes/Discovery/Action.php +++ b/components/ILIAS/WOPI/classes/Discovery/Action.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Discovery/ActionDBRepository.php b/components/ILIAS/WOPI/classes/Discovery/ActionDBRepository.php index 63e3fc4c36ea..62c9773105b2 100644 --- a/components/ILIAS/WOPI/classes/Discovery/ActionDBRepository.php +++ b/components/ILIAS/WOPI/classes/Discovery/ActionDBRepository.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Discovery/ActionRepository.php b/components/ILIAS/WOPI/classes/Discovery/ActionRepository.php index ec8f2c5566fd..c40e6303ca29 100644 --- a/components/ILIAS/WOPI/classes/Discovery/ActionRepository.php +++ b/components/ILIAS/WOPI/classes/Discovery/ActionRepository.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; /** * @author Fabian Schmid diff --git a/components/ILIAS/WOPI/classes/Discovery/ActionTarget.php b/components/ILIAS/WOPI/classes/Discovery/ActionTarget.php index 77911417c325..8074c468df35 100644 --- a/components/ILIAS/WOPI/classes/Discovery/ActionTarget.php +++ b/components/ILIAS/WOPI/classes/Discovery/ActionTarget.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; /** * @author Fabian Schmid diff --git a/components/ILIAS/WOPI/classes/Discovery/App.php b/components/ILIAS/WOPI/classes/Discovery/App.php index 0b44991dd3d5..7ea96d3af569 100644 --- a/components/ILIAS/WOPI/classes/Discovery/App.php +++ b/components/ILIAS/WOPI/classes/Discovery/App.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Discovery/AppDBRepository.php b/components/ILIAS/WOPI/classes/Discovery/AppDBRepository.php index 79fb1a78a560..1c02719e069e 100644 --- a/components/ILIAS/WOPI/classes/Discovery/AppDBRepository.php +++ b/components/ILIAS/WOPI/classes/Discovery/AppDBRepository.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Discovery/AppRepository.php b/components/ILIAS/WOPI/classes/Discovery/AppRepository.php index b20dfdf8e559..873f0ed007f2 100644 --- a/components/ILIAS/WOPI/classes/Discovery/AppRepository.php +++ b/components/ILIAS/WOPI/classes/Discovery/AppRepository.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; /** * @author Fabian Schmid diff --git a/components/ILIAS/WOPI/classes/Discovery/Apps.php b/components/ILIAS/WOPI/classes/Discovery/Apps.php index 8ecbe12a2d75..e735e91564a5 100644 --- a/components/ILIAS/WOPI/classes/Discovery/Apps.php +++ b/components/ILIAS/WOPI/classes/Discovery/Apps.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; /** * @author Fabian Schmid diff --git a/components/ILIAS/WOPI/classes/Discovery/Crawler.php b/components/ILIAS/WOPI/classes/Discovery/Crawler.php index 108bc6269d56..dc1ba4acd1f5 100644 --- a/components/ILIAS/WOPI/classes/Discovery/Crawler.php +++ b/components/ILIAS/WOPI/classes/Discovery/Crawler.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Discovery; +namespace ILIAS\components\WOPI\Discovery; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Embed/EmbeddedApplication.php b/components/ILIAS/WOPI/classes/Embed/EmbeddedApplication.php index 8257e03b6cc6..32c59bbb0fd4 100644 --- a/components/ILIAS/WOPI/classes/Embed/EmbeddedApplication.php +++ b/components/ILIAS/WOPI/classes/Embed/EmbeddedApplication.php @@ -18,13 +18,13 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Embed; +namespace ILIAS\components\WOPI\Embed; use ILIAS\Data\URI; -use ILIAS\Services\WOPI\Discovery\Action; +use ILIAS\components\WOPI\Discovery\Action; use ILIAS\ResourceStorage\Identification\ResourceIdentification; use ILIAS\ResourceStorage\Stakeholder\ResourceStakeholder; -use ILIAS\Services\WOPI\Handler\RequestHandler; +use ILIAS\components\WOPI\Handler\RequestHandler; use ILIAS\FileDelivery\Token\DataSigner; /** diff --git a/components/ILIAS/WOPI/classes/Embed/EmbeddedApplicationGSProvider.php b/components/ILIAS/WOPI/classes/Embed/EmbeddedApplicationGSProvider.php index 1b9d2cd9f54e..88021373cf63 100644 --- a/components/ILIAS/WOPI/classes/Embed/EmbeddedApplicationGSProvider.php +++ b/components/ILIAS/WOPI/classes/Embed/EmbeddedApplicationGSProvider.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Embed; +namespace ILIAS\components\WOPI\Embed; use ILIAS\GlobalScreen\Scope\Layout\Provider\AbstractModificationProvider; use ILIAS\GlobalScreen\ScreenContext\Stack\ContextCollection; diff --git a/components/ILIAS/WOPI/classes/Embed/Renderer.php b/components/ILIAS/WOPI/classes/Embed/Renderer.php index 905038c25416..e42dbaa60a4c 100644 --- a/components/ILIAS/WOPI/classes/Embed/Renderer.php +++ b/components/ILIAS/WOPI/classes/Embed/Renderer.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Embed; +namespace ILIAS\components\WOPI\Embed; /** * @author Fabian Schmid @@ -36,7 +36,7 @@ public function __construct( public function getComponent(): \ILIAS\UI\Component\Component { - $tpl = new \ilTemplate('tpl.wopi_container.html', true, true, 'Services/WOPI'); + $tpl = new \ilTemplate('tpl.wopi_container.html', true, true, 'components/ILIAS/WOPI'); $tpl->setVariable('EDITOR_URL', (string) $this->embedded_application->getActionLauncherURL()); $tpl->setVariable('TOKEN', (string) $this->embedded_application->getToken()); $tpl->setVariable('TTL', (string) (time() + $this->embedded_application->getTTL()) * 1000); // in milliseconds diff --git a/components/ILIAS/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php b/components/ILIAS/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php index 1927a4ba219e..1859f4c6aa49 100644 --- a/components/ILIAS/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php +++ b/components/ILIAS/WOPI/classes/Embed/class.ilWOPIEmbeddedApplicationGUI.php @@ -18,10 +18,10 @@ declare(strict_types=1); -use ILIAS\Services\WOPI\Launcher\LauncherRequest; -use ILIAS\Services\WOPI\Embed\EmbeddedApplication; -use ILIAS\Services\WOPI\Embed\Renderer; -use ILIAS\Services\WOPI\Embed\EmbeddedApplicationGSProvider; +use ILIAS\components\WOPI\Launcher\LauncherRequest; +use ILIAS\components\WOPI\Embed\EmbeddedApplication; +use ILIAS\components\WOPI\Embed\Renderer; +use ILIAS\components\WOPI\Embed\EmbeddedApplicationGSProvider; /** * @author Fabian Schmid @@ -42,7 +42,7 @@ public function __construct( $this->main_tpl = $DIC->ui()->mainTemplate(); $this->tabs = $DIC->tabs(); $this->global_screen = $DIC->globalScreen(); - $this->global_screen->layout()->meta()->addJs('./Services/WOPI/js/dist/index.min.js'); + $this->global_screen->layout()->meta()->addJs('./components/ILIAS/WOPI/js/dist/index.min.js'); $this->global_screen->layout()->meta()->addOnloadCode('il.WOPI.init();'); $this->renderer = new Renderer($this->application); $this->ui_renderer = $DIC->ui()->renderer(); diff --git a/components/ILIAS/WOPI/classes/Handler/GetFileInfoResponse.php b/components/ILIAS/WOPI/classes/Handler/GetFileInfoResponse.php index 73e776ab026d..470c22ff507c 100644 --- a/components/ILIAS/WOPI/classes/Handler/GetFileInfoResponse.php +++ b/components/ILIAS/WOPI/classes/Handler/GetFileInfoResponse.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Handler; +namespace ILIAS\components\WOPI\Handler; use ILIAS\ResourceStorage\Revision\Revision; use ILIAS\Data\URI; diff --git a/components/ILIAS/WOPI/classes/Handler/RequestHandler.php b/components/ILIAS/WOPI/classes/Handler/RequestHandler.php index 17da14b6bf3e..9dc3850a6c8c 100644 --- a/components/ILIAS/WOPI/classes/Handler/RequestHandler.php +++ b/components/ILIAS/WOPI/classes/Handler/RequestHandler.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Handler; +namespace ILIAS\components\WOPI\Handler; use ILIAS\Filesystem\Stream\Streams; use ILIAS\FileDelivery\Token\DataSigner; diff --git a/components/ILIAS/WOPI/classes/Handler/Response.php b/components/ILIAS/WOPI/classes/Handler/Response.php index 572c81dfa33b..eece7eedc162 100644 --- a/components/ILIAS/WOPI/classes/Handler/Response.php +++ b/components/ILIAS/WOPI/classes/Handler/Response.php @@ -18,7 +18,7 @@ declare(strict_types=1); -namespace ILIAS\Services\WOPI\Handler; +namespace ILIAS\components\WOPI\Handler; /** * @author Fabian Schmid diff --git a/components/ILIAS/WebAccessChecker/classes/Setup/class.ilSecurePathDefinitionProcessor.php b/components/ILIAS/WebAccessChecker/classes/Setup/class.ilSecurePathDefinitionProcessor.php index 599e92ae0df2..29b5e7ff78e9 100644 --- a/components/ILIAS/WebAccessChecker/classes/Setup/class.ilSecurePathDefinitionProcessor.php +++ b/components/ILIAS/WebAccessChecker/classes/Setup/class.ilSecurePathDefinitionProcessor.php @@ -56,7 +56,7 @@ public function beginTag(string $name, array $attributes): void } $ilWACSecurePath->setCheckingClass($attributes["checking-class"]); $ilWACSecurePath->setInSecFolder((bool) ($attributes["in-sec-folder"] ?? null)); - $ilWACSecurePath->setComponentDirectory(realpath(__DIR__ . "/../../../../" . $this->component)); + $ilWACSecurePath->setComponentDirectory(realpath(__DIR__ . "/../../../../../" . $this->component)); $ilWACSecurePath->update(); } diff --git a/components/ILIAS/WebAccessChecker/classes/class.ilWACToken.php b/components/ILIAS/WebAccessChecker/classes/class.ilWACToken.php index 76c3229e80c5..cdd905ebbdab 100644 --- a/components/ILIAS/WebAccessChecker/classes/class.ilWACToken.php +++ b/components/ILIAS/WebAccessChecker/classes/class.ilWACToken.php @@ -102,7 +102,7 @@ protected function generateSaltFile(): void if (is_file(self::SALT_FILE_PATH)) { unlink(self::SALT_FILE_PATH); } - $template = file_get_contents('./Services/WebAccessChecker/wacsalt.php.template'); + $template = file_get_contents('./components/ILIAS/WebAccessChecker/wacsalt.php.template'); $random = new \ilRandom(); $salt = md5(time() * $random->int(1000, 9999) . self::SALT_FILE_PATH); self::setSALT($salt); diff --git a/components/ILIAS/WebAccessChecker/classes/class.ilWebAccessCheckerDelivery.php b/components/ILIAS/WebAccessChecker/classes/class.ilWebAccessCheckerDelivery.php index ca3527593fdb..0f050895a1ed 100644 --- a/components/ILIAS/WebAccessChecker/classes/class.ilWebAccessCheckerDelivery.php +++ b/components/ILIAS/WebAccessChecker/classes/class.ilWebAccessCheckerDelivery.php @@ -106,7 +106,7 @@ protected function deny(): void protected function deliverDummyImage(): void { - $ilFileDelivery = new Delivery('./Services/WebAccessChecker/templates/images/access_denied.png', $this->http); + $ilFileDelivery = new Delivery('./components/ILIAS/WebAccessChecker/templates/images/access_denied.png', $this->http); $ilFileDelivery->setDisposition($this->wac->getDisposition()); $ilFileDelivery->deliver(); } @@ -114,7 +114,7 @@ protected function deliverDummyImage(): void protected function deliverDummyVideo(): void { - $ilFileDelivery = new Delivery('./Services/WebAccessChecker/templates/images/access_denied.mp4', $this->http); + $ilFileDelivery = new Delivery('./components/ILIAS/WebAccessChecker/templates/images/access_denied.mp4', $this->http); $ilFileDelivery->setDisposition($this->wac->getDisposition()); $ilFileDelivery->stream(); } diff --git a/components/ILIAS/WebAccessChecker/implement-wac.md b/components/ILIAS/WebAccessChecker/implement-wac.md index e690584ee3b2..0944b996e240 100644 --- a/components/ILIAS/WebAccessChecker/implement-wac.md +++ b/components/ILIAS/WebAccessChecker/implement-wac.md @@ -84,7 +84,7 @@ Delivering files is implemented using the ilFileDelivery-Service introduced in I ```php // File-Delivery example -$ilFileDelivery = new ilFileDelivery('./Services/WebAccessChecker/templates/images/access_denied.png', 'file_name.png'); +$ilFileDelivery = new ilFileDelivery('./components/ILIAS/WebAccessChecker/templates/images/access_denied.png', 'file_name.png'); $ilFileDelivery->setDisposition(ilFileDelivery::DISP_INLINE); $ilFileDelivery->deliver(); ``` diff --git a/components/ILIAS/WebAccessChecker/test/SecurePath/ilWACSecurePathTest.php b/components/ILIAS/WebAccessChecker/test/SecurePath/ilWACSecurePathTest.php index 7f0c99c54582..c5ee1e8abc0c 100644 --- a/components/ILIAS/WebAccessChecker/test/SecurePath/ilWACSecurePathTest.php +++ b/components/ILIAS/WebAccessChecker/test/SecurePath/ilWACSecurePathTest.php @@ -49,6 +49,6 @@ public function testPath(): void */ $ilWACPath = new ilWACPath('http://www.ilias.de/docu/data/docu/mobs/mm_43803/test.png'); $obj = ilWACSecurePath::find($ilWACPath->getSecurePathId()); - $this->assertEquals('./Services/MediaObjects', $obj->getComponentDirectory()); + $this->assertEquals('./components/ILIAS/MediaObjects', $obj->getComponentDirectory()); } } diff --git a/components/ILIAS/WebAccessChecker/test/ilServicesWebAccessCheckerSuite.php b/components/ILIAS/WebAccessChecker/test/ilServicesWebAccessCheckerSuite.php index b63890de0bcc..87df0cd48620 100644 --- a/components/ILIAS/WebAccessChecker/test/ilServicesWebAccessCheckerSuite.php +++ b/components/ILIAS/WebAccessChecker/test/ilServicesWebAccessCheckerSuite.php @@ -28,13 +28,13 @@ class ilServicesWebAccessCheckerSuite extends TestSuite { public static function suite(): \ilServicesWebAccessCheckerSuite { - //require_once('./Services/WebAccessChecker/test/Token/ilWACTokenTest.php'); + //require_once('./components/ILIAS/WebAccessChecker/test/Token/ilWACTokenTest.php'); //$suite->addTestSuite('ilWACTokenTest'); - //require_once('./Services/WebAccessChecker/test/CheckingInstance/ilWACCheckingInstanceTest.php'); + //require_once('./components/ILIAS/WebAccessChecker/test/CheckingInstance/ilWACCheckingInstanceTest.php'); //$suite->addTestSuite('ilWACCheckingInstanceTest'); - //require_once('./Services/WebAccessChecker/test/Path/ilWACPathTest.php'); + //require_once('./components/ILIAS/WebAccessChecker/test/Path/ilWACPathTest.php'); //$suite->addTestSuite('ilWACPathTest'); return new self(); diff --git a/components/ILIAS/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsDocumentTableGUI.php b/components/ILIAS/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsDocumentTableGUI.php index 4ec489d9a9bc..8e362d455a9d 100644 --- a/components/ILIAS/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsDocumentTableGUI.php +++ b/components/ILIAS/WebDAV/classes/mount_instructions/class.ilWebDAVMountInstructionsDocumentTableGUI.php @@ -84,7 +84,7 @@ public function __construct( $this->setExternalSegmentation(true); $this->setLimit(PHP_INT_MAX); - $this->setRowTemplate('tpl.webdav_documents_row.html', 'Services/WebDAV'); + $this->setRowTemplate('tpl.webdav_documents_row.html', 'components/ILIAS/WebDAV'); if ($this->is_editable) { $this->addCommandButton('saveDocumentSorting', $this->lng->txt('sorting_save')); diff --git a/components/ILIAS/WebDAV/test/dav/class.ilDAVClientNodeTest.php b/components/ILIAS/WebDAV/test/dav/class.ilDAVClientNodeTest.php index 1d624bb8583a..0f6e80804bca 100644 --- a/components/ILIAS/WebDAV/test/dav/class.ilDAVClientNodeTest.php +++ b/components/ILIAS/WebDAV/test/dav/class.ilDAVClientNodeTest.php @@ -21,7 +21,7 @@ use PHPUnit\Framework\TestCase; use Sabre\DAV\Exception\Forbidden; -require_once "./Services/WebDAV/test/ilWebDAVTestHelper.php"; +require_once "./components/ILIAS/WebDAV/test/ilWebDAVTestHelper.php"; class ilDAVClientNodeTest extends TestCase { diff --git a/components/ILIAS/WebDAV/test/dav/class.ilDAVContainerTest.php b/components/ILIAS/WebDAV/test/dav/class.ilDAVContainerTest.php index 08195e62ed70..223843c91bcd 100644 --- a/components/ILIAS/WebDAV/test/dav/class.ilDAVContainerTest.php +++ b/components/ILIAS/WebDAV/test/dav/class.ilDAVContainerTest.php @@ -23,7 +23,7 @@ use Sabre\DAV\Exception\NotFound; use Sabre\DAV\Exception\Forbidden; -require_once "./Services/WebDAV/test/webdav_overrides.php"; +require_once "./components/ILIAS/WebDAV/test/webdav_overrides.php"; class ilDAVContainerTest extends TestCase { diff --git a/components/ILIAS/WebDAV/test/ilServicesWebDAVSuite.php b/components/ILIAS/WebDAV/test/ilServicesWebDAVSuite.php index 51b815f56568..00c6be24349a 100644 --- a/components/ILIAS/WebDAV/test/ilServicesWebDAVSuite.php +++ b/components/ILIAS/WebDAV/test/ilServicesWebDAVSuite.php @@ -32,16 +32,16 @@ public static function suite(): ilServicesWebDAVSuite { $suite = new ilServicesWebDAVSuite(); - require_once "./Services/WebDAV/test/traits/ilWebDAVCheckValidTitleTraitTest.php"; + require_once "./components/ILIAS/WebDAV/test/traits/ilWebDAVCheckValidTitleTraitTest.php"; $suite->addTestSuite("ilWebDAVCheckValidTitleTraitTest"); - require_once "./Services/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php"; + require_once "./components/ILIAS/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php"; $suite->addTestSuite("ilWebDAVLockUriPathResolverTest"); - require_once "./Services/WebDAV/test/dav/class.ilDAVContainerTest.php"; + require_once "./components/ILIAS/WebDAV/test/dav/class.ilDAVContainerTest.php"; $suite->addTestSuite("ilDAVContainerTest"); - require_once "./Services/WebDAV/test/dav/class.ilDAVClientNodeTest.php"; + require_once "./components/ILIAS/WebDAV/test/dav/class.ilDAVClientNodeTest.php"; $suite->addTestSuite("ilDAVClientNodeTest"); return $suite; diff --git a/components/ILIAS/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php b/components/ILIAS/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php index befb2cb13ac1..528ac1fc0b71 100644 --- a/components/ILIAS/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php +++ b/components/ILIAS/WebDAV/test/lock/ilWebDAVLockUriPathResolverTest.php @@ -22,7 +22,7 @@ * *********************************************************************/ -require_once "./Services/WebDAV/test/ilWebDAVTestHelper.php"; +require_once "./components/ILIAS/WebDAV/test/ilWebDAVTestHelper.php"; /** * @runTestsInSeparateProcesses diff --git a/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php b/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php index 062b0dddaa52..56f685c14790 100644 --- a/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php +++ b/components/ILIAS/WebResource/classes/class.ilObjLinkResourceGUI.php @@ -1224,7 +1224,7 @@ protected function manage(): void $js = ilInternalLinkGUI::getInitHTML(""); $this->tpl->addJavaScript("components/ILIAS/WebResource/js/intLink.js"); - $this->tpl->addJavascript("Services/Form/js/Form.js"); + $this->tpl->addJavascript("components/ILIAS/Form/js/Form.js"); $this->tpl->setVariable('TABLE_LINKS', $table->getHTML() . $js); } diff --git a/components/ILIAS/WebResource/classes/class.ilWebResourceExporter.php b/components/ILIAS/WebResource/classes/class.ilWebResourceExporter.php index b4c439678ca9..27821acb7dcb 100644 --- a/components/ILIAS/WebResource/classes/class.ilWebResourceExporter.php +++ b/components/ILIAS/WebResource/classes/class.ilWebResourceExporter.php @@ -70,7 +70,7 @@ public function getXmlExportTailDependencies( $deps = []; // service settings $deps[] = [ - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids ]; diff --git a/components/ILIAS/WebResource/classes/class.ilWebResourceImporter.php b/components/ILIAS/WebResource/classes/class.ilWebResourceImporter.php index c2e7cfe5223c..79116922bcc4 100644 --- a/components/ILIAS/WebResource/classes/class.ilWebResourceImporter.php +++ b/components/ILIAS/WebResource/classes/class.ilWebResourceImporter.php @@ -47,7 +47,7 @@ public function importXmlRepresentation( ilImportMapping $a_mapping ): void { if ($new_id = $a_mapping->getMapping( - 'Services/Container', + 'components/ILIAS/Container', 'objs', $a_id )) { diff --git a/components/ILIAS/WebServices/Curl/classes/class.ilCurlConnectionException.php b/components/ILIAS/WebServices/Curl/classes/class.ilCurlConnectionException.php index 8d5c6d121794..5e2ca2258b64 100644 --- a/components/ILIAS/WebServices/Curl/classes/class.ilCurlConnectionException.php +++ b/components/ILIAS/WebServices/Curl/classes/class.ilCurlConnectionException.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once('Services/Exceptions/classes/class.ilException.php'); +include_once('components/ILIAS/Exceptions/classes/class.ilException.php'); /** * diff --git a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php index 294cecd90e54..76a025936438 100644 --- a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingSettingsGUI.php @@ -161,7 +161,7 @@ protected function cInitOverview($form = null, $current_attribute = null): void $this->tabs->activateTab('ecs_crs_allocation'); $this->tabs->activateSubTab('cInitTree'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ecs_cmap_overview.html', 'Services/WebServices/ECS'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ecs_cmap_overview.html', 'components/ILIAS/WebServices/ECS'); $explorer = $this->cShowLocalExplorer(); if (!$form instanceof ilPropertyFormGUI) { @@ -469,7 +469,7 @@ protected function initFormCSettings(): \ilPropertyFormGUI $imp = new ilCustomInputGUI($this->lng->txt('ecs_cmap_def_cat'), 'default_cat'); $imp->setRequired(true); - $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'Services/WebServices/ECS'); + $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'components/ILIAS/WebServices/ECS'); $tpl->setVariable('SIZE', 5); $tpl->setVariable('MAXLENGTH', 11); $tpl->setVariable('POST_VAR', 'default_cat'); @@ -496,7 +496,7 @@ protected function initFormCSettings(): \ilPropertyFormGUI $allinone_cat = new ilCustomInputGUI($this->lng->txt('ecs_cmap_all_in_one_cat'), 'allinone_cat'); $allinone_cat->setRequired(true); - $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'Services/WebServices/ECS'); + $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'components/ILIAS/WebServices/ECS'); $tpl->setVariable('SIZE', 5); $tpl->setVariable('MAXLENGTH', 11); $tpl->setVariable('POST_VAR', 'allinone_cat'); @@ -775,7 +775,7 @@ protected function dDeleteTree(): void */ protected function dEditTree(ilPropertyFormGUI $form = null): void { - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ecs_edit_tree.html', 'Services/WebServices/ECS'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.ecs_edit_tree.html', 'components/ILIAS/WebServices/ECS'); $this->ctrl->saveParameter($this, 'cid'); diff --git a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingUtils.php b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingUtils.php index da87ccc364c8..dba301b87963 100644 --- a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingUtils.php +++ b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSMappingUtils.php @@ -165,7 +165,7 @@ public static function getCourseValueByMappingAttribute($course, $a_field): arra public static function getRoleMappingInfo($a_role_type_info = 0): array { //KEEP!!! until the defines are turned into proper constants - include_once './Services/Membership/classes/class.ilParticipants.php'; + include_once './components/ILIAS/Membership/classes/class.ilParticipants.php'; $roles = array( ilParticipants::IL_CRS_ADMIN => array( 'role' => ilParticipants::IL_CRS_ADMIN, diff --git a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSNodeMappingTreeTableGUI.php b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSNodeMappingTreeTableGUI.php index be0aae849ba7..2e466fcb7039 100644 --- a/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSNodeMappingTreeTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/Mapping/class.ilECSNodeMappingTreeTableGUI.php @@ -47,7 +47,7 @@ public function __construct(int $a_server_id, int $a_mid, ?object $a_parent_obj, $this->setTitle($this->lng->txt('ecs_cms_directory_trees_tbl')); $this->addColumn($this->lng->txt('title'), '', "80%"); $this->addColumn($this->lng->txt('actions'), '', "20%"); - $this->setRowTemplate("tpl.ecs_node_mapping_tree_table_row.html", "Services/WebServices/ECS"); + $this->setRowTemplate("tpl.ecs_node_mapping_tree_table_row.html", "components/ILIAS/WebServices/ECS"); $this->setEnableHeader(true); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSAppEventListener.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSAppEventListener.php index 1a13bb00beb6..9e1ea8c53b4b 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSAppEventListener.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSAppEventListener.php @@ -39,7 +39,7 @@ public function __construct( /** * Handle an event in a listener. - * @param string $a_component component, e.g. "components/ILIAS/Forum" or "Services/User" + * @param string $a_component component, e.g. "components/ILIAS/Forum" or "components/ILIAS/User" * @param string $a_event event e.g. "createUser", "updateUser", "deleteUser", ... * @param array $a_parameter parameter array (assoc), array("name" => ..., "phone_office" => ...) */ @@ -60,7 +60,7 @@ private function handle($a_component, $a_event, $a_parameter): void $this->logger->debug('Listening to event from: ' . $a_component . ' ' . $a_event); switch ($a_component) { - case 'Services/Authentication': + case 'components/ILIAS/Authentication': switch ($a_event) { case 'afterLogin': $this->handleNewAccountCreation((string) $a_parameter['username']); @@ -68,7 +68,7 @@ private function handle($a_component, $a_event, $a_parameter): void } break; - case 'Services/User': + case 'components/ILIAS/User': if ($a_event === 'afterCreate') { $user = $a_parameter['user_obj']; $this->handleMembership($user); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSCategoryMappingTableGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSCategoryMappingTableGUI.php index d53cf9ea052c..15c12c4b9954 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSCategoryMappingTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSCategoryMappingTableGUI.php @@ -36,7 +36,7 @@ public function __construct($a_parent_obj, $a_parent_cmd) $this->addColumn($this->lng->txt('obj_cat'), 'category', '40%'); $this->addColumn($this->lng->txt('ecs_cat_mapping_type'), 'kind', '50%'); $this->addColumn('', 'edit', '10%'); - $this->setRowTemplate('tpl.rule_row.html', 'Services/WebServices/ECS'); + $this->setRowTemplate('tpl.rule_row.html', 'components/ILIAS/WebServices/ECS'); $this->setDefaultOrderField('title'); $this->setDefaultOrderDirection('asc'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSCommunityTableGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSCommunityTableGUI.php index 3e2f4779688c..7654f9ed38dd 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSCommunityTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSCommunityTableGUI.php @@ -52,7 +52,7 @@ public function __construct(ilECSSetting $set, ?object $a_parent_obj, string $a_ } $this->disable('form'); - $this->setRowTemplate("tpl.participant_row.html", "Services/WebServices/ECS"); + $this->setRowTemplate("tpl.participant_row.html", "components/ILIAS/WebServices/ECS"); $this->setDefaultOrderField('participants'); $this->setDefaultOrderDirection("desc"); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSExportedContentTableGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSExportedContentTableGUI.php index 264199bb0fe1..6a9419fcce0a 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSExportedContentTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSExportedContentTableGUI.php @@ -33,7 +33,7 @@ public function __construct($a_parent_obj, $a_parent_cmd = '') $this->addColumn($this->lng->txt('title'), 'title', '40%'); $this->addColumn($this->lng->txt('ecs_meta_data'), 'md', '40%'); $this->addColumn($this->lng->txt('last_update'), 'last_update', '10%'); - $this->setRowTemplate('tpl.released_content_row.html', 'Services/WebServices/ECS'); + $this->setRowTemplate('tpl.released_content_row.html', 'components/ILIAS/WebServices/ECS'); $this->setDefaultOrderField('title'); $this->setDefaultOrderDirection('asc'); $this->setFormAction($this->ctrl->getFormAction($a_parent_obj)); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSImportedContentTableGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSImportedContentTableGUI.php index 3e8b48aa6c15..66fd2529baa6 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSImportedContentTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSImportedContentTableGUI.php @@ -43,7 +43,7 @@ public function __construct(?object $a_parent_obj, string $a_parent_cmd = '') $this->addColumn($this->lng->txt('ecs_imported_from'), 'from', '15%'); $this->addColumn($this->lng->txt('ecs_meta_data'), 'md', '25%'); $this->addColumn($this->lng->txt('last_update'), 'last_update', '10%'); - $this->setRowTemplate('tpl.content_row.html', 'Services/WebServices/ECS'); + $this->setRowTemplate('tpl.content_row.html', 'components/ILIAS/WebServices/ECS'); $this->setDefaultOrderField('title'); $this->setDefaultOrderDirection('asc'); if ($a_parent_obj) { diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSServerTableGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSServerTableGUI.php index 8e6a2c656dc1..bb177b2f1516 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSServerTableGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSServerTableGUI.php @@ -45,7 +45,7 @@ public function __construct(object $a_parent_obj, string $a_parent_cmd = "") public function initTable(): void { $this->setTitle($this->lng->txt('ecs_available_ecs')); - $this->setRowTemplate('tpl.ecs_server_row.html', 'Services/WebServices/ECS'); + $this->setRowTemplate('tpl.ecs_server_row.html', 'components/ILIAS/WebServices/ECS'); $this->addColumn($this->lng->txt('ecs_tbl_active'), '', '1%'); $this->addColumn($this->lng->txt('title'), '', '80%'); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSSettingsGUI.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSSettingsGUI.php index c8c262811adc..298e1923f559 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSSettingsGUI.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSSettingsGUI.php @@ -381,7 +381,7 @@ protected function initSettingsForm($a_mode = 'update'): void $imp = new ilCustomInputGUI($this->lng->txt('ecs_import_id')); $imp->setRequired(true); - $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'Services/WebServices/ECS'); + $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'components/ILIAS/WebServices/ECS'); $tpl->setVariable('SIZE', 5); $tpl->setVariable('MAXLENGTH', 11); $tpl->setVariable('POST_VAR', 'import_id'); @@ -574,7 +574,7 @@ public function communities(): void 'tpl.ecs_communities.html', true, true, - 'Services/WebServices/ECS' + 'components/ILIAS/WebServices/ECS' ); // add toolbar to refresh communities @@ -998,7 +998,7 @@ protected function initMappingsForm(int $a_server_id, int $mapping_type): ilProp protected function categoryMapping(): void { $this->tabs_gui->setSubTabActive('ecs_category_mapping'); - $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.category_mapping.html', 'Services/WebServices/ECS'); + $this->tpl->addBlockFile('ADM_CONTENT', 'adm_content', 'tpl.category_mapping.html', 'components/ILIAS/WebServices/ECS'); $this->initRule(); $this->initCategoryMappingForm(); @@ -1204,7 +1204,7 @@ protected function initCategoryMappingForm($a_mode = 'add'): void $imp = new ilCustomInputGUI($this->lng->txt('ecs_import_id'), 'import_id'); $imp->setRequired(true); - $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'Services/WebServices/ECS'); + $tpl = new ilTemplate('tpl.ecs_import_id_form.html', true, true, 'components/ILIAS/WebServices/ECS'); $tpl->setVariable('SIZE', 5); $tpl->setVariable('MAXLENGTH', 11); $tpl->setVariable('POST_VAR', 'import_id'); diff --git a/components/ILIAS/WebServices/ECS/classes/class.ilECSTaskScheduler.php b/components/ILIAS/WebServices/ECS/classes/class.ilECSTaskScheduler.php index 09fa19a6d5ed..889e15d3c363 100644 --- a/components/ILIAS/WebServices/ECS/classes/class.ilECSTaskScheduler.php +++ b/components/ILIAS/WebServices/ECS/classes/class.ilECSTaskScheduler.php @@ -162,7 +162,7 @@ private function handleEvents(): void $event_ignored = true; $this->eventHandler->raise( - 'Services/WebServices/ECS', + 'components/ILIAS/WebServices/ECS', 'newEcsEvent', array('event' => $event) ); diff --git a/components/ILIAS/WebServices/RPC/classes/class.ilRpcClientException.php b/components/ILIAS/WebServices/RPC/classes/class.ilRpcClientException.php index cef5f034688e..564f54100811 100644 --- a/components/ILIAS/WebServices/RPC/classes/class.ilRpcClientException.php +++ b/components/ILIAS/WebServices/RPC/classes/class.ilRpcClientException.php @@ -4,7 +4,7 @@ /* Copyright (c) 1998-2016 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once('Services/Exceptions/classes/class.ilException.php'); +include_once('components/ILIAS/Exceptions/classes/class.ilException.php'); /** * Class ilRpcClientException diff --git a/components/ILIAS/WebServices/Rest/server.php b/components/ILIAS/WebServices/Rest/server.php index caae6214ac83..d749e632fdf8 100644 --- a/components/ILIAS/WebServices/Rest/server.php +++ b/components/ILIAS/WebServices/Rest/server.php @@ -4,7 +4,7 @@ chdir('../../..'); -include_once 'Services/Context/classes/class.ilContext.php'; +include_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_REST); $_COOKIE['client_id'] = $_GET['client_id'] = $_REQUEST['client_id']; @@ -12,7 +12,7 @@ include_once './cli/inc.header.php'; -include_once './Services/WebServices/Rest/classes/class.ilRestServer.php'; +include_once './components/ILIAS/WebServices/Rest/classes/class.ilRestServer.php'; $server = new ilRestServer( [ 'settings' => [ diff --git a/components/ILIAS/WebServices/SOAP/classes/class.ilSoapHookPlugin.php b/components/ILIAS/WebServices/SOAP/classes/class.ilSoapHookPlugin.php index b27adf51ba09..26b67172fdf8 100644 --- a/components/ILIAS/WebServices/SOAP/classes/class.ilSoapHookPlugin.php +++ b/components/ILIAS/WebServices/SOAP/classes/class.ilSoapHookPlugin.php @@ -1,6 +1,6 @@ addTestSuite(ilRPCServerSettingsTest::class); include_once './components/ILIAS/soap/test/ilSoapFunctionsTest.php'; diff --git a/components/ILIAS/Wiki/Export/WikiHtmlExport.php b/components/ILIAS/Wiki/Export/WikiHtmlExport.php index 8ee62ffe46be..5a72cbb7e68b 100644 --- a/components/ILIAS/Wiki/Export/WikiHtmlExport.php +++ b/components/ILIAS/Wiki/Export/WikiHtmlExport.php @@ -31,7 +31,7 @@ class WikiHtmlExport public const MODE_COMMENTS = "html_comments"; public const MODE_USER = "user_html"; public const MODE_USER_COMMENTS = "user_html_comments"; - protected \ILIAS\Services\Export\HTML\Util $export_util; + protected \ILIAS\components\Export\HTML\Util $export_util; protected \ilDBInterface $db; protected \ilObjUser $user; @@ -121,7 +121,7 @@ public function buildExportFile(bool $print_version = false): string $this->export_dir = $exp_dir . "/" . $subdir; - $this->export_util = new \ILIAS\Services\Export\HTML\Util($exp_dir, $subdir); + $this->export_util = new \ILIAS\components\Export\HTML\Util($exp_dir, $subdir); // initialize temporary target directory ilFileUtils::delDir($this->export_dir); diff --git a/components/ILIAS/Wiki/classes/class.ilWikiDataSet.php b/components/ILIAS/Wiki/classes/class.ilWikiDataSet.php index bbc069837f4f..b4c1b8b08d40 100644 --- a/components/ILIAS/Wiki/classes/class.ilWikiDataSet.php +++ b/components/ILIAS/Wiki/classes/class.ilWikiDataSet.php @@ -349,7 +349,7 @@ public function importRecord( switch ($a_entity) { case "wiki": - if ($new_id = $a_mapping->getMapping('Services/Container', 'objs', $a_rec['Id'])) { + if ($new_id = $a_mapping->getMapping('components/ILIAS/Container', 'objs', $a_rec['Id'])) { $newObj = ilObjectFactory::getInstanceByObjId($new_id, false); } else { $newObj = new ilObjWiki(); @@ -379,9 +379,9 @@ public function importRecord( $newObj->update(true); $this->current_obj = $newObj; $a_mapping->addMapping("components/ILIAS/Wiki", "wiki", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Object", "obj", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/Rating", "rating_category_parent_id", $a_rec["Id"], $newObj->getId()); - $a_mapping->addMapping("Services/AdvancedMetaData", "parent", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Object", "obj", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/Rating", "rating_category_parent_id", $a_rec["Id"], $newObj->getId()); + $a_mapping->addMapping("components/ILIAS/AdvancedMetaData", "parent", $a_rec["Id"], $newObj->getId()); break; case "wpg": @@ -408,8 +408,8 @@ public function importRecord( } $a_mapping->addMapping("components/ILIAS/Wiki", "wpg", $a_rec["Id"], $wpage->getId()); - $a_mapping->addMapping("Services/COPage", "pg", "wpg:" . $a_rec["Id"], "wpg:" . $wpage->getId()); - $a_mapping->addMapping("Services/AdvancedMetaData", "advmd_sub_item", "advmd:wpg:" . $a_rec["Id"], $wpage->getId()); + $a_mapping->addMapping("components/ILIAS/COPage", "pg", "wpg:" . $a_rec["Id"], "wpg:" . $wpage->getId()); + $a_mapping->addMapping("components/ILIAS/AdvancedMetaData", "advmd_sub_item", "advmd:wpg:" . $a_rec["Id"], $wpage->getId()); break; case "wiki_imp_page": diff --git a/components/ILIAS/Wiki/classes/class.ilWikiExporter.php b/components/ILIAS/Wiki/classes/class.ilWikiExporter.php index 1ba7e6b8e015..6636c476bbc5 100644 --- a/components/ILIAS/Wiki/classes/class.ilWikiExporter.php +++ b/components/ILIAS/Wiki/classes/class.ilWikiExporter.php @@ -58,11 +58,11 @@ public function getXmlExportTailDependencies( $deps = array( array( - "component" => "Services/COPage", + "component" => "components/ILIAS/COPage", "entity" => "pg", "ids" => $pg_ids), array( - "component" => "Services/Rating", + "component" => "components/ILIAS/Rating", "entity" => "rating_category", "ids" => $a_ids ) @@ -83,7 +83,7 @@ public function getXmlExportTailDependencies( if (count($advmd_ids)) { $deps[] = array( - "component" => "Services/AdvancedMetaData", + "component" => "components/ILIAS/AdvancedMetaData", "entity" => "advmd", "ids" => $advmd_ids ); @@ -95,7 +95,7 @@ public function getXmlExportTailDependencies( ? $a_ids : array($a_ids); $deps[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "object_style", "ids" => $obj_ids );*/ @@ -105,7 +105,7 @@ public function getXmlExportTailDependencies( $style_id = $this->content_style_domain->styleForObjId($id)->getStyleId(); if ($style_id > 0) { $deps[] = array( - "component" => "Services/Style", + "component" => "components/ILIAS/Style", "entity" => "sty", "ids" => $style_id ); @@ -114,7 +114,7 @@ public function getXmlExportTailDependencies( // service settings $deps[] = array( - "component" => "Services/Object", + "component" => "components/ILIAS/Object", "entity" => "common", "ids" => $a_ids); diff --git a/components/ILIAS/WorkspaceFolder/classes/class.ilObjWorkspaceFolderGUI.php b/components/ILIAS/WorkspaceFolder/classes/class.ilObjWorkspaceFolderGUI.php index 48cd609acaca..4e0d2764695b 100644 --- a/components/ILIAS/WorkspaceFolder/classes/class.ilObjWorkspaceFolderGUI.php +++ b/components/ILIAS/WorkspaceFolder/classes/class.ilObjWorkspaceFolderGUI.php @@ -420,7 +420,7 @@ public function showMoveIntoObjectTree(bool $repo_switch_allowed = false): void 'ADM_CONTENT', 'adm_content', 'tpl.paste_into_multiple_objects.html', - "Services/Object" + "components/ILIAS/Object" ); // move/copy in personal workspace diff --git a/components/ILIAS/Xml/test/ilServicesXmlSuite.php b/components/ILIAS/Xml/test/ilServicesXmlSuite.php index c06dd60d7a0c..9a93abb9ec39 100644 --- a/components/ILIAS/Xml/test/ilServicesXmlSuite.php +++ b/components/ILIAS/Xml/test/ilServicesXmlSuite.php @@ -26,7 +26,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/Xml/test/ilServicesXmlTest.php"); + require_once("./components/ILIAS/Xml/test/ilServicesXmlTest.php"); $suite->addTestSuite("ilServicesXmlTest"); return $suite; diff --git a/components/ILIAS/YUI/classes/class.ilYuiUtil.php b/components/ILIAS/YUI/classes/class.ilYuiUtil.php index 910c479f3c40..015bb64257f3 100644 --- a/components/ILIAS/YUI/classes/class.ilYuiUtil.php +++ b/components/ILIAS/YUI/classes/class.ilYuiUtil.php @@ -105,7 +105,7 @@ public static function initPanel( $tpl->addJavaScript(self::YUI_BASE . "/yahoo-dom-event/yahoo-dom-event.js"); $tpl->addJavaScript(self::YUI_BASE . "/container/container-min.js"); self::addContainerCss($tpl); - $tpl->addCss("./Services/Calendar/css/panel_min.css"); + $tpl->addCss("./components/ILIAS/Calendar/css/panel_min.css"); if ($a_resize) { $tpl->addCss(self::YUI_BASE . "/resize/assets/skins/sam/resize.css"); diff --git a/components/ILIAS/YUI/test/ilServicesYUISuite.php b/components/ILIAS/YUI/test/ilServicesYUISuite.php index 18f513aec91e..16e570b94c12 100644 --- a/components/ILIAS/YUI/test/ilServicesYUISuite.php +++ b/components/ILIAS/YUI/test/ilServicesYUISuite.php @@ -30,7 +30,7 @@ public static function suite(): self { $suite = new self(); /** @noRector */ - require_once("./Services/YUI/test/YUITest.php"); + require_once("./components/ILIAS/YUI/test/YUITest.php"); $suite->addTestSuite("YUITest"); return $suite; diff --git a/components/ILIAS/jQuery/test/ilServicesjQuerySuite.php b/components/ILIAS/jQuery/test/ilServicesjQuerySuite.php index e1e45a83068d..15f3f39b94cc 100644 --- a/components/ILIAS/jQuery/test/ilServicesjQuerySuite.php +++ b/components/ILIAS/jQuery/test/ilServicesjQuerySuite.php @@ -31,7 +31,7 @@ public static function suite(): self { $suite = new self(); - require_once("./Services/jQuery/test/PathTest.php"); + require_once("./components/ILIAS/jQuery/test/PathTest.php"); $suite->addTestSuite("PathTest"); return $suite; diff --git a/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php b/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php index d1539fb3ab0a..3275203d0eb8 100644 --- a/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php +++ b/components/ILIAS/soap/classes/class.ilNusoapUserAdministrationAdapter.php @@ -38,8 +38,8 @@ include_once './components/ILIAS/soap/lib/nusoap.php'; include_once './components/ILIAS/soap/include/inc.soap_functions.php'; -require_once('./Services/WebServices/SOAP/classes/class.ilSoapHook.php'); -require_once('./Services/Init/classes/class.ilInitialisation.php'); +require_once('./components/ILIAS/WebServices/SOAP/classes/class.ilSoapHook.php'); +require_once('./components/ILIAS/Init/classes/class.ilInitialisation.php'); class ilNusoapUserAdministrationAdapter { diff --git a/components/ILIAS/soap/classes/class.ilObjectXMLException.php b/components/ILIAS/soap/classes/class.ilObjectXMLException.php index b084c1bfca45..068ca5ebad3c 100644 --- a/components/ILIAS/soap/classes/class.ilObjectXMLException.php +++ b/components/ILIAS/soap/classes/class.ilObjectXMLException.php @@ -21,7 +21,7 @@ +-----------------------------------------------------------------------------+ */ -include_once('Services/Exceptions/classes/class.ilException.php'); +include_once('components/ILIAS/Exceptions/classes/class.ilException.php'); /** * Exception class for ObjectXMLWriter and ObjectXMLParser diff --git a/components/ILIAS/soap/classes/class.ilObjectXMLWriter.php b/components/ILIAS/soap/classes/class.ilObjectXMLWriter.php index 6a531f4283e3..a9681e93e6e1 100644 --- a/components/ILIAS/soap/classes/class.ilObjectXMLWriter.php +++ b/components/ILIAS/soap/classes/class.ilObjectXMLWriter.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once "./Services/Xml/classes/class.ilXmlWriter.php"; +include_once "./components/ILIAS/Xml/classes/class.ilXmlWriter.php"; /** * XML writer class @@ -218,7 +218,7 @@ private function appendTimeTargets(int $a_ref_id): void if (!$tree->checkForParentType($a_ref_id, 'crs')) { return; } - include_once('./Services/Object/classes/class.ilObjectActivation.php'); + include_once('./components/ILIAS/Object/classes/class.ilObjectActivation.php'); $time_targets = ilObjectActivation::getItem($a_ref_id); switch ($time_targets['timing_type']) { @@ -351,7 +351,7 @@ private function getAccessInfo(ilObject $object, int $ref_id): string $ilAccess = $DIC['ilAccess']; - include_once 'Services/AccessControl/classes/class.ilAccess.php'; + include_once 'components/ILIAS/AccessControl/classes/class.ilAccess.php'; $ilAccess->checkAccessOfUser($this->getUserId(), 'read', 'view', $ref_id, $object->getType(), $object->getId()); diff --git a/components/ILIAS/soap/classes/class.ilSoapAdministration.php b/components/ILIAS/soap/classes/class.ilSoapAdministration.php index ca8ef05f543b..8fbedb557385 100644 --- a/components/ILIAS/soap/classes/class.ilSoapAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapAdministration.php @@ -30,7 +30,7 @@ */ include_once './components/ILIAS/soap/lib/nusoap.php'; -include_once("./Services/Authentication/classes/class.ilAuthUtils.php"); // to get auth mode constants +include_once("./components/ILIAS/Authentication/classes/class.ilAuthUtils.php"); // to get auth mode constants use ILIAS\Data\Result\Ok; use ILIAS\Data\Result\Error; @@ -159,7 +159,7 @@ protected function initIlias(): void { if (ilContext::getType() === ilContext::CONTEXT_SOAP) { try { - require_once("Services/Init/classes/class.ilInitialisation.php"); + require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::reinitILIAS(); } catch (Exception $e) { } @@ -168,7 +168,7 @@ protected function initIlias(): void protected function initAuthenticationObject(): void { - include_once './Services/Authentication/classes/class.ilAuthFactory.php'; + include_once './components/ILIAS/Authentication/classes/class.ilAuthFactory.php'; ilAuthFactory::setContext(ilAuthFactory::CONTEXT_SOAP); } @@ -251,10 +251,10 @@ protected function checkObjectAccess( public function getInstallationInfoXML(): string { - include_once "Services/Context/classes/class.ilContext.php"; + include_once "components/ILIAS/Context/classes/class.ilContext.php"; ilContext::init(ilContext::CONTEXT_SOAP_WITHOUT_CLIENT); - require_once("Services/Init/classes/class.ilInitialisation.php"); + require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $clientdirs = glob(ILIAS_WEB_DIR . "/*", GLOB_ONLYDIR); @@ -275,10 +275,10 @@ public function getInstallationInfoXML(): string */ public function getClientInfoXML(string $clientid) { - include_once "Services/Context/classes/class.ilContext.php"; + include_once "components/ILIAS/Context/classes/class.ilContext.php"; ilContext::init(ilContext::CONTEXT_SOAP_WITHOUT_CLIENT); - require_once("Services/Init/classes/class.ilInitialisation.php"); + require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $clientdir = ILIAS_WEB_DIR . "/" . $clientid; diff --git a/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php b/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php index 4148113cab0c..31635d8ab20e 100644 --- a/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapCourseAdministration.php @@ -95,7 +95,7 @@ public function deleteCourse(string $sid, int $course_id) return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once "./Services/Utilities/classes/class.ilUtil.php"; + include_once "./components/ILIAS/Utilities/classes/class.ilUtil.php"; global $DIC; $rbacsystem = $DIC['rbacsystem']; @@ -194,7 +194,7 @@ public function assignCourseMember(string $sid, int $course_id, int $user_id, st switch ($type) { case 'Admin': - require_once("Services/Administration/classes/class.ilSetting.php"); + require_once("components/ILIAS/Administration/classes/class.ilSetting.php"); $settings = new ilSetting(); $course_members->add($tmp_user->getId(), ilParticipants::IL_CRS_ADMIN); $course_members->updateNotification( @@ -383,7 +383,7 @@ public function updateCourse(string $sid, int $course_id, string $xml) } // First delete old meta data - include_once 'Services/MetaData/classes/class.ilMD.php'; + include_once 'components/ILIAS/MetaData/classes/class.ilMD.php'; $md = new ilMD($tmp_course->getId(), 0, 'crs'); $md->deleteAll(); diff --git a/components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php b/components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php index 04ea3ddcd612..a217d2749783 100644 --- a/components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php +++ b/components/ILIAS/soap/classes/class.ilSoapInstallationInfoXMLWriter.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once "./Services/Xml/classes/class.ilXmlWriter.php"; +include_once "./components/ILIAS/Xml/classes/class.ilXmlWriter.php"; class ilSoapInstallationInfoXMLWriter extends ilXmlWriter { @@ -64,7 +64,7 @@ private function buildClient(string $client_directory): bool $ini_file = "./" . $client_directory . "/client.ini.php"; // get settings from ini file - require_once("./Services/Init/classes/class.ilIniFile.php"); + require_once("./components/ILIAS/Init/classes/class.ilIniFile.php"); $ilClientIniFile = new ilIniFile($ini_file); $ilClientIniFile->read(); @@ -88,7 +88,7 @@ private function buildClient(string $client_directory): bool unset($DIC['ilDB']); $DIC['ilDB'] = $ilDB; - require_once("Services/Administration/classes/class.ilSetting.php"); + require_once("components/ILIAS/Administration/classes/class.ilSetting.php"); $settings = new ilSetting(); unset($DIC["ilSetting"]); diff --git a/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php b/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php index 687431656fdb..66a409e90265 100644 --- a/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapLearningProgressAdministration.php @@ -61,7 +61,7 @@ public function deleteProgress(string $sid, array $ref_ids, array $usr_ids, arra return $this->raiseError('Invalid filter type given', 'Client'); } - include_once 'Services/User/classes/class.ilObjUser.php'; + include_once 'components/ILIAS/User/classes/class.ilObjUser.php'; if (!in_array(self::USER_FILTER_ALL, $usr_ids) && !ilObjUser::userExists($usr_ids)) { return $this->raiseError('Invalid user ids given', 'Client'); } @@ -109,7 +109,7 @@ public function deleteProgress(string $sid, array $ref_ids, array $usr_ids, arra // Delete tracking data foreach ($valid_refs as $ref_id) { - include_once './Services/Object/classes/class.ilObjectFactory.php'; + include_once './components/ILIAS/Object/classes/class.ilObjectFactory.php'; $obj = ilObjectFactory::getInstanceByRefId($ref_id, false); if (!$obj instanceof ilObject) { @@ -143,7 +143,7 @@ public function deleteProgress(string $sid, array $ref_ids, array $usr_ids, arra } // Refresh status - include_once './Services/Tracking/classes/class.ilLPStatusWrapper.php'; + include_once './components/ILIAS/Tracking/classes/class.ilLPStatusWrapper.php'; ilLPStatusWrapper::_resetInfoCaches($obj->getId()); ilLPStatusWrapper::_refreshStatus($obj->getId(), $valid_users); } @@ -179,7 +179,7 @@ public function getProgressInfo(string $sid, int $a_ref_id, array $a_progress_fi ); } // Check LP enabled - include_once("Services/Tracking/classes/class.ilObjUserTracking.php"); + include_once("components/ILIAS/Tracking/classes/class.ilObjUserTracking.php"); if (!ilObjUserTracking::_enabledLearningProgress()) { return $this->raiseError( 'Error ' . self::SOAP_LP_ERROR_LP_NOT_ENABLED . ': Learning progress not enabled in ILIAS', @@ -187,7 +187,7 @@ public function getProgressInfo(string $sid, int $a_ref_id, array $a_progress_fi ); } - include_once './Services/Object/classes/class.ilObjectFactory.php'; + include_once './components/ILIAS/Object/classes/class.ilObjectFactory.php'; $obj = ilObjectFactory::getInstanceByRefId($a_ref_id, false); if (!$obj instanceof ilObject) { return $this->raiseError( @@ -197,7 +197,7 @@ public function getProgressInfo(string $sid, int $a_ref_id, array $a_progress_fi } // check lp available - include_once './Services/Tracking/classes/class.ilLPObjSettings.php'; + include_once './components/ILIAS/Tracking/classes/class.ilLPObjSettings.php'; $mode = ilLPObjSettings::_lookupDBMode($obj->getId()); if ($mode === ilLPObjSettings::LP_MODE_UNDEFINED) { return $this->raiseError( @@ -222,7 +222,7 @@ public function getProgressInfo(string $sid, int $a_ref_id, array $a_progress_fi ); } - include_once './Services/Xml/classes/class.ilXmlWriter.php'; + include_once './components/ILIAS/Xml/classes/class.ilXmlWriter.php'; $writer = new ilXmlWriter(); $writer->xmlStartTag( 'LearningProgressInfo', @@ -234,7 +234,7 @@ public function getProgressInfo(string $sid, int $a_ref_id, array $a_progress_fi $writer->xmlStartTag('LearningProgressSummary'); - include_once './Services/Tracking/classes/class.ilLPStatusWrapper.php'; + include_once './components/ILIAS/Tracking/classes/class.ilLPStatusWrapper.php'; if (in_array(self::PROGRESS_FILTER_ALL, $a_progress_filter) || in_array( self::PROGRESS_FILTER_COMPLETED, $a_progress_filter @@ -409,7 +409,7 @@ protected function addUserProgress(ilXmlWriter $writer, array $users, int $a_typ */ protected function applyProgressFilter(int $obj_id, array $usr_ids, array $filter): array { - include_once './Services/Tracking/classes/class.ilLPStatusWrapper.php'; + include_once './components/ILIAS/Tracking/classes/class.ilLPStatusWrapper.php'; $all_users = array(); if (in_array(self::USER_FILTER_ALL, $usr_ids)) { @@ -514,7 +514,7 @@ public function getLearningProgressChanges(string $sid, string $timestamp, bool // output lp changes as xml try { - include_once './Services/Tracking/classes/class.ilLPXmlWriter.php'; + include_once './components/ILIAS/Tracking/classes/class.ilLPXmlWriter.php'; $writer = new ilLPXmlWriter(true); $writer->setTimestamp($timestamp); $writer->setIncludeRefIds($include_ref_ids); diff --git a/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php b/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php index 8e8fb343b91a..ccefa04e7657 100644 --- a/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapObjectAdministration.php @@ -206,7 +206,7 @@ public function getObjectsByTitle(string $sid, string $a_title, int $user_id) 'Client' ); } - include_once './Services/Search/classes/class.ilQueryParser.php'; + include_once './components/ILIAS/Search/classes/class.ilQueryParser.php'; $query_parser = new ilQueryParser($a_title); $query_parser->setMinWordLength(0); $query_parser->setCombination(ilQueryParser::QP_COMBINATION_AND); @@ -218,8 +218,8 @@ public function getObjectsByTitle(string $sid, string $a_title, int $user_id) ); } - include_once './Services/Search/classes/class.ilObjectSearchFactory.php'; - include_once 'Services/Search/classes/Like/class.ilLikeObjectSearch.php'; + include_once './components/ILIAS/Search/classes/class.ilObjectSearchFactory.php'; + include_once 'components/ILIAS/Search/classes/Like/class.ilLikeObjectSearch.php'; $object_search = new ilLikeObjectSearch($query_parser); $object_search->setFields(array('title')); $object_search->appendToFilter('role'); @@ -282,7 +282,7 @@ public function searchObjects(string $sid, array $types, string $key, string $co } $highlighter = null; - include_once './Services/Search/classes/class.ilSearchSettings.php'; + include_once './components/ILIAS/Search/classes/class.ilSearchSettings.php'; if (ilSearchSettings::getInstance()->enabledLucene()) { ilSearchSettings::getInstance()->setMaxHits(25); @@ -299,16 +299,16 @@ public function searchObjects(string $sid, array $types, string $key, string $co $typeFilterQuery .= ') '; } - include_once './Services/Search/classes/Lucene/class.ilLuceneQueryParser.php'; + include_once './components/ILIAS/Search/classes/Lucene/class.ilLuceneQueryParser.php'; $query_parser = new ilLuceneQueryParser($typeFilterQuery . $key); $query_parser->parse(); - include_once './Services/Search/classes/Lucene/class.ilLuceneSearcher.php'; + include_once './components/ILIAS/Search/classes/Lucene/class.ilLuceneSearcher.php'; $searcher = ilLuceneSearcher::getInstance($query_parser); $searcher->search(); - include_once './Services/Search/classes/Lucene/class.ilLuceneSearchResultFilter.php'; - include_once './Services/Search/classes/Lucene/class.ilLucenePathFilter.php'; + include_once './components/ILIAS/Search/classes/Lucene/class.ilLuceneSearchResultFilter.php'; + include_once './components/ILIAS/Search/classes/Lucene/class.ilLucenePathFilter.php'; $filter = ilLuceneSearchResultFilter::getInstance($user_id); $filter->setCandidates($searcher->getResult()); $filter->filter(); @@ -322,13 +322,13 @@ public function searchObjects(string $sid, array $types, string $key, string $co $objs[] = $obj; } } - include_once './Services/Search/classes/Lucene/class.ilLuceneHighlighterResultParser.php'; + include_once './components/ILIAS/Search/classes/Lucene/class.ilLuceneHighlighterResultParser.php'; $highlighter = new ilLuceneHighlighterResultParser(); if ($filter->getResultObjIds()) { $highlighter = $searcher->highlight($filter->getResultObjIds()); } } else { - include_once './Services/Search/classes/class.ilQueryParser.php'; + include_once './components/ILIAS/Search/classes/class.ilQueryParser.php'; $query_parser = new ilQueryParser($key); $query_parser->setCombination($combination === 'and' ? ilQueryParser::QP_COMBINATION_AND : ilQueryParser::QP_COMBINATION_OR); @@ -340,7 +340,7 @@ public function searchObjects(string $sid, array $types, string $key, string $co ); } - include_once './Services/Search/classes/Like/class.ilLikeObjectSearch.php'; + include_once './components/ILIAS/Search/classes/Like/class.ilLikeObjectSearch.php'; $object_search = new ilLikeObjectSearch($query_parser); $object_search->setFilter($types); $res = $object_search->performSearch(); @@ -1371,7 +1371,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('./components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'); - include_once('./Services/Object/classes/class.ilObjectActivation.php'); + include_once('./components/ILIAS/Object/classes/class.ilObjectActivation.php'); $old = ilObjectActivation::getItem($ref_data['ref_id']); $items = new ilObjectActivation(); @@ -1426,7 +1426,7 @@ private function addReferences(ilObject $source, array $a_object_data): void } if (isset($ref_data['time_target']) /* and ($crs_ref_id = $tree->checkForParentType($new_ref_id,'crs')) */) { include_once('./components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'); - include_once('./Services/Object/classes/class.ilObjectActivation.php'); + include_once('./components/ILIAS/Object/classes/class.ilObjectActivation.php'); if (!isset($ref_data['time_target']['starting_time'])) { $ref_data['time_target']['starting_time'] = time(); diff --git a/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php b/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php index 27ce26cdf1ea..da77a4380dd6 100644 --- a/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapRBACAdministration.php @@ -421,7 +421,7 @@ public function addRole(string $sid, int $target_id, string $role_xml) ); } - include_once './Services/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; $role = new ilObjRole(); $role->setTitle($object_data['title']); $role->setDescription($object_data['description']); @@ -489,7 +489,7 @@ public function addRoleFromTemplate(string $sid, int $target_id, string $role_xm ); } - include_once './Services/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; $role = new ilObjRole(); $role->setTitle($object_data['title']); $role->setDescription($object_data['description']); @@ -727,7 +727,7 @@ public function searchRoles(string $sid, string $key, string $combination, strin ); } - include_once './Services/Search/classes/class.ilQueryParser.php'; + include_once './components/ILIAS/Search/classes/class.ilQueryParser.php'; $query_parser = new ilQueryParser($key); $query_parser->setMinWordLength(3); @@ -737,7 +737,7 @@ public function searchRoles(string $sid, string $key, string $combination, strin return $this->raiseError($query_parser->getMessage(), 'Client'); } - include_once './Services/Search/classes/class.ilObjectSearchFactory.php'; + include_once './components/ILIAS/Search/classes/class.ilObjectSearchFactory.php'; $object_search = ilObjectSearchFactory::_getObjectSearchInstance($query_parser); $object_search->setFilter(array("role", "rolt")); diff --git a/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php b/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php index c2dcc6b18c82..cac31cb245b1 100644 --- a/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php +++ b/components/ILIAS/soap/classes/class.ilSoapRoleObjectXMLWriter.php @@ -48,7 +48,7 @@ public function start(): bool $this->buildHeader(); - include_once './Services/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; include_once './components/ILIAS/soap/classes/class.ilObjectXMLWriter.php'; foreach ($this->roles as $role) { diff --git a/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php b/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php index c33e7a414f41..ab98d288515e 100644 --- a/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapSCORMAdministration.php @@ -166,8 +166,8 @@ public function getSCORMCompletionStatus(string $sid, int $a_usr_id, int $a_ref_ ); } - include_once 'Services/Tracking/classes/class.ilLPStatus.php'; - include_once 'Services/Tracking/classes/class.ilObjUserTracking.php'; + include_once 'components/ILIAS/Tracking/classes/class.ilLPStatus.php'; + include_once 'components/ILIAS/Tracking/classes/class.ilObjUserTracking.php'; if (!ilObjUserTracking::_enabledLearningProgress()) { return $this->raiseError('Learning progress not enabled in this installation. Aborting!', 'Server'); diff --git a/components/ILIAS/soap/classes/class.ilSoapStructureObjectXMLWriter.php b/components/ILIAS/soap/classes/class.ilSoapStructureObjectXMLWriter.php index 0c2880773c79..6176f19d55c5 100644 --- a/components/ILIAS/soap/classes/class.ilSoapStructureObjectXMLWriter.php +++ b/components/ILIAS/soap/classes/class.ilSoapStructureObjectXMLWriter.php @@ -2,7 +2,7 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ -include_once "./Services/Xml/classes/class.ilXmlWriter.php"; +include_once "./components/ILIAS/Xml/classes/class.ilXmlWriter.php"; /** * XML writer class diff --git a/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php b/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php index c53f66dd43dd..bbb49a568892 100644 --- a/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php +++ b/components/ILIAS/soap/classes/class.ilSoapUserAdministration.php @@ -48,19 +48,19 @@ public function login(string $client, string $username, string $password) } // now try authentication - include_once './Services/Authentication/classes/Frontend/class.ilAuthFrontendCredentials.php'; + include_once './components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontendCredentials.php'; $credentials = new ilAuthFrontendCredentials(); $credentials->setUsername($username); $credentials->setPassword($password); - include_once './Services/Authentication/classes/Provider/class.ilAuthProviderFactory.php'; + include_once './components/ILIAS/Authentication/classes/Provider/class.ilAuthProviderFactory.php'; $provider_factory = new ilAuthProviderFactory(); $providers = $provider_factory->getProviders($credentials); - include_once './Services/Authentication/classes/class.ilAuthStatus.php'; + include_once './components/ILIAS/Authentication/classes/class.ilAuthStatus.php'; $status = ilAuthStatus::getInstance(); - include_once './Services/Authentication/classes/Frontend/class.ilAuthFrontendFactory.php'; + include_once './components/ILIAS/Authentication/classes/Frontend/class.ilAuthFrontendFactory.php'; $frontend_factory = new ilAuthFrontendFactory(); $frontend_factory->setContext(ilAuthFrontendFactory::CONTEXT_CLI); $frontend = $frontend_factory->getFrontend( @@ -98,7 +98,7 @@ public function logout(string $sid) return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once './Services/Authentication/classes/class.ilSession.php'; + include_once './components/ILIAS/Authentication/classes/class.ilSession.php'; ilSession::setClosingContext(ilSession::SESSION_CLOSE_USER); $GLOBALS['DIC']['ilAuthSession']->logout(); return true; @@ -155,9 +155,9 @@ public function importUsers(string $sid, int $folder_id, string $usr_xml, int $c return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once './Services/User/classes/class.ilUserImportParser.php'; - include_once './Services/AccessControl/classes/class.ilObjRole.php'; - include_once './Services/Object/classes/class.ilObjectFactory.php'; + include_once './components/ILIAS/User/classes/class.ilUserImportParser.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/Object/classes/class.ilObjectFactory.php'; global $DIC; $rbacreview = $DIC['rbacreview']; @@ -365,7 +365,7 @@ protected function isPermittedRole(int $a_folder, int $a_role) if ($a_folder !== self::USER_FOLDER_ID && $a_folder !== 0) { $ilLog->write(__METHOD__ . ': ' . $a_folder); - include_once './Services/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; if (!ilObjRole::_getAssignUsersStatus($a_role)) { $ilLog->write(__METHOD__ . ': No assignment allowed'); $checked_roles[$a_role] = false; @@ -500,7 +500,7 @@ public function getUsersForContainer(string $sid, int $ref_id, bool $attachRoles break; } - include_once './Services/User/classes/class.ilUserXMLWriter.php'; + include_once './components/ILIAS/User/classes/class.ilUserXMLWriter.php'; $xmlWriter = new ilUserXMLWriter(); $xmlWriter->setObjects($data); @@ -525,7 +525,7 @@ public function getUserForRole(string $sid, int $role_id, bool $attachRoles, int return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once './Services/AccessControl/classes/class.ilObjRole.php'; + include_once './components/ILIAS/AccessControl/classes/class.ilObjRole.php'; global $DIC; $ilDB = $DIC['ilDB']; @@ -575,7 +575,7 @@ public function getUserForRole(string $sid, int $role_id, bool $attachRoles, int } $data = ilObjUser::_getUsersForRole($role_id, $active); - include_once './Services/User/classes/class.ilUserXMLWriter.php'; + include_once './components/ILIAS/User/classes/class.ilUserXMLWriter.php'; $xmlWriter = new ilUserXMLWriter(); $xmlWriter->setAttachRoles($attachRoles); @@ -730,7 +730,7 @@ public function searchUser( $data[] = $row; } - include_once './Services/User/classes/class.ilUserXMLWriter.php'; + include_once './components/ILIAS/User/classes/class.ilUserXMLWriter.php'; $xmlWriter = new ilUserXMLWriter(); $xmlWriter->setAttachRoles($attach_roles); @@ -819,7 +819,7 @@ public function getUserXML(string $sid, array $a_user_ids, bool $attach_roles) $data = ilObjUser::_getUserData($a_user_ids); - include_once './Services/User/classes/class.ilUserXMLWriter.php'; + include_once './components/ILIAS/User/classes/class.ilUserXMLWriter.php'; $xmlWriter = new ilUserXMLWriter(); $xmlWriter->setAttachRoles($attach_roles); $xmlWriter->setObjects($data); diff --git a/components/ILIAS/soap/classes/class.ilSoapUtils.php b/components/ILIAS/soap/classes/class.ilSoapUtils.php index 1f71443446da..c7c7eed9bd6f 100644 --- a/components/ILIAS/soap/classes/class.ilSoapUtils.php +++ b/components/ILIAS/soap/classes/class.ilSoapUtils.php @@ -48,7 +48,7 @@ public function saveTempFileAsMediaObject(string $sid, string $name, string $tmp return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once "./Services/MediaObjects/classes/class.ilObjMediaObject.php"; + include_once "./components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php"; return ilObjMediaObject::_saveTempFileAsMediaObject($name, $tmp_name); } @@ -64,7 +64,7 @@ public function getMobsOfObject(string $sid, string $a_type, int $a_id) return $this->raiseError($this->getMessage(), $this->getMessageCode()); } - include_once "./Services/MediaObjects/classes/class.ilObjMediaObject.php"; + include_once "./components/ILIAS/MediaObjects/classes/class.ilObjMediaObject.php"; return ilObjMediaObject::_getMobsOfObject($a_type, $a_id); } @@ -87,7 +87,7 @@ public function ilCloneDependencies(string $sid, int $copy_identifier, bool $is_ $ilLog = $DIC['ilLog']; $ilUser = $DIC['ilUser']; - include_once('Services/CopyWizard/classes/class.ilCopyWizardOptions.php'); + include_once('components/ILIAS/CopyWizard/classes/class.ilCopyWizardOptions.php'); $cp_options = ilCopyWizardOptions::_getInstance($copy_identifier); // Check owner of copy procedure @@ -148,7 +148,7 @@ public function ilClone(string $sid, int $copy_identifier) $ilUser = $DIC->user(); - include_once('Services/CopyWizard/classes/class.ilCopyWizardOptions.php'); + include_once('components/ILIAS/CopyWizard/classes/class.ilCopyWizardOptions.php'); $cp_options = ilCopyWizardOptions::_getInstance($copy_identifier); // Check owner of copy procedure @@ -260,7 +260,7 @@ private function callNextNode(string $sid, ilCopyWizardOptions $cp_options): voi $cp_options->dropFirstNode(); if ($cp_options->isSOAPEnabled()) { // Start next soap call - include_once 'Services/WebServices/SOAP/classes/class.ilSoapClient.php'; + include_once 'components/ILIAS/WebServices/SOAP/classes/class.ilSoapClient.php'; $soap_client = new ilSoapClient(); $soap_client->setResponseTimeout(1); $soap_client->enableWSDL(true); @@ -280,7 +280,7 @@ private function callNextDependency(string $sid, ilCopyWizardOptions $cp_options if ($cp_options->isSOAPEnabled()) { // Start next soap call - include_once 'Services/WebServices/SOAP/classes/class.ilSoapClient.php'; + include_once 'components/ILIAS/WebServices/SOAP/classes/class.ilSoapClient.php'; $soap_client = new ilSoapClient(); $soap_client->setResponseTimeout(1); $soap_client->enableWSDL(true); @@ -331,7 +331,7 @@ private function cloneNode(array $node, ilCopyWizardOptions $cp_options): int } // rbac log - include_once "Services/AccessControl/classes/class.ilRbacLog.php"; + include_once "components/ILIAS/AccessControl/classes/class.ilRbacLog.php"; $rbac_log_roles = $rbacreview->getParentRoleIds($new_obj->getRefId(), false); $rbac_log = ilRbacLog::gatherFaPa($new_obj->getRefId(), array_keys($rbac_log_roles), true); ilRbacLog::add(ilRbacLog::COPY_OBJECT, $new_obj->getRefId(), $rbac_log, true); @@ -446,7 +446,7 @@ private function linkNode(array $node, ilCopyWizardOptions $cp_options): int } // rbac log - include_once "Services/AccessControl/classes/class.ilRbacLog.php"; + include_once "components/ILIAS/AccessControl/classes/class.ilRbacLog.php"; $rbac_log_roles = $rbacreview->getParentRoleIds($new_ref_id, false); $rbac_log = ilRbacLog::gatherFaPa($new_ref_id, array_keys($rbac_log_roles), true); ilRbacLog::add(ilRbacLog::LINK_OBJECT, $new_ref_id, $rbac_log, true); @@ -473,7 +473,7 @@ public function deleteExpiredDualOptInUserObjects(string $sid, int $usr_id): boo $ilLog = $DIC->logger()->user(); $ilLog->debug('Started deletion of inactive user objects with expired confirmation hash values (dual opt in) ...'); - require_once 'Services/Registration/classes/class.ilRegistrationSettings.php'; + require_once 'components/ILIAS/Registration/classes/class.ilRegistrationSettings.php'; $oRegSettigs = new ilRegistrationSettings(); $query = ''; diff --git a/components/ILIAS/soap/include/inc.soap_functions.php b/components/ILIAS/soap/include/inc.soap_functions.php index 598c1c7730c1..9b65e8b2cdb9 100644 --- a/components/ILIAS/soap/include/inc.soap_functions.php +++ b/components/ILIAS/soap/include/inc.soap_functions.php @@ -751,7 +751,7 @@ public static function copyObject(string $sid, string $copy_settings_xml) */ public static function startBackgroundTaskWorker(string $sid) { - require_once("./Services/BackgroundTasks/classes/class.ilSoapBackgroundTasksAdministration.php"); + require_once("./components/ILIAS/BackgroundTasks_/classes/class.ilSoapBackgroundTasksAdministration.php"); $soa = new ilSoapBackgroundTasksAdministration(); return $soa->runAsync($sid); } @@ -858,7 +858,7 @@ public static function buildHTTPPath(): string $path = dirname($_SERVER['REQUEST_URI'] ?? ''); //dirname cuts the last directory from a directory path e.g content/classes return content - include_once 'Services/FileServices/classes/class.ilFileUtils.php'; + include_once 'components/ILIAS/FileServices/classes/class.ilFileUtils.php'; $module = ilFileUtils::removeTrailingPathSeparators(ILIAS_MODULE); $dirs = explode('/', $module); @@ -1086,7 +1086,7 @@ public function __call($name, $arguments) // Note: We need to bootstrap ILIAS in order to get $ilPluginAdmin and load the soap plugins. // We MUST use a context that does not handle authentication at this point (session is checked by SOAP). ilContext::init(ilContext::CONTEXT_SOAP_NO_AUTH); - require_once 'Services/Init/classes/class.ilInitialisation.php'; + require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); ilContext::init(ilContext::CONTEXT_SOAP); global $DIC; diff --git a/composer.json b/composer.json index 17c91c4f5f16..fe8afb498552 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "@php libs/composer/rmdirs.php" ], "test-php-all": [ - "./libs/composer/vendor/bin/phpunit -c ./Services/PHPUnit/config/PhpUnitConfig.xml --colors=always --disallow-todo-tests" + "./libs/composer/vendor/bin/phpunit -c ./components/ILIAS/PHPUnit/config/PhpUnitConfig.xml --colors=always --disallow-todo-tests" ], "test-php": [ "./CI/PHPUnit/run_tests.sh" @@ -93,14 +93,13 @@ }, "classmap": [ "./Customizing/global/plugins", - "./Services/", "./components/ILIAS", "./libs/ilias", "./components/ILIAS/soap", "./setup/classes" ], "exclude-from-classmap": [ - "./Services/Migration", + "./components/ILIAS/Migration", "./*/*/lib", "./*/*/test", "./Customizing/**/vendor" ] @@ -109,7 +108,7 @@ "ext-gd" : { "source" : "https://www.php.net/manual/en/book.image.php", "used_version" : "*", - "wrapped_by" : "Services/MediaObjects", + "wrapped_by" : "components/ILIAS/MediaObjects", "added_by" : "Alexander Killing", "last_update" : "", "last_update_by" : "", @@ -131,7 +130,7 @@ "ext-xsl" : { "source" : "https://www.php.net/manual/en/book.xsl.php", "used_version" : "*", - "wrapped_by" : "Services/COPage", + "wrapped_by" : "components/ILIAS/COPage", "added_by" : "Alexander Killing", "last_update" : "", "last_update_by" : "", @@ -193,7 +192,7 @@ "monolog/monolog" : { "source" : "https://github.com/Seldaek/monolog", "used_version" : "v2.6.0", - "wrapped_by" : "Services/Logging", + "wrapped_by" : "components/ILIAS/Logging", "added_by" : "Stefan Meyer ", "last_update" : "2022-05-11", "last_update_by" : "Stefan Meyer ", @@ -203,7 +202,7 @@ "ezyang/htmlpurifier" : { "source" : "http://repo.or.cz/htmlpurifier.git", "used_version" : "v4.16.0", - "wrapped_by" : "Services/Html", + "wrapped_by" : "components/ILIAS/Html", "added_by" : "Michael Jansen ", "last_update" : "2022-11-08", "last_update_by" : "Michael Jansen ", @@ -213,7 +212,7 @@ "phpmailer/phpmailer" : { "source" : "https://github.com/PHPMailer/PHPMailer", "used_version" : "v6.8.1", - "wrapped_by" : "Services/Mail", + "wrapped_by" : "components/ILIAS/Mail", "added_by" : "Maximilian Becker ", "last_update" : "2023-09-05", "last_update_by" : "Michael Jansen ", @@ -223,7 +222,7 @@ "james-heinrich/getid3" : { "source" : "https://github.com/JamesHeinrich/getID3", "used_version" : "v1.9.12", - "wrapped_by" : "Services/MediaObjects", + "wrapped_by" : "components/ILIAS/MediaObjects", "added_by" : "Alexander Killing ", "last_update" : "2023-10-26", "last_update_by" : "Alexander Killing ", @@ -234,7 +233,7 @@ "geshi/geshi" : { "source" : "https://github.com/GeSHi/geshi-1.0", "used_version" : "v1.0.9.1", - "wrapped_by" : "Services/COPage", + "wrapped_by" : "components/ILIAS/COPage", "added_by" : "Alexander Killing ", "last_update" : "2020-01-27", "last_update_by" : "Alexander Killing ", @@ -245,7 +244,7 @@ "tecnickcom/tcpdf" : { "source" : "https://github.com/tecnickcom/TCPDF", "used_version" : "v6.3.5", - "wrapped_by" : "Services/PDFGeneration", + "wrapped_by" : "components/ILIAS/PDFGeneration", "added_by" : "Maximilian Becker ", "last_update" : "2020-10-15", "last_update_by" : "Michael Jansen ", @@ -385,7 +384,7 @@ "sabre/dav": { "source" : "https://github.com/sabre-io/dav.git", "used_version" : "v3.2.2", - "wrapped_by" : "Services/WebDAV", + "wrapped_by" : "components/ILIAS/WebDAV", "added_by" : "Raphael Heer ", "last_update" : "2018-03-12", "last_update_by" : "Raphael Heer ", @@ -395,7 +394,7 @@ "phpoffice/phpspreadsheet" : { "source" : "https://github.com/PHPOffice/PhpSpreadsheet", "used_version" : "v1.29.0", - "wrapped_by" : "Services/Excel", + "wrapped_by" : "components/ILIAS/Excel", "added_by" : "Jesús López ", "last_update" : "2023-10-26", "last_update_by" : "Alex Killing ", @@ -416,7 +415,7 @@ "source": "https://github.com/slimphp/Slim", "used_version": "v3.11", "added_by": "Stefan Meyer ", "approved-by": "Jour Fixe", @@ -464,7 +463,7 @@ "enshrined/svg-sanitize" : { "source" : "https://github.com/darylldoyle/svg-sanitizer", "used_version" : "v0.16.0", - "wrapped_by" : "Services/MediaObject", + "wrapped_by" : "components/ILIAS/MediaObject", "added_by" : "Alex Killing ", "last_update" : "2023-10-26", "last_update_by" : "Alex Killing ", diff --git a/confirmReg.php b/confirmReg.php index 85ee9e21bf17..7e81149cf29b 100644 --- a/confirmReg.php +++ b/confirmReg.php @@ -22,7 +22,7 @@ exit(); } -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); /** @var ILIAS\DI\Container $DIC */ diff --git a/docs/development/file-handling.md b/docs/development/file-handling.md index 7ad47836b2b5..10e249e2c43e 100644 --- a/docs/development/file-handling.md +++ b/docs/development/file-handling.md @@ -71,7 +71,7 @@ More information about ilCtrl: [Services/UICore/README.md](../../Services/UICore return new ilFileHandlingDemoStakeholder(); } ``` -More information about stakeholders: [Services/ResourceStorage/README.md](../../src/ResourceStorage/README.md) +More information about stakeholders: [components/ILIAS/ResourceStorage_/README.md](../../src/ResourceStorage/README.md) After submitting the form, we receive the processed resource IDs already stored in the IRSS as a string: diff --git a/docs/development/language.md b/docs/development/language.md index 75a990b338b9..3db56dd7caba 100644 --- a/docs/development/language.md +++ b/docs/development/language.md @@ -1,6 +1,6 @@ ILIAS Language Handling ======================= -ILIAS offers multi-language support for the user interface of ILIAS. Language handling in ILIAS is realised by the [Language](../../Services/Language/README.md) service. +ILIAS offers multi-language support for the user interface of ILIAS. Language handling in ILIAS is realised by the [Language](../../components/ILIAS/Language_/README.md) service. # Guidelines 1. All language entries are text strings and stored in language files in the diff --git a/docs/development/refactorings.md b/docs/development/refactorings.md index e1ce9a3b947e..fa1e30892188 100644 --- a/docs/development/refactorings.md +++ b/docs/development/refactorings.md @@ -72,15 +72,15 @@ The current configuration applied rules and rulesets will help you to maintain your code and update it for PHP 8.1 and PHP 8.2. The rules will be applied to your code using the following command (the -example applies the ule so Services/GlobalCache): +example applies the ule so components/ILIAS/GlobalCache_): ```bash -./libs/composer/vendor/bin/rector process --config ./CI/Rector/basic_rector.php --no-diffs Services/GlobalCache +./libs/composer/vendor/bin/rector process --config ./CI/Rector/basic_rector.php --no-diffs components/ILIAS/GlobalCache_ ``` There also is a composer script for the same command: ```bash -composer rector Services/GlobalCache +composer rector components/ILIAS/GlobalCache_ ``` Please review and test your changes after applying the rules. There might be some placey whwre you do not want to apply the rules. You can opt-out lines @@ -89,7 +89,7 @@ with the comment ``@noRector`, e.g.: ```php /** @noRector */ $this->class_loader = include -"Services/GlobalScreen/artifacts/global_screen_providers.php"; +"components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php"; ``` It's quite easy to write own rules for rector, currently done with the Rule diff --git a/error.php b/error.php index 9877dc34c31d..e9dd2e7f8265 100755 --- a/error.php +++ b/error.php @@ -3,7 +3,7 @@ /* Copyright (c) 1998-2009 ILIAS open source, Extended GPL, see docs/LICENSE */ try { - require_once("Services/Init/classes/class.ilInitialisation.php"); + require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $DIC->globalScreen()->tool()->context()->claim()->external(); $local_tpl = new ilGlobalTemplate("tpl.main.html", true, true); diff --git a/feed.php b/feed.php index 29f3073fa262..c1e77b0f235c 100755 --- a/feed.php +++ b/feed.php @@ -20,10 +20,10 @@ * News feed script. * @author Alexander Killing */ -include_once "Services/Context/classes/class.ilContext.php"; +include_once "components/ILIAS/Context/classes/class.ilContext.php"; ilContext::init(ilContext::CONTEXT_RSS); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); global $DIC; diff --git a/index.php b/index.php index a3400826ed2f..0849081f79d8 100755 --- a/index.php +++ b/index.php @@ -38,7 +38,7 @@ // END WebDAV: Block WebDAV Requests from Microsoft WebDAV MiniRedir client. -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->callBaseClass('ilStartUpGUI'); diff --git a/login.php b/login.php index 347557813ef8..cf952f5cebca 100755 --- a/login.php +++ b/login.php @@ -19,7 +19,7 @@ exit(); } -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->setCmd('showLoginPageOrStartupPage'); diff --git a/logout.php b/logout.php index 200697c8a708..d3acf158207d 100755 --- a/logout.php +++ b/logout.php @@ -11,7 +11,7 @@ * @package ilias-core */ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->setCmd('doLogout'); diff --git a/lti.php b/lti.php index de4bc847b256..50b054f5e330 100644 --- a/lti.php +++ b/lti.php @@ -10,7 +10,7 @@ include_once './Services/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_LTI_PROVIDER); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); // authentication is done here -> diff --git a/privfeed.php b/privfeed.php index 0b9fe30b8531..9bf1250424f9 100644 --- a/privfeed.php +++ b/privfeed.php @@ -9,10 +9,10 @@ * @version $Id$ */ -include_once "Services/Context/classes/class.ilContext.php"; +include_once "components/ILIAS/Context/classes/class.ilContext.php"; ilContext::init(ilContext::CONTEXT_RSS_AUTH); -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); global $lng, $ilSetting; diff --git a/public/soap/server.php b/public/soap/server.php index 43a7417fa5b3..54f9edc60f24 100644 --- a/public/soap/server.php +++ b/public/soap/server.php @@ -18,7 +18,7 @@ // php7 only SOAPMODE_INTERNAL const IL_SOAPMODE = IL_SOAPMODE_INTERNAL; -include_once "Services/Context/classes/class.ilContext.php"; +include_once "components/ILIAS/Context/classes/class.ilContext.php"; ilContext::init(ilContext::CONTEXT_SOAP); require_once("./Services/Init/classes/class.ilIniFile.php"); diff --git a/pwassist.php b/pwassist.php index f2630781b930..a525b3e2e248 100755 --- a/pwassist.php +++ b/pwassist.php @@ -12,7 +12,7 @@ * @package ilias-core */ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->setCmd('jumpToPasswordAssistance'); diff --git a/register.php b/register.php index 03bf60c7645c..e5dd1c66db95 100755 --- a/register.php +++ b/register.php @@ -11,7 +11,7 @@ * @package ilias-core */ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilInitialisation::initILIAS(); $ilCtrl->setCmd("jumpToRegistration"); diff --git a/saml.php b/saml.php index 17f322ae6372..6947daeba9b4 100644 --- a/saml.php +++ b/saml.php @@ -22,10 +22,10 @@ exit(); } -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SAML); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); /** @var ILIAS\DI\Container $DIC */ diff --git a/scripts/Rector/ilUtils/ilutil_rector.php b/scripts/Rector/ilUtils/ilutil_rector.php index 655add8b3e01..4782a50441bb 100644 --- a/scripts/Rector/ilUtils/ilutil_rector.php +++ b/scripts/Rector/ilUtils/ilutil_rector.php @@ -15,8 +15,8 @@ // there a several classes which make Rector break (multiple classes // in one file, wrong declarations in inheritance, ...) "components/ILIAS/LTIConsumer", - "Services/LTI", - "Services/SOAPAuth/include" + "components/ILIAS/LTI", + "components/ILIAS/SOAPAuth/include" ]); $rectorConfig->parameters()->set(Option::DEBUG, false); diff --git a/sessioncheck.php b/sessioncheck.php index 0ef58e4c3330..0f48ee5dc26b 100644 --- a/sessioncheck.php +++ b/sessioncheck.php @@ -24,10 +24,10 @@ exit(); } -require_once 'Services/Context/classes/class.ilContext.php'; +require_once 'components/ILIAS/Context/classes/class.ilContext.php'; ilContext::init(ilContext::CONTEXT_SESSION_REMINDER); -require_once 'Services/Init/classes/class.ilInitialisation.php'; +require_once 'components/ILIAS/Init/classes/class.ilInitialisation.php'; ilInitialisation::initILIAS(); /** @var ILIAS\DI\Container $DIC */ diff --git a/setup/sql/ilias3.sql b/setup/sql/ilias3.sql index 97924534e584..157dcbc1ec80 100644 --- a/setup/sql/ilias3.sql +++ b/setup/sql/ilias3.sql @@ -2930,37 +2930,37 @@ CREATE TABLE `copg_pc_def` ( -- INSERT INTO `copg_pc_def` VALUES ('amdpl','AMDPageList','classes',0,0,0,'components/ILIAS//Wiki',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('blog','Blog','classes',0,0,0,'Services/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('blog','Blog','classes',0,0,0,'components/ILIAS/COPage',0,0,0); INSERT INTO `copg_pc_def` VALUES ('cach','ConsultationHours','classes',0,0,0,'components/ILIAS//Portfolio',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('dtab','DataTable','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('flit','FileItem','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('flst','FileList','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('gcell','GridCell','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('grid','Grid','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('iim','InteractiveImage','classes',1,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('incl','ContentInclude','classes',1,1,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('li','ListItem','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('list','List','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('lpe','LoginPageElement','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('map','Map','classes',0,0,0,'Services/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('dtab','DataTable','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('flit','FileItem','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('flst','FileList','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('gcell','GridCell','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('grid','Grid','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('iim','InteractiveImage','classes',1,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('incl','ContentInclude','classes',1,1,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('li','ListItem','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('list','List','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('lpe','LoginPageElement','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('map','Map','classes',0,0,0,'components/ILIAS/COPage',0,0,0); INSERT INTO `copg_pc_def` VALUES ('mcrs','MyCourses','classes',0,0,0,'components/ILIAS//Portfolio',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('media','MediaObject','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('par','Paragraph','classes',1,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('pcqst','Question','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('plach','PlaceHolder','classes',0,1,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('plug','Plugged','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('prof','Profile','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('qover','QuestionOverview','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('repobj','Resources','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('sec','Section','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('skills','Skills','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('src','SourceCode','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('tab','Table','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('tabs','Tabs','classes',0,1,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('tabstab','Tab','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('td','TableData','classes',0,0,0,'Services/COPage',1,0,0); -INSERT INTO `copg_pc_def` VALUES ('templ','ContentTemplate','classes',0,0,0,'Services/COPage',0,0,0); -INSERT INTO `copg_pc_def` VALUES ('vrfc','Verification','classes',0,0,0,'Services/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('media','MediaObject','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('par','Paragraph','classes',1,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('pcqst','Question','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('plach','PlaceHolder','classes',0,1,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('plug','Plugged','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('prof','Profile','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('qover','QuestionOverview','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('repobj','Resources','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('sec','Section','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('skills','Skills','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('src','SourceCode','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('tab','Table','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('tabs','Tabs','classes',0,1,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('tabstab','Tab','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('td','TableData','classes',0,0,0,'components/ILIAS/COPage',1,0,0); +INSERT INTO `copg_pc_def` VALUES ('templ','ContentTemplate','classes',0,0,0,'components/ILIAS/COPage',0,0,0); +INSERT INTO `copg_pc_def` VALUES ('vrfc','Verification','classes',0,0,0,'components/ILIAS/COPage',0,0,0); -- -- Table structure for table `copg_pobj_def` @@ -2978,13 +2978,13 @@ CREATE TABLE `copg_pobj_def` ( -- Dumping data for table `copg_pobj_def` -- -INSERT INTO `copg_pobj_def` VALUES ('auth','ilLoginPage','classes','Services/Authentication'); +INSERT INTO `copg_pobj_def` VALUES ('auth','ilLoginPage','classes','components/ILIAS/Authentication'); INSERT INTO `copg_pobj_def` VALUES ('blp','ilBlogPosting','classes','components/ILIAS//Blog'); -INSERT INTO `copg_pobj_def` VALUES ('cont','ilContainerPage','classes','Services/Container'); -INSERT INTO `copg_pobj_def` VALUES ('cstr','ilContainerStartObjectsPage','classes','Services/Container'); +INSERT INTO `copg_pobj_def` VALUES ('cont','ilContainerPage','classes','components/ILIAS/Container'); +INSERT INTO `copg_pobj_def` VALUES ('cstr','ilContainerStartObjectsPage','classes','components/ILIAS/Container'); INSERT INTO `copg_pobj_def` VALUES ('dclf','ilDclDetailedViewDefinition','classes/DetailedView','components/ILIAS//DataCollection'); INSERT INTO `copg_pobj_def` VALUES ('gdf','ilGlossaryDefPage','classes','components/ILIAS//Glossary'); -INSERT INTO `copg_pobj_def` VALUES ('impr','ilImprint','classes','Services/Imprint'); +INSERT INTO `copg_pobj_def` VALUES ('impr','ilImprint','classes','components/ILIAS/Imprint'); INSERT INTO `copg_pobj_def` VALUES ('lm','ilLMPage','classes','components/ILIAS//LearningModule'); INSERT INTO `copg_pobj_def` VALUES ('lobj','ilLOPage','classes/Objectives','components/ILIAS//Course'); INSERT INTO `copg_pobj_def` VALUES ('mep','ilMediaPoolPage','classes','components/ILIAS//MediaPool'); @@ -2995,7 +2995,7 @@ INSERT INTO `copg_pobj_def` VALUES ('qfbs','ilAssSpecFeedbackPage','classes/feed INSERT INTO `copg_pobj_def` VALUES ('qht','ilAssHintPage','classes','components/ILIAS//TestQuestionPool'); INSERT INTO `copg_pobj_def` VALUES ('qpl','ilAssQuestionPage','classes','components/ILIAS//TestQuestionPool'); INSERT INTO `copg_pobj_def` VALUES ('sahs','ilSCORM2004Page','classes','components/ILIAS//Scorm2004'); -INSERT INTO `copg_pobj_def` VALUES ('stys','ilPageLayoutPage','Layout/classes','Services/COPage'); +INSERT INTO `copg_pobj_def` VALUES ('stys','ilPageLayoutPage','Layout/classes','components/ILIAS/COPage'); INSERT INTO `copg_pobj_def` VALUES ('wpg','ilWikiPage','classes','components/ILIAS//Wiki'); -- @@ -3450,27 +3450,27 @@ CREATE TABLE `cron_job` ( -- Dumping data for table `cron_job` -- -INSERT INTO `cron_job` VALUES ('cal_consultation','Services/Calendar',0,0,0,0,0,0,0,0,'','',0,0,'ilConsultationHourCron','Services/Calendar/classes/ConsultationHours/',0,0,0); +INSERT INTO `cron_job` VALUES ('cal_consultation','components/ILIAS/Calendar',0,0,0,0,0,0,0,0,'','',0,0,'ilConsultationHourCron','components/ILIAS/Calendar/classes/ConsultationHours/',0,0,0); INSERT INTO `cron_job` VALUES ('exc_feedback_notification','components/ILIAS//Exercise',0,0,1,0,0,1381511097,0,0,'','',0,0,'ilExcCronFeedbackNotification','',0,0,0); INSERT INTO `cron_job` VALUES ('finish_unfinished_passes','components/ILIAS//Test',1,0,0,0,0,0,0,0,'','',0,0,'ilCronFinishUnfinishedTestPasses','',0,0,0); INSERT INTO `cron_job` VALUES ('frm_notification','components/ILIAS//Forum',3,1,0,0,0,0,0,0,'','',0,0,'ilForumCronNotification','',0,0,0); -INSERT INTO `cron_job` VALUES ('ldap_sync','Services/LDAP',0,0,0,0,0,0,0,0,'','',0,0,'ilLDAPCronSynchronization','',0,0,0); +INSERT INTO `cron_job` VALUES ('ldap_sync','components/ILIAS/LDAP',0,0,0,0,0,0,0,0,'','',0,0,'ilLDAPCronSynchronization','',0,0,0); INSERT INTO `cron_job` VALUES ('lm_link_check','components/ILIAS//LearningModule',0,0,0,0,0,0,0,0,'','',0,0,'ilLearningModuleCronLinkCheck','',0,0,0); -INSERT INTO `cron_job` VALUES ('log_error_file_cleanup','Services/Logging',4,10,0,0,0,0,0,0,'','',0,0,'ilLoggerCronCleanErrorFiles','Services/Logging/classes/error/',0,0,0); -INSERT INTO `cron_job` VALUES ('lp_object_statistics','Services/Tracking',0,0,1,0,0,1381511103,0,0,'','',0,0,'ilLPCronObjectStatistics','',0,0,0); -INSERT INTO `cron_job` VALUES ('lti_outcome','Services/LTI',2,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ilLTICronOutcomeService',NULL,NULL,NULL,NULL); -INSERT INTO `cron_job` VALUES ('mail_notification','Services/Mail',0,0,1,6,1,1481898063,NULL,6,'job_manual_reset','Cron job re-activated by admin',1,0,'ilMailCronNotification','',0,0,0); -INSERT INTO `cron_job` VALUES ('mail_orphaned_mails','Services/Mail',0,0,0,0,0,0,0,0,'','',0,0,'ilMailCronOrphanedMails','',0,0,0); -INSERT INTO `cron_job` VALUES ('mem_min_members','Services/Membership',0,0,1,0,0,1443610661,0,0,'','',0,0,'ilMembershipCronMinMembers','',0,0,0); -INSERT INTO `cron_job` VALUES ('mem_notification','Services/Membership',1,0,0,0,0,0,0,0,'','',0,0,'ilMembershipCronNotifications','',0,0,0); +INSERT INTO `cron_job` VALUES ('log_error_file_cleanup','components/ILIAS/Logging',4,10,0,0,0,0,0,0,'','',0,0,'ilLoggerCronCleanErrorFiles','components/ILIAS/Logging/classes/error/',0,0,0); +INSERT INTO `cron_job` VALUES ('lp_object_statistics','components/ILIAS/Tracking',0,0,1,0,0,1381511103,0,0,'','',0,0,'ilLPCronObjectStatistics','',0,0,0); +INSERT INTO `cron_job` VALUES ('lti_outcome','components/ILIAS/LTI',2,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ilLTICronOutcomeService',NULL,NULL,NULL,NULL); +INSERT INTO `cron_job` VALUES ('mail_notification','components/ILIAS/Mail',0,0,1,6,1,1481898063,NULL,6,'job_manual_reset','Cron job re-activated by admin',1,0,'ilMailCronNotification','',0,0,0); +INSERT INTO `cron_job` VALUES ('mail_orphaned_mails','components/ILIAS/Mail',0,0,0,0,0,0,0,0,'','',0,0,'ilMailCronOrphanedMails','',0,0,0); +INSERT INTO `cron_job` VALUES ('mem_min_members','components/ILIAS/Membership',0,0,1,0,0,1443610661,0,0,'','',0,0,'ilMembershipCronMinMembers','',0,0,0); +INSERT INTO `cron_job` VALUES ('mem_notification','components/ILIAS/Membership',1,0,0,0,0,0,0,0,'','',0,0,'ilMembershipCronNotifications','',0,0,0); INSERT INTO `cron_job` VALUES ('orgunit_paths','components/ILIAS//OrgUnit',1,0,1,0,0,1472816001,0,0,'','',0,0,'ilCronUpdateOrgUnitPaths','',0,0,0); -INSERT INTO `cron_job` VALUES ('skll_notification','Services/Skill',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ilSkillNotifications',NULL,NULL,NULL,NULL); -INSERT INTO `cron_job` VALUES ('src_lucene_indexer','Services/Search',1,0,0,0,0,0,0,0,'','',0,0,'ilLuceneIndexer','Services/Search/classes/Lucene/',0,0,0); +INSERT INTO `cron_job` VALUES ('skll_notification','components/ILIAS/Skill',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ilSkillNotifications',NULL,NULL,NULL,NULL); +INSERT INTO `cron_job` VALUES ('src_lucene_indexer','components/ILIAS/Search',1,0,0,0,0,0,0,0,'','',0,0,'ilLuceneIndexer','components/ILIAS/Search/classes/Lucene/',0,0,0); INSERT INTO `cron_job` VALUES ('survey_notification','components/ILIAS//Survey',0,0,1,0,0,1381511099,0,0,'','',0,0,'ilSurveyCronNotification','',0,0,0); -INSERT INTO `cron_job` VALUES ('sysc_trash','Services/SystemCheck',5,1,0,0,0,0,0,0,'','',0,0,'ilSCCronTrash','',0,0,0); -INSERT INTO `cron_job` VALUES ('user_check_accounts','Services/User',0,0,0,0,0,0,0,0,'','',0,0,'ilUserCronCheckAccounts','',0,0,0); -INSERT INTO `cron_job` VALUES ('user_inactivated','Services/User',1,0,0,0,0,0,0,0,'','',0,0,'ilCronDeleteInactivatedUserAccounts','',0,0,0); -INSERT INTO `cron_job` VALUES ('user_inactive','Services/User',1,0,0,0,0,0,0,0,'','',0,0,'ilCronDeleteInactiveUserAccounts','',0,0,0); +INSERT INTO `cron_job` VALUES ('sysc_trash','components/ILIAS/SystemCheck',5,1,0,0,0,0,0,0,'','',0,0,'ilSCCronTrash','',0,0,0); +INSERT INTO `cron_job` VALUES ('user_check_accounts','components/ILIAS/User',0,0,0,0,0,0,0,0,'','',0,0,'ilUserCronCheckAccounts','',0,0,0); +INSERT INTO `cron_job` VALUES ('user_inactivated','components/ILIAS/User',1,0,0,0,0,0,0,0,'','',0,0,'ilCronDeleteInactivatedUserAccounts','',0,0,0); +INSERT INTO `cron_job` VALUES ('user_inactive','components/ILIAS/User',1,0,0,0,0,0,0,0,'','',0,0,'ilCronDeleteInactiveUserAccounts','',0,0,0); INSERT INTO `cron_job` VALUES ('webr_link_check','components/ILIAS//WebResource',1,0,0,0,0,0,0,0,'','',0,0,'ilWebResourceCronLinkCheck','',0,0,0); -- @@ -7041,72 +7041,72 @@ INSERT INTO `il_component` VALUES ('components/ILIAS','WebResource','webr'); INSERT INTO `il_component` VALUES ('components/ILIAS','WorkspaceFolder','wfld'); INSERT INTO `il_component` VALUES ('components/ILIAS','Wiki','wiki'); INSERT INTO `il_component` VALUES ('components/ILIAS','WorkspaceRootFolder','wsrt'); -INSERT INTO `il_component` VALUES ('Services','AccessControl','ac'); -INSERT INTO `il_component` VALUES ('Services','Accessibility','acc'); -INSERT INTO `il_component` VALUES ('Services','Accordion','accrdn'); -INSERT INTO `il_component` VALUES ('Services','Administration','adm'); -INSERT INTO `il_component` VALUES ('Services','AdvancedEditing','adve'); -INSERT INTO `il_component` VALUES ('Services','AdvancedMetaData','amet'); -INSERT INTO `il_component` VALUES ('Services','Authentication','auth'); -INSERT INTO `il_component` VALUES ('Services','Awareness','awrn'); -INSERT INTO `il_component` VALUES ('Services','Badge','badge'); -INSERT INTO `il_component` VALUES ('Services','BackgroundTasks','bgtk'); -INSERT INTO `il_component` VALUES ('Services','Bookmarks','bkm'); -INSERT INTO `il_component` VALUES ('Services','BackgroundTask','btsk'); -INSERT INTO `il_component` VALUES ('Services','Calendar','cal'); -INSERT INTO `il_component` VALUES ('Services','Certificate','cert'); -INSERT INTO `il_component` VALUES ('Services','ContainerReference','cntr'); -INSERT INTO `il_component` VALUES ('Services','Component','comp'); -INSERT INTO `il_component` VALUES ('Services','Container','cont'); -INSERT INTO `il_component` VALUES ('Services','Contact','contact'); -INSERT INTO `il_component` VALUES ('Services','COPage','copg'); -INSERT INTO `il_component` VALUES ('Services','Cron','cron'); -INSERT INTO `il_component` VALUES ('Services','Database','db'); -INSERT INTO `il_component` VALUES ('Services','DataSet','ds'); -INSERT INTO `il_component` VALUES ('Services','EventHandling','evnt'); -INSERT INTO `il_component` VALUES ('Services','Export','exp'); -INSERT INTO `il_component` VALUES ('Services','Help','help'); -INSERT INTO `il_component` VALUES ('Services','Imprint','impr'); -INSERT INTO `il_component` VALUES ('Services','Init','init'); -INSERT INTO `il_component` VALUES ('Services','Language','lang'); -INSERT INTO `il_component` VALUES ('Services','LinkChecker','lchk'); -INSERT INTO `il_component` VALUES ('Services','LDAP','ldap'); -INSERT INTO `il_component` VALUES ('Services','Link','link'); -INSERT INTO `il_component` VALUES ('Services','Logging','log'); -INSERT INTO `il_component` VALUES ('Services','LTI','lti'); -INSERT INTO `il_component` VALUES ('Services','Mail','mail'); -INSERT INTO `il_component` VALUES ('Services','MetaData','meta'); -INSERT INTO `il_component` VALUES ('Services','Membership','mmbr'); -INSERT INTO `il_component` VALUES ('Services','MediaObjects','mob'); -INSERT INTO `il_component` VALUES ('Services','Navigation','navh'); -INSERT INTO `il_component` VALUES ('Services','News','news'); -INSERT INTO `il_component` VALUES ('Services','Notifications','nota'); -INSERT INTO `il_component` VALUES ('Services','Notification','noti'); -INSERT INTO `il_component` VALUES ('Services','Object','obj'); -INSERT INTO `il_component` VALUES ('Services','OnScreenChat','osch'); -INSERT INTO `il_component` VALUES ('Services','DidacticTemplate','otpl'); -INSERT INTO `il_component` VALUES ('Services','PDFGeneration','pdfg'); -INSERT INTO `il_component` VALUES ('Services','PersonalDesktop','pdsk'); -INSERT INTO `il_component` VALUES ('Services','Preview','prvw'); -INSERT INTO `il_component` VALUES ('Services','PrivacySecurity','ps'); -INSERT INTO `il_component` VALUES ('Services','PersonalWorkspace','pwsp'); -INSERT INTO `il_component` VALUES ('Services','Repository','rep'); -INSERT INTO `il_component` VALUES ('Services','AuthShibboleth','shiba'); -INSERT INTO `il_component` VALUES ('Services','Skill','skll'); -INSERT INTO `il_component` VALUES ('Services','Search','src'); -INSERT INTO `il_component` VALUES ('Services','Style','styl'); -INSERT INTO `il_component` VALUES ('Services','SystemCheck','sysc'); -INSERT INTO `il_component` VALUES ('Services','Table','table'); -INSERT INTO `il_component` VALUES ('Services','Tagging','tag'); -INSERT INTO `il_component` VALUES ('Services','Taxonomy','tax'); -INSERT INTO `il_component` VALUES ('Services','TermsOfService','tos'); -INSERT INTO `il_component` VALUES ('Services','Tracking','trac'); -INSERT INTO `il_component` VALUES ('Services','Tree','tree'); -INSERT INTO `il_component` VALUES ('Services','UIComponent','ui'); -INSERT INTO `il_component` VALUES ('Services','User','user'); -INSERT INTO `il_component` VALUES ('Services','WebDAV','wbdv'); -INSERT INTO `il_component` VALUES ('Services','WorkflowEngine','wfe'); -INSERT INTO `il_component` VALUES ('Services','WebServices','wsrv'); +INSERT INTO `il_component` VALUES ('components/ILIAS','AccessControl','ac'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Accessibility','acc'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Accordion','accrdn'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Administration','adm'); +INSERT INTO `il_component` VALUES ('components/ILIAS','AdvancedEditing','adve'); +INSERT INTO `il_component` VALUES ('components/ILIAS','AdvancedMetaData','amet'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Authentication','auth'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Awareness','awrn'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Badge','badge'); +INSERT INTO `il_component` VALUES ('components/ILIAS','BackgroundTasks','bgtk'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Bookmarks','bkm'); +INSERT INTO `il_component` VALUES ('components/ILIAS','BackgroundTask','btsk'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Calendar','cal'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Certificate','cert'); +INSERT INTO `il_component` VALUES ('components/ILIAS','ContainerReference','cntr'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Component','comp'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Container','cont'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Contact','contact'); +INSERT INTO `il_component` VALUES ('components/ILIAS','COPage','copg'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Cron','cron'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Database','db'); +INSERT INTO `il_component` VALUES ('components/ILIAS','DataSet','ds'); +INSERT INTO `il_component` VALUES ('components/ILIAS','EventHandling','evnt'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Export','exp'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Help','help'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Imprint','impr'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Init','init'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Language','lang'); +INSERT INTO `il_component` VALUES ('components/ILIAS','LinkChecker','lchk'); +INSERT INTO `il_component` VALUES ('components/ILIAS','LDAP','ldap'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Link','link'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Logging','log'); +INSERT INTO `il_component` VALUES ('components/ILIAS','LTI','lti'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Mail','mail'); +INSERT INTO `il_component` VALUES ('components/ILIAS','MetaData','meta'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Membership','mmbr'); +INSERT INTO `il_component` VALUES ('components/ILIAS','MediaObjects','mob'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Navigation','navh'); +INSERT INTO `il_component` VALUES ('components/ILIAS','News','news'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Notifications','nota'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Notification','noti'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Object','obj'); +INSERT INTO `il_component` VALUES ('components/ILIAS','OnScreenChat','osch'); +INSERT INTO `il_component` VALUES ('components/ILIAS','DidacticTemplate','otpl'); +INSERT INTO `il_component` VALUES ('components/ILIAS','PDFGeneration','pdfg'); +INSERT INTO `il_component` VALUES ('components/ILIAS','PersonalDesktop','pdsk'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Preview','prvw'); +INSERT INTO `il_component` VALUES ('components/ILIAS','PrivacySecurity','ps'); +INSERT INTO `il_component` VALUES ('components/ILIAS','PersonalWorkspace','pwsp'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Repository','rep'); +INSERT INTO `il_component` VALUES ('components/ILIAS','AuthShibboleth','shiba'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Skill','skll'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Search','src'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Style','styl'); +INSERT INTO `il_component` VALUES ('components/ILIAS','SystemCheck','sysc'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Table','table'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Tagging','tag'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Taxonomy','tax'); +INSERT INTO `il_component` VALUES ('components/ILIAS','TermsOfService','tos'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Tracking','trac'); +INSERT INTO `il_component` VALUES ('components/ILIAS','Tree','tree'); +INSERT INTO `il_component` VALUES ('components/ILIAS','UIComponent','ui'); +INSERT INTO `il_component` VALUES ('components/ILIAS','User','user'); +INSERT INTO `il_component` VALUES ('components/ILIAS','WebDAV','wbdv'); +INSERT INTO `il_component` VALUES ('components/ILIAS','WorkflowEngine','wfe'); +INSERT INTO `il_component` VALUES ('components/ILIAS','WebServices','wsrv'); -- -- Table structure for table `il_custom_block` @@ -7828,8 +7828,8 @@ CREATE TABLE `il_event_handling` ( -- INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Category','raise','delete'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','listen','Services/AccessControl'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','listen','Services/Tracking'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','listen','components/ILIAS/AccessControl'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','listen','components/ILIAS/Tracking'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','raise','addParticipant'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','raise','addSubscriber'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Course','raise','addToWaitingList'); @@ -7844,12 +7844,12 @@ INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Exercise','raise','up INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','listen','components/ILIAS//Course'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','listen','components/ILIAS//Forum'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','listen','components/ILIAS//Group'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','listen','Services/News'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','listen','components/ILIAS/News'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','raise','censoredPost'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','raise','createdPost'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','raise','deletedPost'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Forum','raise','updatedPost'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','listen','Services/AccessControl'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','listen','components/ILIAS/AccessControl'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','addParticipant'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','addSubscriber'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','addToWaitingList'); @@ -7857,61 +7857,61 @@ INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','creat INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','delete'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','deleteParticipant'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Group','raise','update'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//MediaPool','listen','Services/Object'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//OrgUnit','listen','Services/Tree'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//MediaPool','listen','components/ILIAS/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//OrgUnit','listen','components/ILIAS/Tree'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//OrgUnit','raise','delete'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Session','raise','addSubscriber'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Session','raise','addToWaitingList'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Session','raise','create'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Session','raise','delete'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//Session','raise','update'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','Services/Object'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','Services/Tracking'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','Services/Tree'); -INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','Services/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','components/ILIAS/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','components/ILIAS/Tracking'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','components/ILIAS/Tree'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','listen','components/ILIAS/User'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','raise','userAssigned'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','raise','userDeassigned'); INSERT INTO `il_event_handling` VALUES ('components/ILIAS//StudyProgramme','raise','userSuccessful'); -INSERT INTO `il_event_handling` VALUES ('Services/AccessControl','raise','assignUser'); -INSERT INTO `il_event_handling` VALUES ('Services/AccessControl','raise','deassignUser'); -INSERT INTO `il_event_handling` VALUES ('Services/Authentication','raise','afterLogin'); -INSERT INTO `il_event_handling` VALUES ('Services/Authentication','raise','expiredSessionDetected'); -INSERT INTO `il_event_handling` VALUES ('Services/Authentication','raise','reachedSessionPoolLimit'); -INSERT INTO `il_event_handling` VALUES ('Services/Badge','listen','Services/Tracking'); -INSERT INTO `il_event_handling` VALUES ('Services/Badge','listen','Services/User'); -INSERT INTO `il_event_handling` VALUES ('Services/Calendar','listen','components/ILIAS//Course'); -INSERT INTO `il_event_handling` VALUES ('Services/Calendar','listen','components/ILIAS//Exercise'); -INSERT INTO `il_event_handling` VALUES ('Services/Calendar','listen','components/ILIAS//Group'); -INSERT INTO `il_event_handling` VALUES ('Services/Calendar','listen','components/ILIAS//Session'); -INSERT INTO `il_event_handling` VALUES ('Services/Contact','listen','Services/Contact'); -INSERT INTO `il_event_handling` VALUES ('Services/Contact','listen','Services/User'); -INSERT INTO `il_event_handling` VALUES ('Services/Contact','raise','contactRequested'); -INSERT INTO `il_event_handling` VALUES ('Services/ContainerReference','listen','components/ILIAS//Category'); -INSERT INTO `il_event_handling` VALUES ('Services/ContainerReference','listen','components/ILIAS//Course'); -INSERT INTO `il_event_handling` VALUES ('Services/News','raise','readNews'); -INSERT INTO `il_event_handling` VALUES ('Services/News','raise','unreadNews'); -INSERT INTO `il_event_handling` VALUES ('Services/Notification','listen','Service/Object'); -INSERT INTO `il_event_handling` VALUES ('Services/Object','raise','create'); -INSERT INTO `il_event_handling` VALUES ('Services/Object','raise','delete'); -INSERT INTO `il_event_handling` VALUES ('Services/Object','raise','toTrash'); -INSERT INTO `il_event_handling` VALUES ('Services/Object','raise','undelete'); -INSERT INTO `il_event_handling` VALUES ('Services/Object','raise','update'); -INSERT INTO `il_event_handling` VALUES ('Services/OnScreenChat','listen','Services/User'); -INSERT INTO `il_event_handling` VALUES ('Services/Search','listen','Services/Object'); -INSERT INTO `il_event_handling` VALUES ('Services/Skill','listen','Services/Tracking'); -INSERT INTO `il_event_handling` VALUES ('Services/Tagging','listen','Services/Object'); -INSERT INTO `il_event_handling` VALUES ('Services/TermsOfService','listen','Services/User'); -INSERT INTO `il_event_handling` VALUES ('Services/Tracking','listen','Services/Object'); -INSERT INTO `il_event_handling` VALUES ('Services/Tracking','listen','Services/Tree'); -INSERT INTO `il_event_handling` VALUES ('Services/Tracking','raise','updateStatus'); -INSERT INTO `il_event_handling` VALUES ('Services/Tree','raise','deleteNode'); -INSERT INTO `il_event_handling` VALUES ('Services/User','raise','afterCreate'); -INSERT INTO `il_event_handling` VALUES ('Services/User','raise','afterUpdate'); -INSERT INTO `il_event_handling` VALUES ('Services/User','raise','deleteUser'); -INSERT INTO `il_event_handling` VALUES ('Services/WebServices','raise','newEcsEvent'); -INSERT INTO `il_event_handling` VALUES ('Services/WebServices/ECS','listen','components/ILIAS//Course'); -INSERT INTO `il_event_handling` VALUES ('Services/WebServices/ECS','listen','components/ILIAS//Group'); -INSERT INTO `il_event_handling` VALUES ('Services/WebServices/ECS','listen','Services/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/AccessControl','raise','assignUser'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/AccessControl','raise','deassignUser'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Authentication','raise','afterLogin'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Authentication','raise','expiredSessionDetected'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Authentication','raise','reachedSessionPoolLimit'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Badge','listen','components/ILIAS/Tracking'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Badge','listen','components/ILIAS/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Calendar','listen','components/ILIAS//Course'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Calendar','listen','components/ILIAS//Exercise'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Calendar','listen','components/ILIAS//Group'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Calendar','listen','components/ILIAS//Session'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Contact','listen','components/ILIAS/Contact'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Contact','listen','components/ILIAS/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Contact','raise','contactRequested'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/ContainerReference','listen','components/ILIAS//Category'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/ContainerReference','listen','components/ILIAS//Course'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/News','raise','readNews'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/News','raise','unreadNews'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Notification','listen','Service/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Object','raise','create'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Object','raise','delete'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Object','raise','toTrash'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Object','raise','undelete'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Object','raise','update'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/OnScreenChat','listen','components/ILIAS/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Search','listen','components/ILIAS/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Skill','listen','components/ILIAS/Tracking'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Tagging','listen','components/ILIAS/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/TermsOfService','listen','components/ILIAS/User'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Tracking','listen','components/ILIAS/Object'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Tracking','listen','components/ILIAS/Tree'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Tracking','raise','updateStatus'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/Tree','raise','deleteNode'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/User','raise','afterCreate'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/User','raise','afterUpdate'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/User','raise','deleteUser'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/WebServices','raise','newEcsEvent'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/WebServices/ECS','listen','components/ILIAS//Course'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/WebServices/ECS','listen','components/ILIAS//Group'); +INSERT INTO `il_event_handling` VALUES ('components/ILIAS/WebServices/ECS','listen','components/ILIAS/User'); -- -- Table structure for table `il_exc_team` @@ -9171,38 +9171,38 @@ CREATE TABLE `il_object_def` ( -- Dumping data for table `il_object_def` -- -INSERT INTO `il_object_def` VALUES ('accs','AccessibilitySettings','Services/Accessibility','Services/Accessibility/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('accs','AccessibilitySettings','components/ILIAS/Accessibility','components/ILIAS/Accessibility/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('adm','SystemFolder','components/ILIAS//SystemFolder','components/ILIAS//SystemFolder/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('adve','AdvancedEditing','Services/AdvancedEditing','Services/AdvancedEditing/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('adve','AdvancedEditing','components/ILIAS/AdvancedEditing','components/ILIAS/AdvancedEditing/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('assf','AssessmentFolder','components/ILIAS//Test','components/ILIAS//Test/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('auth','AuthSettings','Services/Authentication','Services/Authentication/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('awra','AwarenessAdministration','Services/Awareness','Services/Awareness/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('bdga','BadgeAdministration','Services/Badge','Services/Badge/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('auth','AuthSettings','components/ILIAS/Authentication','components/ILIAS/Authentication/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('awra','AwarenessAdministration','components/ILIAS/Awareness','components/ILIAS/Awareness/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('bdga','BadgeAdministration','components/ILIAS/Badge','components/ILIAS/Badge/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('bibl','Bibliographic','components/ILIAS//Bibliographic','components/ILIAS//Bibliographic/classes',1,1,'0',0,1,1,1,0,0,360,NULL,360,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('bibs','BibliographicAdmin','components/ILIAS//Bibliographic','components/ILIAS//Bibliographic/classes/Admin',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('blga','BlogAdministration','components/ILIAS//Blog','components/ILIAS//Blog/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('blog','Blog','components/ILIAS//Blog','components/ILIAS//Blog/classes',1,1,'0',0,1,1,1,0,0,330,NULL,330,1,1,1,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('book','BookingPool','components/ILIAS//BookingManager','components/ILIAS//BookingManager/classes',1,1,NULL,0,1,1,1,0,0,250,NULL,250,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('cadm','ContactAdministration','Services/Contact','Services/Contact/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('cals','CalendarSettings','Services/Calendar','Services/Calendar/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('cadm','ContactAdministration','components/ILIAS/Contact','components/ILIAS/Contact/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('cals','CalendarSettings','components/ILIAS/Calendar','components/ILIAS/Calendar/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('cat','Category','components/ILIAS//Category','components/ILIAS//Category/classes',1,1,'db',0,0,1,1,0,0,10,'cat',10,1,1,0,0,1,0,0,0); INSERT INTO `il_object_def` VALUES ('catr','CategoryReference','components/ILIAS//CategoryReference','components/ILIAS//CategoryReference/classes',1,0,'0',0,0,1,1,0,0,15,'cat',10,1,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('cert','CertificateSettings','Services/Certificate','Services/Certificate/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('cert','CertificateSettings','components/ILIAS/Certificate','components/ILIAS/Certificate/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('chta','ChatroomAdmin','components/ILIAS//Chatroom','components/ILIAS//Chatroom/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('chtr','Chatroom','components/ILIAS//Chatroom','components/ILIAS//Chatroom/classes',1,0,'0',0,1,1,1,0,0,90,NULL,150,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('cld','Cloud','components/ILIAS//Cloud','components/ILIAS//Cloud/classes',1,1,'0',0,1,0,1,0,0,440,NULL,440,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('cmps','ComponentSettings','Services/Component','Services/Component/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('cmps','ComponentSettings','components/ILIAS/Component','components/ILIAS/Component/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('crs','Course','components/ILIAS//Course','components/ILIAS//Course/classes',1,1,'0',0,0,1,1,0,0,20,'crs',30,1,1,0,0,1,1,1,0); INSERT INTO `il_object_def` VALUES ('crsr','CourseReference','components/ILIAS//CourseReference','components/ILIAS//CourseReference/classes',1,0,'0',0,0,1,1,0,0,25,'crs',20,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('crss','CourseAdministration','components/ILIAS//Course','components/ILIAS//Course/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('crsv','CourseVerification','components/ILIAS//Course','components/ILIAS//Course/classes/Verification',0,0,'0',0,0,0,0,0,0,90,NULL,150,0,0,1,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('dcl','DataCollection','components/ILIAS//DataCollection','components/ILIAS//DataCollection/classes',1,1,'0',0,1,1,1,0,0,340,NULL,340,1,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('ecss','ECSSettings','Services/WebServices','Services/WebServices/ECS/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('ecss','ECSSettings','components/ILIAS/WebServices','components/ILIAS/WebServices/ECS/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('exc','Exercise','components/ILIAS//Exercise','components/ILIAS//Exercise/classes',1,1,NULL,0,1,1,1,0,0,170,NULL,160,1,1,0,0,0,1,0,0); INSERT INTO `il_object_def` VALUES ('excs','ExerciseAdministration','components/ILIAS//Exercise','components/ILIAS//Exercise/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('excv','ExerciseVerification','components/ILIAS//Exercise','components/ILIAS//Exercise/classes',0,0,'0',0,0,0,0,0,0,100,NULL,160,0,0,1,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('extt','ExternalToolsSettings','Services/Administration','Services/Administration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('facs','FileAccessSettings','Services/WebDAV','Services/WebDAV/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('extt','ExternalToolsSettings','components/ILIAS/Administration','components/ILIAS/Administration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('facs','FileAccessSettings','components/ILIAS/WebDAV','components/ILIAS/WebDAV/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('feed','ExternalFeed','components/ILIAS//ExternalFeed','components/ILIAS//ExternalFeed/classes',1,1,NULL,0,1,1,1,0,1,80,NULL,0,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('file','File','components/ILIAS//File','components/ILIAS//File/classes',1,0,'0',0,1,1,1,0,0,90,NULL,150,1,1,1,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('fold','Folder','components/ILIAS//Folder','components/ILIAS//Folder/classes',1,1,'0',0,0,1,1,0,0,40,NULL,20,1,1,0,0,0,0,0,0); @@ -9212,74 +9212,74 @@ INSERT INTO `il_object_def` VALUES ('glo','Glossary','components/ILIAS//Glossary INSERT INTO `il_object_def` VALUES ('grp','Group','components/ILIAS//Group','components/ILIAS//Group/classes',1,1,'0',0,0,1,1,0,0,50,NULL,70,1,1,0,0,0,1,1,0); INSERT INTO `il_object_def` VALUES ('grpr','GroupReference','components/ILIAS//GroupReference','components/ILIAS//GroupReference/classes',1,0,'0',0,0,1,1,0,0,51,'grp',20,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('grps','GroupAdministration','components/ILIAS//Group','components/ILIAS//Group/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('hlps','HelpSettings','Services/Help','Services/Help/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('hlps','HelpSettings','components/ILIAS/Help','components/ILIAS/Help/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('htlm','FileBasedLM','components/ILIAS//HTMLLearningModule','components/ILIAS//HTMLLearningModule/classes',1,1,'0',0,1,1,1,0,0,130,'lres',0,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('iass','IndividualAssessment','components/ILIAS//IndividualAssessment','components/ILIAS//IndividualAssessment/classes',1,1,'0',0,1,1,1,0,0,190,NULL,190,0,1,0,0,0,1,0,0); INSERT INTO `il_object_def` VALUES ('itgr','ItemGroup','components/ILIAS//ItemGroup','components/ILIAS//ItemGroup/classes',1,0,'0',0,0,1,1,0,0,45,NULL,5,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('lm','LearningModule','components/ILIAS//LearningModule','components/ILIAS//LearningModule/classes',1,1,'db',0,1,1,1,0,0,120,'lres',0,1,1,0,0,0,0,1,0); -INSERT INTO `il_object_def` VALUES ('lng','Language','Services/Language','Services/Language/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('lngf','LanguageFolder','Services/Language','Services/Language/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('logs','LoggingSettings','Services/Logging','Services/Logging/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('lng','Language','components/ILIAS/Language_','components/ILIAS/Language_/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('lngf','LanguageFolder','components/ILIAS/Language_','components/ILIAS/Language_/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('logs','LoggingSettings','components/ILIAS/Logging','components/ILIAS/Logging/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('lrss','LearningResourcesSettings','components/ILIAS//LearningModule','components/ILIAS//LearningModule/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('ltis','LTIAdministration','Services/LTI','Services/LTI/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('mail','Mail','Services/Mail','Services/Mail/classes',0,0,'sys',0,0,0,1,0,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('ltis','LTIAdministration','components/ILIAS/LTI','components/ILIAS/LTI/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('mail','Mail','components/ILIAS/Mail','components/ILIAS/Mail/classes',0,0,'sys',0,0,0,1,0,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('mcst','MediaCast','components/ILIAS//MediaCast','components/ILIAS//MediaCast/classes',1,1,NULL,0,1,1,1,0,0,110,NULL,130,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('mcts','MediaCastSettings','components/ILIAS//MediaCast','components/ILIAS//MediaCast/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('mds','MDSettings','Services/MetaData','Services/MetaData/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('mds','MDSettings','components/ILIAS/MetaData','components/ILIAS/MetaData/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('mep','MediaPool','components/ILIAS//MediaPool','components/ILIAS//MediaPool/classes',1,1,'db',0,1,1,1,0,0,200,NULL,190,1,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('mobs','MediaObjectsSettings','Services/MediaObjects','Services/MediaObjects/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('nota','NotificationAdmin','Services/Notifications','Services/Notifications/classes',0,0,'sys',0,0,0,0,1,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('nwss','NewsSettings','Services/News','Services/News/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('objf','ObjectFolder','Services/Object','Services/Object/classes',0,0,'sys',1,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('mobs','MediaObjectsSettings','components/ILIAS/MediaObjects','components/ILIAS/MediaObjects/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('nota','NotificationAdmin','components/ILIAS/Notifications','components/ILIAS/Notifications/classes',0,0,'sys',0,0,0,0,1,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('nwss','NewsSettings','components/ILIAS/News','components/ILIAS/News/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('objf','ObjectFolder','components/ILIAS/Object','components/ILIAS/Object/classes',0,0,'sys',1,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('orgu','OrgUnit','components/ILIAS//OrgUnit','components/ILIAS//OrgUnit/classes',1,1,'db',0,0,0,1,0,0,10,'orgu',10,1,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('otpl','ObjectTemplateAdministration','Services/DidacticTemplate','Services/DidacticTemplate/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('pdfg','PDFGeneration','Services/PDFGeneration','Services/PDFGeneration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('pdts','PersonalDesktopSettings','Services/PersonalDesktop','Services/PersonalDesktop/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('otpl','ObjectTemplateAdministration','components/ILIAS/DidacticTemplate','components/ILIAS/DidacticTemplate/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('pdfg','PDFGeneration','components/ILIAS/PDFGeneration','components/ILIAS/PDFGeneration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('pdts','PersonalDesktopSettings','components/ILIAS/PersonalDesktop','components/ILIAS/PersonalDesktop/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('poll','Poll','components/ILIAS//Poll','components/ILIAS//Poll/classes',1,1,'0',0,1,1,1,0,1,350,NULL,350,1,1,1,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('prfa','PortfolioAdministration','components/ILIAS//Portfolio','components/ILIAS//Portfolio/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('prg','StudyProgramme','components/ILIAS//StudyProgramme','components/ILIAS//StudyProgramme/classes',1,1,'0',0,0,1,1,0,0,30,NULL,30,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('prgs','StudyProgrammeAdmin','components/ILIAS//StudyProgramme','components/ILIAS//StudyProgramme/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('prtf','Portfolio','components/ILIAS//Portfolio','components/ILIAS//Portfolio/classes',0,0,'0',0,0,0,0,0,0,0,NULL,0,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('prtt','PortfolioTemplate','components/ILIAS//Portfolio','components/ILIAS//Portfolio/classes',0,0,'0',0,1,1,1,0,0,500,NULL,500,1,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('ps','PrivacySecurity','Services/PrivacySecurity','Services/PrivacySecurity/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('ps','PrivacySecurity','components/ILIAS/PrivacySecurity','components/ILIAS/PrivacySecurity/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('qpl','QuestionPool','components/ILIAS//TestQuestionPool','components/ILIAS//TestQuestionPool/classes',1,1,'0',0,1,1,1,0,0,210,NULL,200,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rcat','RemoteCategory','components/ILIAS//RemoteCategory','components/ILIAS//RemoteCategory/classes',1,0,'0',0,1,1,1,0,0,30,'cat',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rcrs','RemoteCourse','components/ILIAS//RemoteCourse','components/ILIAS//RemoteCourse/classes',1,0,'0',0,1,1,1,0,0,30,'crs',40,0,0,0,0,1,0,0,0); -INSERT INTO `il_object_def` VALUES ('recf','RecoveryFolder','Services/Administration','Services/Administration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('reps','RepositorySettings','Services/Repository','Services/Repository/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('recf','RecoveryFolder','components/ILIAS/Administration','components/ILIAS/Administration/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('reps','RepositorySettings','components/ILIAS/Repository','components/ILIAS/Repository/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rfil','RemoteFile','components/ILIAS//RemoteFile','components/ILIAS//RemoteFile/classes',1,0,'0',0,1,1,1,0,0,30,'file',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rglo','RemoteGlossary','components/ILIAS//RemoteGlossary','components/ILIAS//RemoteGlossary/classes',1,0,'0',0,1,1,1,0,0,30,'glo',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rgrp','RemoteGroup','components/ILIAS//RemoteGroup','components/ILIAS//RemoteGroup/classes',1,0,'0',0,1,1,1,0,0,30,'grp',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rlm','RemoteLearningModule','components/ILIAS//RemoteLearningModule','components/ILIAS//RemoteLearningModule/classes',1,0,'0',0,1,1,1,0,0,30,'lres',40,0,0,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('role','Role','Services/AccessControl','Services/AccessControl/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('rolf','RoleFolder','Services/AccessControl','Services/AccessControl/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('rolt','RoleTemplate','Services/AccessControl','Services/AccessControl/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('role','Role','components/ILIAS/AccessControl','components/ILIAS/AccessControl/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('rolf','RoleFolder','components/ILIAS/AccessControl','components/ILIAS/AccessControl/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('rolt','RoleTemplate','components/ILIAS/AccessControl','components/ILIAS/AccessControl/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('root','RootFolder','components/ILIAS//RootFolder','components/ILIAS//RootFolder/classes',0,0,'0',0,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rtst','RemoteTest','components/ILIAS//RemoteTest','components/ILIAS//RemoteTest/classes',1,0,'0',0,1,1,1,0,0,30,'tst',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('rwik','RemoteWiki','components/ILIAS//RemoteWiki','components/ILIAS//RemoteWiki/classes',1,0,'0',0,1,1,1,0,0,30,'wiki',40,0,0,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('sahs','SAHSLearningModule','components/ILIAS//ScormAicc','components/ILIAS//ScormAicc/classes',1,1,'0',0,1,1,1,0,0,140,'lres',0,1,1,0,0,0,0,1,0); INSERT INTO `il_object_def` VALUES ('scov','SCORMVerification','components/ILIAS//ScormAicc','components/ILIAS//ScormAicc/classes/Verification',0,0,'0',0,0,0,0,0,0,90,NULL,150,0,0,1,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('seas','SearchSettings','Services/Search','Services/Search/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('seas','SearchSettings','components/ILIAS/Search','components/ILIAS/Search/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('sess','Session','components/ILIAS//Session','components/ILIAS//Session/classes',1,0,'0',0,0,1,1,0,0,15,NULL,15,1,1,0,0,1,0,0,0); -INSERT INTO `il_object_def` VALUES ('skmg','SkillManagement','Services/Skill','Services/Skill/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('skmg','SkillManagement','components/ILIAS/Skill','components/ILIAS/Skill/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('spl','SurveyQuestionPool','components/ILIAS//SurveyQuestionPool','components/ILIAS//SurveyQuestionPool/classes',1,1,'0',0,1,1,1,0,0,220,NULL,210,1,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('sty','StyleSheet','Services/Style','Services/Style/Content/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('stys','StyleSettings','Services/Style','Services/Style/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('sty','StyleSheet','components/ILIAS/Style','components/ILIAS/Style/Content/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('stys','StyleSettings','components/ILIAS/Style','components/ILIAS/Style/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('svy','Survey','components/ILIAS//Survey','components/ILIAS//Survey/classes',1,1,'0',0,1,1,1,0,0,190,NULL,180,1,1,0,0,0,0,1,0); INSERT INTO `il_object_def` VALUES ('svyf','SurveyAdministration','components/ILIAS//Survey','components/ILIAS//Survey/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('sysc','SystemCheck','Services/SystemCheck','Services/SystemCheck/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('tags','TaggingSettings','Services/Tagging','Services/Tagging/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('tax','Taxonomy','Services/Taxonomy','Services/Taxonomy/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('taxs','TaxonomyAdministration','Services/Taxonomy','Services/Taxonomy/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('tos','TermsOfService','Services/TermsOfService','Services/TermsOfService/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('trac','UserTracking','Services/Tracking','Services/Tracking/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('sysc','SystemCheck','components/ILIAS/SystemCheck','components/ILIAS/SystemCheck/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('tags','TaggingSettings','components/ILIAS/Tagging','components/ILIAS/Tagging/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('tax','Taxonomy','components/ILIAS/Taxonomy','components/ILIAS/Taxonomy/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('taxs','TaxonomyAdministration','components/ILIAS/Taxonomy','components/ILIAS/Taxonomy/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('tos','TermsOfService','components/ILIAS/TermsOfService','components/ILIAS/TermsOfService/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('trac','UserTracking','components/ILIAS/Tracking','components/ILIAS/Tracking/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('tst','Test','components/ILIAS//Test','components/ILIAS//Test/classes',1,1,'0',0,1,1,1,0,0,180,NULL,170,1,1,0,0,0,0,1,0); INSERT INTO `il_object_def` VALUES ('tstv','TestVerification','components/ILIAS//Test','components/ILIAS//Test/classes',0,0,'0',0,0,0,0,0,0,90,NULL,150,0,0,1,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('usr','User','Services/User','Services/User/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('usrf','UserFolder','Services/User','Services/User/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('usr','User','components/ILIAS/User','components/ILIAS/User/classes',1,0,'0',0,0,0,0,0,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('usrf','UserFolder','components/ILIAS/User','components/ILIAS/User/classes',0,1,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('wbrs','WebResourceAdministration','components/ILIAS//WebResource','components/ILIAS//WebResource/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); INSERT INTO `il_object_def` VALUES ('webr','LinkResource','components/ILIAS//WebResource','components/ILIAS//WebResource/classes',1,0,'0',0,1,1,1,0,0,100,NULL,120,1,1,1,0,0,0,0,0); -INSERT INTO `il_object_def` VALUES ('wfe','WorkflowEngine','Services/WorkflowEngine','Services/WorkflowEngine/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); +INSERT INTO `il_object_def` VALUES ('wfe','WorkflowEngine','components/ILIAS/WorkflowEngine','components/ILIAS/WorkflowEngine/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('wfld','WorkspaceFolder','components/ILIAS//WorkspaceFolder','components/ILIAS//WorkspaceFolder/classes',1,1,'0',0,0,0,0,0,0,300,NULL,300,0,0,1,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('wiki','Wiki','components/ILIAS//Wiki','components/ILIAS//Wiki/classes',1,1,NULL,0,1,1,1,0,0,115,NULL,140,1,1,0,0,0,0,0,0); INSERT INTO `il_object_def` VALUES ('wiks','WikiSettings','components/ILIAS//Wiki','components/ILIAS//Wiki/classes',0,0,'sys',0,0,0,1,1,0,0,NULL,0,0,1,0,1,0,0,0,0); @@ -9930,22 +9930,22 @@ INSERT INTO `il_pluginslot` VALUES ('components/ILIAS//SurveyQuestionPool','svyq INSERT INTO `il_pluginslot` VALUES ('components/ILIAS//Test','texp','Export'); INSERT INTO `il_pluginslot` VALUES ('components/ILIAS//Test','tsig','Signature'); INSERT INTO `il_pluginslot` VALUES ('components/ILIAS//TestQuestionPool','qst','Questions'); -INSERT INTO `il_pluginslot` VALUES ('Services/AdvancedMetaData','amdc','AdvancedMDClaiming'); -INSERT INTO `il_pluginslot` VALUES ('Services/Authentication','authhk','AuthenticationHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/AuthShibboleth','shibhk','ShibbolethAuthenticationHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/Calendar','capg','AppointmentCustomGrid'); -INSERT INTO `il_pluginslot` VALUES ('Services/Calendar','capm','AppointmentCustomModal'); -INSERT INTO `il_pluginslot` VALUES ('Services/COPage','pgcp','PageComponent'); -INSERT INTO `il_pluginslot` VALUES ('Services/Cron','crnhk','CronHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/EventHandling','evhk','EventHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/LDAP','ldaphk','LDAPHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/PDFGeneration','renderer','Renderer'); -INSERT INTO `il_pluginslot` VALUES ('Services/PersonalDesktop','pdhk','PersonalDesktopHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/Repository','robj','RepositoryObject'); -INSERT INTO `il_pluginslot` VALUES ('Services/UIComponent','uihk','UserInterfaceHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/User','udfc','UDFClaiming'); -INSERT INTO `il_pluginslot` VALUES ('Services/WebServices','soaphk','SoapHook'); -INSERT INTO `il_pluginslot` VALUES ('Services/WorkflowEngine','wfeCG','ComplexGateway'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/AdvancedMetaData','amdc','AdvancedMDClaiming'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/Authentication','authhk','AuthenticationHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/AuthShibboleth','shibhk','ShibbolethAuthenticationHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/Calendar','capg','AppointmentCustomGrid'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/Calendar','capm','AppointmentCustomModal'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/COPage','pgcp','PageComponent'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/Cron','crnhk','CronHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/EventHandling','evhk','EventHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/LDAP','ldaphk','LDAPHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/PDFGeneration','renderer','Renderer'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/PersonalDesktop','pdhk','PersonalDesktopHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/Repository','robj','RepositoryObject'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/UIComponent','uihk','UserInterfaceHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/User','udfc','UDFClaiming'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/WebServices','soaphk','SoapHook'); +INSERT INTO `il_pluginslot` VALUES ('components/ILIAS/WorkflowEngine','wfeCG','ComplexGateway'); -- -- Table structure for table `il_poll` @@ -11985,7 +11985,7 @@ CREATE TABLE `mail_tpl_ctx` ( INSERT INTO `mail_tpl_ctx` VALUES ('crs_context_member_manual','components/ILIAS//Course','ilCourseMailTemplateMemberContext',''); INSERT INTO `mail_tpl_ctx` VALUES ('crs_context_tutor_manual','components/ILIAS//Course','ilCourseMailTemplateTutorContext',''); -INSERT INTO `mail_tpl_ctx` VALUES ('mail_template_generic','Services/Mail','ilMailTemplateGenericContext',''); +INSERT INTO `mail_tpl_ctx` VALUES ('mail_template_generic','components/ILIAS/Mail','ilMailTemplateGenericContext',''); INSERT INTO `mail_tpl_ctx` VALUES ('sahs_context_lp','components/ILIAS//ScormAicc','ilScormMailTemplateLPContext',''); INSERT INTO `mail_tpl_ctx` VALUES ('svy_context_rmd','components/ILIAS//Survey','ilSurveyMailTemplateReminderContext',''); @@ -12389,8 +12389,8 @@ CREATE TABLE `notification_channels` ( -- Dumping data for table `notification_channels` -- -INSERT INTO `notification_channels` VALUES ('mail','mail','mail_desc','ilNotificationMailHandler','Services/Notifications/classes/class.ilNotificationMailHandler.php','set_by_admin'); -INSERT INTO `notification_channels` VALUES ('osd','osd','osd_desc','ilNotificationOSDHandler','Services/Notifications/classes/class.ilNotificationOSDHandler.php','set_by_admin'); +INSERT INTO `notification_channels` VALUES ('mail','mail','mail_desc','ilNotificationMailHandler','components/ILIAS/Notifications/classes/class.ilNotificationMailHandler.php','set_by_admin'); +INSERT INTO `notification_channels` VALUES ('osd','osd','osd_desc','ilNotificationOSDHandler','components/ILIAS/Notifications/classes/class.ilNotificationOSDHandler.php','set_by_admin'); -- -- Table structure for table `notification_data` @@ -13818,8 +13818,8 @@ CREATE TABLE `pdfgen_renderer` ( -- Dumping data for table `pdfgen_renderer` -- -INSERT INTO `pdfgen_renderer` VALUES (1,'TCPDF','Services/PDFGeneration/classes/renderer/tcpdf/class.ilTCPDFRenderer.php'); -INSERT INTO `pdfgen_renderer` VALUES (4,'WkhtmlToPdf','Services/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfRenderer.php'); +INSERT INTO `pdfgen_renderer` VALUES (1,'TCPDF','components/ILIAS/PDFGeneration/classes/renderer/tcpdf/class.ilTCPDFRenderer.php'); +INSERT INTO `pdfgen_renderer` VALUES (4,'WkhtmlToPdf','components/ILIAS/PDFGeneration/classes/renderer/wkhtmltopdf/class.ilWkhtmlToPdfRenderer.php'); -- -- Table structure for table `pdfgen_renderer_avail` diff --git a/src/BackgroundTasks/PRIVACY.md b/src/BackgroundTasks/PRIVACY.md index b19d9b65f638..9617db403661 100644 --- a/src/BackgroundTasks/PRIVACY.md +++ b/src/BackgroundTasks/PRIVACY.md @@ -10,7 +10,7 @@ Disclaimer: This documentation does not warrant completeness or correctness. Ple - Typically this will be the User ID of the account whose actions initiated the creation of the background task. - The BackgroundTasks service employs the following services, please consult the respective privacy.mds: - [Filesystem](../../src/Filesystem/PRIVACY.md) - - [GlobalScreen](../../Services/GlobalScreen/PRIVACY.md) + - [GlobalScreen](../../components/ILIAS/GlobalScreen_/PRIVACY.md) - Setup - UI diff --git a/src/GlobalScreen/Scope/Layout/MetaContent/Media/CssCollection.php b/src/GlobalScreen/Scope/Layout/MetaContent/Media/CssCollection.php index e19cdc854714..9015769ea52a 100644 --- a/src/GlobalScreen/Scope/Layout/MetaContent/Media/CssCollection.php +++ b/src/GlobalScreen/Scope/Layout/MetaContent/Media/CssCollection.php @@ -21,7 +21,7 @@ /** * Class CssCollection - * @package ILIAS\Services\UICore\Page\Media + * @package ILIAS\components\UICore\Page\Media */ class CssCollection extends AbstractCollection { diff --git a/src/GlobalScreen/Scope/Layout/MetaContent/Media/InlineCssCollection.php b/src/GlobalScreen/Scope/Layout/MetaContent/Media/InlineCssCollection.php index 9d37a7d998fd..e1734e23d9cb 100644 --- a/src/GlobalScreen/Scope/Layout/MetaContent/Media/InlineCssCollection.php +++ b/src/GlobalScreen/Scope/Layout/MetaContent/Media/InlineCssCollection.php @@ -21,7 +21,7 @@ /** * Class InlineCssCollection - * @package ILIAS\Services\UICore\Page\Media + * @package ILIAS\components\UICore\Page\Media */ class InlineCssCollection extends AbstractCollection { diff --git a/src/GlobalScreen/Scope/Layout/MetaContent/Media/JsCollection.php b/src/GlobalScreen/Scope/Layout/MetaContent/Media/JsCollection.php index 776ac42f12bb..3d7c1fbb8499 100644 --- a/src/GlobalScreen/Scope/Layout/MetaContent/Media/JsCollection.php +++ b/src/GlobalScreen/Scope/Layout/MetaContent/Media/JsCollection.php @@ -21,7 +21,7 @@ /** * Class JsCollection - * @package ILIAS\Services\UICore\Page\Media + * @package ILIAS\components\UICore\Page\Media */ class JsCollection extends AbstractCollection { diff --git a/src/GlobalScreen/Scope/Layout/MetaContent/Media/OnLoadCodeCollection.php b/src/GlobalScreen/Scope/Layout/MetaContent/Media/OnLoadCodeCollection.php index d9ac6db6959f..56b65a845b9d 100644 --- a/src/GlobalScreen/Scope/Layout/MetaContent/Media/OnLoadCodeCollection.php +++ b/src/GlobalScreen/Scope/Layout/MetaContent/Media/OnLoadCodeCollection.php @@ -21,7 +21,7 @@ /** * Class OnLoadCodeCollection - * @package ILIAS\Services\UICore\Page\Media + * @package ILIAS\components\UICore\Page\Media */ class OnLoadCodeCollection extends AbstractCollection { diff --git a/src/KioskMode/README.md b/src/KioskMode/README.md index 45192ac73952..ccdde8bb432f 100644 --- a/src/KioskMode/README.md +++ b/src/KioskMode/README.md @@ -39,7 +39,7 @@ a view on these objects. It rather provides interfaces that describe how consume and providers of a kiosk mode should collaborate and functionality that helps to implement both sides of the collaboration. -This library is complemented by the [Kiosk-Mode-Service](../../Services/KioskMode/README.md) +This library is complemented by the [Kiosk-Mode-Service](../../components/ILIAS/KioskMode_/README.md) that provides functionality to construct views for certain objects and concrete database functionality. @@ -76,7 +76,7 @@ kiosk mode of the object: ## Implementing a Provider -Please use `ilKioskModeView` in `Services\KioskMode\classes\` as a base to implement +Please use `ilKioskModeView` in `components\KioskMode\classes\` as a base to implement this for ILIAS-objects. * `State` MUST only contain information about the view (not about LP, completion, ...) diff --git a/src/ResourceStorage/README.md b/src/ResourceStorage/README.md index 79b6afe443b1..d2b71c47a825 100644 --- a/src/ResourceStorage/README.md +++ b/src/ResourceStorage/README.md @@ -451,7 +451,7 @@ As I said, if you are a consumer of the IRSS, you use the Consumers approach any - Migration will need at least the feature ["Migrate Command"](https://docu.ilias.de/goto_docu_wiki_wpage_6399_1357.html) -- A documentation how you can migrate your component is [here](../../Services/ResourceStorage/MIGRATIONS.md). +- A documentation how you can migrate your component is [here](../../components/ILIAS/ResourceStorage_/MIGRATIONS.md). # Roadmap diff --git a/src/Setup/README.md b/src/Setup/README.md index 60819f648d48..620cb3306cf2 100644 --- a/src/Setup/README.md +++ b/src/Setup/README.md @@ -141,11 +141,11 @@ the composer class-map. The main visuals of ILIAS are pieced together by parts from many different components. Entries in the main bar may be derived from various components, notifications arise -from many sources and tools are provided by different features. The [GlobalScreen-service](../../Services/GlobalScreen) +from many sources and tools are provided by different features. The [GlobalScreen-service](../../components/ILIAS/GlobalScreen_) collects providers from all components to build the screen from contributions from all of them. Providers are classes implementing a specific interface. These are -collected in the [`ilGlobalScreenBuildProviderMapObjective`](../../Services/GlobalScreen/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php) -and stored in `Services/GlobalScreen/artifacts/global_screen_providers.php` as +collected in the [`ilGlobalScreenBuildProviderMapObjective`](../../components/ILIAS/GlobalScreen_/classes/Setup/class.ilGlobalScreenBuildProviderMapObjective.php) +and stored in `components/ILIAS/GlobalScreen_/artifacts/global_screen_providers.php` as serialized array like so: ```php diff --git a/src/UI/examples/Input/Field/File/base.php b/src/UI/examples/Input/Field/File/base.php index 960b240cab94..10b313343eac 100755 --- a/src/UI/examples/Input/Field/File/base.php +++ b/src/UI/examples/Input/Field/File/base.php @@ -15,7 +15,7 @@ function base() $renderer = $DIC->ui()->renderer(); // Step 1: Define the input field. - // See the implementation of a UploadHandler in Services/UI/classes/class.ilUIDemoFileUploadHandlerGUI.php + // See the implementation of a UploadHandler in components/ILIAS/UI_/classes/class.ilUIDemoFileUploadHandlerGUI.php $file_input = $ui->input()->field()->file(new \ilUIDemoFileUploadHandlerGUI(), "Upload File", "you can drop your files here"); // Step 2: Define the form and attach the field. diff --git a/src/UI/examples/Input/Field/File/in_form.php b/src/UI/examples/Input/Field/File/in_form.php index 3ad182bb2a12..1d170101dcc4 100755 --- a/src/UI/examples/Input/Field/File/in_form.php +++ b/src/UI/examples/Input/Field/File/in_form.php @@ -17,7 +17,7 @@ function in_form() $request = $DIC->http()->request(); // Step 1: Define the input field. - // See the implementation of a UploadHandler in Services/UI/classes/class.ilUIDemoFileUploadHandlerGUI.php + // See the implementation of a UploadHandler in components/ILIAS/UI_/classes/class.ilUIDemoFileUploadHandlerGUI.php $file = $ui->input()->field()->file(new \ilUIDemoFileUploadHandlerGUI(), "File Upload", "You can drop your files here"); // Step 2: Define the form and attach the field. diff --git a/storeScorm.php b/storeScorm.php index 6a7b1f4e878d..a062f23a5489 100644 --- a/storeScorm.php +++ b/storeScorm.php @@ -17,7 +17,7 @@ * *********************************************************************/ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/storeScorm2004.php b/storeScorm2004.php index f6f4bd4c94e4..20fedd5a0281 100644 --- a/storeScorm2004.php +++ b/storeScorm2004.php @@ -17,7 +17,7 @@ * *********************************************************************/ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); ilContext::init(ilContext::CONTEXT_SCORM); ilInitialisation::initILIAS(); diff --git a/templates/default/070-components/legacy/Services/UIComponent/_component_explorer2.scss b/templates/default/070-components/legacy/Services/UIComponent/_component_explorer2.scss index f83a4f66f7a3..416423a941fd 100644 --- a/templates/default/070-components/legacy/Services/UIComponent/_component_explorer2.scss +++ b/templates/default/070-components/legacy/Services/UIComponent/_component_explorer2.scss @@ -2,7 +2,7 @@ @use "../../../../010-settings/legacy-settings/legacy-settings_tree" as *; @use "../../../../030-tools/_tool_browser-prefixes" as *; -/* Services/UI/Explorer2 */ +/* components/ILIAS/UI_/Explorer2 */ table.ilExplorer { width: 100%; diff --git a/templates/default/delos.css b/templates/default/delos.css index e795012428e4..f776c2ed0e67 100644 --- a/templates/default/delos.css +++ b/templates/default/delos.css @@ -17764,7 +17764,7 @@ div.ilChecklist ul li img { min-width: 200px; } -/* Services/UI/Explorer2 */ +/* components/ILIAS/UI_/Explorer2 */ table.ilExplorer { width: 100%; background-color: #f9f9f9; diff --git a/tests/App/RootFolderTest.php b/tests/App/RootFolderTest.php index 02a061c6a64c..8ff93c4ec313 100644 --- a/tests/App/RootFolderTest.php +++ b/tests/App/RootFolderTest.php @@ -84,7 +84,6 @@ final class RootFolderTest extends TestCase 'cli', 'components', 'Customizing', - 'Services', 'data', 'docs', 'extern', diff --git a/tests/GlobalCache/Setup/ilGlobalCacheSetupAgentTest.php b/tests/GlobalCache/Setup/ilGlobalCacheSetupAgentTest.php index acee5cac0fa1..0934fa832084 100644 --- a/tests/GlobalCache/Setup/ilGlobalCacheSetupAgentTest.php +++ b/tests/GlobalCache/Setup/ilGlobalCacheSetupAgentTest.php @@ -245,7 +245,7 @@ public function testGetInstallObjectives(): void $setup_conf_mock = $this->createMock(\ilGlobalCacheSettingsAdapter::class); $objective_collection = $this->obj->getInstallObjective($setup_conf_mock); - $this->assertEquals('Store configuration of Services/GlobalCache', $objective_collection->getLabel()); + $this->assertEquals('Store configuration of components/ILIAS/GlobalCache_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); } @@ -254,7 +254,7 @@ public function testGetUpdateObjective(): void $setup_conf_mock = $this->createMock(\ilGlobalCacheSettingsAdapter::class); $objective_collection = $this->obj->getUpdateObjective($setup_conf_mock); - $this->assertEquals('Store configuration of Services/GlobalCache', $objective_collection->getLabel()); + $this->assertEquals('Store configuration of components/ILIAS/GlobalCache_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); } diff --git a/tests/ILIASSuite.php b/tests/ILIASSuite.php index c9930b547314..49629407fa74 100644 --- a/tests/ILIASSuite.php +++ b/tests/ILIASSuite.php @@ -34,7 +34,7 @@ public static function suite() echo "\n"; // scan Modules and Services directories - $basedirs = array("Services", "components/ILIAS"); + $basedirs = array("components/ILIAS"); foreach ($basedirs as $basedir) { // read current directory diff --git a/tests/Language/Setup/ilLanguageSetupAgentTest.php b/tests/Language/Setup/ilLanguageSetupAgentTest.php index efb575c0acee..ef509ffbc806 100644 --- a/tests/Language/Setup/ilLanguageSetupAgentTest.php +++ b/tests/Language/Setup/ilLanguageSetupAgentTest.php @@ -62,7 +62,7 @@ public function testGetInstallObjectives(): void { $objective_collection = $this->obj->getInstallObjective(); - $this->assertEquals('Complete objectives from Services/Language', $objective_collection->getLabel()); + $this->assertEquals('Complete objectives from components/ILIAS/Language_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); $this->assertCount(2, $objective_collection->getObjectives()); } @@ -71,7 +71,7 @@ public function testGetUpdateObjective(): void { $objective_collection = $this->obj->getUpdateObjective(); - $this->assertEquals('Complete objectives from Services/Language', $objective_collection->getLabel()); + $this->assertEquals('Complete objectives from components/ILIAS/Language_', $objective_collection->getLabel()); $this->assertFalse($objective_collection->isNotable()); $this->assertCount(1, $objective_collection->getObjectives()); } diff --git a/tests/UI/Base.php b/tests/UI/Base.php index a5565018cab6..b7b2a8c16218 100644 --- a/tests/UI/Base.php +++ b/tests/UI/Base.php @@ -19,7 +19,7 @@ require_once("libs/composer/vendor/autoload.php"); require_once(__DIR__ . "/Renderer/ilIndependentTemplate.php"); -require_once(__DIR__ . "/../../Services/Language/classes/class.ilLanguage.php"); +require_once(__DIR__ . "/../../components/ILIAS/Language_/classes/class.ilLanguage.php"); use ILIAS\UI\Component as C; use ILIAS\UI\Component\Component as IComponent; diff --git a/webdav.php b/webdav.php index 16950048b66b..50c61f97f405 100644 --- a/webdav.php +++ b/webdav.php @@ -18,7 +18,7 @@ * *********************************************************************/ -require_once("Services/Init/classes/class.ilInitialisation.php"); +require_once("components/ILIAS/Init/classes/class.ilInitialisation.php"); $path_info_components = explode('/', $_SERVER['PATH_INFO']); $client_id = $path_info_components[1]; diff --git a/wopi/index.php b/wopi/index.php index 11d5572c456f..66dcb58960b2 100644 --- a/wopi/index.php +++ b/wopi/index.php @@ -8,7 +8,7 @@ // - Unlock // INIT ILIAS -use ILIAS\Services\WOPI\Handler\RequestHandler; +use ILIAS\components\WOPI\Handler\RequestHandler; chdir("../"); require_once __DIR__ . "/../libs/composer/vendor/autoload.php";