Skip to content
Snippets Groups Projects
Commit 06629e19 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

relocate stud.ip trails files, fixes #4105

Closes #4105

Merge request !2936
parent e398eec2
No related branches found
No related tags found
1 merge request!2936relocate stud.ip trails files, fixes #4105
Pipeline #23109 passed
...@@ -19,6 +19,12 @@ ...@@ -19,6 +19,12 @@
- Die `MembersModel.php` wurde entfernt ([Issue #3811](https://gitlab.studip.de/studip/studip/-/issues/3811)) - Die `MembersModel.php` wurde entfernt ([Issue #3811](https://gitlab.studip.de/studip/studip/-/issues/3811))
- Die `admission.inc.php` wurde entfernt. ([Issue #3812](https://gitlab.studip.de/studip/studip/-/issues/3812)) - Die `admission.inc.php` wurde entfernt. ([Issue #3812](https://gitlab.studip.de/studip/studip/-/issues/3812))
- Die Methoden `CronjobScheduler::scheduleOnce()` sowie `CronjobTask::scheduleOnce()` wurden ersatzlos entfernt. ([Issue #4078](https://gitlab.studip.de/studip/studip/-/issues/4078)) - Die Methoden `CronjobScheduler::scheduleOnce()` sowie `CronjobTask::scheduleOnce()` wurden ersatzlos entfernt. ([Issue #4078](https://gitlab.studip.de/studip/studip/-/issues/4078))
- Die folgenden Klassen wurden innerhalb von Stud.IP verschoben. Da sie über den Autoloader geladen werden, kann jedes manuelle Einbinden ersatzlos entfernt werden. ([Issue #4105](https://gitlab.studip.de/studip/studip/-/issues/4105))
- `AuthenticatedController`
- `PluginController`
- `StudipController`
- `StudipControllerPropertiesTrait`
- `StudipResponse`
## Security related issues ## Security related issues
......
<?php <?php
require_once __DIR__ . '/../studip_controller_properties_trait.php'; require_once __DIR__ . '/../../../lib/classes/StudipControllerPropertiesTrait.php';
class Admin_InstallController extends Trails_Controller class Admin_InstallController extends Trails_Controller
{ {
......
<?php <?php
require_once 'app/controllers/authenticated_controller.php';
class LoncapaController extends AuthenticatedController class LoncapaController extends AuthenticatedController
{ {
public function enter_action() public function enter_action()
......
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
* @since 3.0 * @since 3.0
*/ */
require_once 'app/controllers/authenticated_controller.php';
class NotificationsController extends AuthenticatedController class NotificationsController extends AuthenticatedController
{ {
/** /**
......
...@@ -76,18 +76,6 @@ StudipAutoloader::addClassLookup( ...@@ -76,18 +76,6 @@ StudipAutoloader::addClassLookup(
$trails_classes, $trails_classes,
'vendor/trails/trails.php' 'vendor/trails/trails.php'
); );
StudipAutoloader::addClassLookup(
'StudipController',
'app/controllers/studip_controller.php'
);
StudipAutoloader::addClassLookup(
'AuthenticatedController',
'app/controllers/authenticated_controller.php'
);
StudipAutoloader::addClassLookup(
'PluginController',
'app/controllers/plugin_controller.php'
);
// Vendor // Vendor
StudipAutoloader::addClassLookups([ StudipAutoloader::addClassLookups([
......
<?php <?php
/* /*
* studip_controller.php - studip controller base class * StudipController.php - studip controller base class
* Copyright (c) 2009 Elmar Ludwig * Copyright (c) 2009 Elmar Ludwig
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -13,9 +13,6 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet; ...@@ -13,9 +13,6 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Writer\Csv; use PhpOffice\PhpSpreadsheet\Writer\Csv;
use PhpOffice\PhpSpreadsheet\Writer\Xlsx; use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
require_once 'studip_controller_properties_trait.php';
require_once 'studip_response.php';
/** /**
* @property StudipResponse $response * @property StudipResponse $response
*/ */
......
...@@ -60,7 +60,6 @@ StudipAutoloader::addAutoloadPath('lib/plugins/engine'); ...@@ -60,7 +60,6 @@ StudipAutoloader::addAutoloadPath('lib/plugins/engine');
StudipAutoloader::addAutoloadPath('lib/plugins/core'); StudipAutoloader::addAutoloadPath('lib/plugins/core');
StudipAutoloader::addAutoloadPath('lib/plugins/db'); StudipAutoloader::addAutoloadPath('lib/plugins/db');
StudipAutoloader::addClassLookup('StudipController', 'app/controllers/studip_controller.php');
$trails_classes = [ $trails_classes = [
'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller', 'Trails_Dispatcher', 'Trails_Response', 'Trails_Controller',
'Trails_Inflector', 'Trails_Flash', 'Trails_Inflector', 'Trails_Flash',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment