Merge branch 'master' into feature-28632/Navigation_widget_component_calls_DB_with_fhcomplete

Fehler behoben wodurch keine Punkteübernahme bie Nachprüfungen möglich
war

.gitignore

@@ -24,6 +24,7 @@ application/logs/
 application/models/extensions/
 application/views/extensions/
 application/widgets/extensions/
+application/components/extensions/
 
 public/extensions/
 

FHC-vendor/jquery-tablesorter/package.json

@@ -56,7 +56,7 @@
     ]
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
+    "grunt": "^1.3.0",
     "grunt-cli": "~0.1.13",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-concat": "^0.5.1",

README.md

@@ -1,5 +1,5 @@
 # FH-Complete
 
 * [FH-Complete Homepage](https://www.fhcomplete.org)
-* [Wiki](https://wiki.fhcomplete.org/)
+* [Wiki](https://wiki.fhcomplete.info/)
 * [Changelog](CHANGELOG.md)

application/components/filters/LogsViewer.php

@@ -0,0 +1,19 @@
+<?php
+	$filterCmptArray = array(
+		'app' => 'core',
+		'datasetName' => 'logs',
+		//'filterKurzbz' => 'jobs48hours', // REMOVE ME
+		'query' => '
+			SELECT wsl.webservicelog_id AS "LogId",
+					wsl.request_id AS "RequestId",
+					wsl.execute_time AS "ExecutionTime",
+					wsl.execute_user AS "ExecutedBy",
+					wsl.beschreibung AS "Description",
+					wsl.request_data AS "Data",
+					wsl.webservicetyp_kurzbz AS "WebserviceType"
+			 FROM system.tbl_webservicelog wsl
+		 ORDER BY wsl.execute_time DESC
+		',
+		'requiredPermissions' => 'admin'
+	);
+

application/config/Events.php

@@ -0,0 +1,14 @@
+<?php
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use CI3_Events as Events;
+
+/**
+ * NOTE(chris): example:
+	Events::on('stv_conf_student', function (&$res) {
+		$res['test'] = [
+			'title' => 'TEST',
+			'component' => './Stv/Studentenverwaltung/Details/Notizen.js'
+		];
+	});
+ */

application/config/anrechnung.php

@@ -0,0 +1,23 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+// Deadline for Application given as Time-Interval after Semesterstart.
+$config['interval_blocking_application'] = 'P1M';
+
+// Lehrveranstaltungen with these grades will be blocked for application
+$config['grades_blocking_application'] = array(
+	5,  // nicht genügend
+	6,  // angerechnet
+	9,  // noch nicht eingetragen
+	13, // nicht erfolgreich absolviert
+	14, // nicht bestanden,
+	15, // nicht teilgenommen
+	18  // unentschuldigt
+);
+
+//Enables Fachbereichsleiter instead of LV Leiter
+$config['fbl'] = FALSE;
+//Enables Info Mails
+$config['send_mail'] = TRUE;

application/config/constants.php

@@ -57,14 +57,6 @@ define('AUTH_SUCCESS',				0);
 define('AUTH_NOT_AUTHENTICATED',	1);
 define('AUTH_INVALID_CREDENTIALS',	2);
 
-/*
-|--------------------------------------------------------------------------
-| LDAP constants
-|--------------------------------------------------------------------------
-*/
-define('LDAP_NO_USER_DN',			10);
-define('LDAP_TOO_MANY_USER_DN',		11);
-
 /*
 |--------------------------------------------------------------------------
 | Language constants

application/config/db_crypt.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Copyright (C) 2023 fhcomplete.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+// NOTE: if database encryption is _not_ used then leave this array empty!
+$config['encryption_passwords'] = array(
+	// 'password name 1' => 'password 1'
+	// 'password name 2' => 'password 2'
+	// 'password name ...' => 'password ...'
+	// 'password name N' => 'password N'
+);
+

application/config/infocenter.php

@@ -0,0 +1,5 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['infocenter_studiengang_kz'] = '10021, 10027, 10002';

application/config/ldap.php

@@ -17,7 +17,8 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
 		'basedn'	=> LDAP_BASE_DN,
 		'username'	=> LDAP_BIND_USER,
 		'password'	=> LDAP_BIND_PASSWORD,
-		'usf'		=> LDAP_USER_SEARCH_FILTER
+		'usf'		=> LDAP_USER_SEARCH_FILTER,
+		'timeout'	=> 1
 	);
 }
 
@@ -30,7 +31,8 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
 		'basedn'	=> LDAP2_BASE_DN,
 		'username'	=> LDAP2_BIND_USER,
 		'password'	=> LDAP2_BIND_PASSWORD,
-		'usf'		=> LDAP2_USER_SEARCH_FILTER
+		'usf'		=> LDAP2_USER_SEARCH_FILTER,
+		'timeout'	=> 1
 	);
 }
 
@@ -45,7 +47,8 @@ if (defined('LDAP_SERVER')) // 1st LDAP server
 		'basedn'	=> LDAP_BASE_DN,
 		'username'	=> LDAP_BIND_USER,
 		'password'	=> LDAP_BIND_PASSWORD,
-		'usf'		=> LDAP_USER_SEARCH_FILTER
+		'usf'		=> LDAP_USER_SEARCH_FILTER,
+		'timeout'	=> 1
 	);
 }
 
@@ -58,6 +61,8 @@ if (defined('LDAP2_SERVER')) // 2nd LDAP server
 		'basedn'	=> LDAP2_BASE_DN,
 		'username'	=> LDAP2_BIND_USER,
 		'password'	=> LDAP2_BIND_PASSWORD,
-		'usf'		=> LDAP2_USER_SEARCH_FILTER
+		'usf'		=> LDAP2_USER_SEARCH_FILTER,
+		'timeout'	=> 1
 	);
 }
+

application/config/navigation.php

@@ -15,7 +15,7 @@ $config['navigation_header'] = array(
 			'description' => 'Organisation',
 			'sort' => 20,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children'=> array(
+			'children' => array(
 				'vilesci' => array(
 					'link' => base_url('vilesci'),
 					'icon' => '',
@@ -23,6 +23,22 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 10,
 					'requiredPermissions' => 'basis/vilesci:r'
+				),
+				'oehbeitragsverwaltung' => array(
+					'link' => site_url('codex/Oehbeitrag'),
+					'icon' => '',
+					'description' => 'ÖH-Beitragsverwaltung',
+					'expand' => true,
+					'sort' => 20,
+					'requiredPermissions' => 'admin:w'
+				),
+				'bismeldestichtagsverwaltung' => array(
+					'link' => site_url('codex/Bismeldestichtag'),
+					'icon' => '',
+					'description' => 'BIS-Meldestichtagsverwaltung',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'admin:w'
 				)
 			)
 		),
@@ -32,7 +48,7 @@ $config['navigation_header'] = array(
 			'description' => 'Lehre',
 			'sort' => 30,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children'=> array(
+			'children' => array(
 				'cis' => array(
 					'link' => CIS_ROOT,
 					'icon' => '',
@@ -62,6 +78,25 @@ $config['navigation_header'] = array(
 						'lehre/lehrauftrag_bestellen:r',
 						'lehre/lehrauftrag_erteilen:r'
 					)
+				),
+				'zverfueg' => array(
+					'link' => site_url('lehre/lvplanung/AdminZeitverfuegbarkeit'),
+					'description' => 'Zeitverfügbarkeit',
+					'expand' => true,
+					'sort' => 45,
+					'requiredPermissions' => array(
+						'lehre/zeitverfuegbarkeit:rw',
+						'lehre/zeitverfuegbarkeit:rw'
+					)
+				),
+				'zgvueberpruefung' => array(
+					'link' => site_url('system/infocenter/ZGVUeberpruefung'),
+					'description' => 'ZGV Überprüfung',
+					'expand' => true,
+					'sort' => 50,
+					'requiredPermissions' => array(
+						'lehre/zgvpruefung:r'
+					)
 				)
 			)
 		),
@@ -71,7 +106,7 @@ $config['navigation_header'] = array(
 			'description' => 'Personen',
 			'sort' => 40,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children'=> array(
+			'children' => array(
 				'messages' => array(
 					'link' => site_url('system/messages/MessageClient/read'),
 					'icon' => '',
@@ -85,6 +120,27 @@ $config['navigation_header'] = array(
 					'description' => 'BPK Wartung',
 					'sort' => 20,
 					'requiredPermissions' => 'admin:r'
+				),
+				'errormonitoring' => array(
+					'link' => site_url('system/issues/Issues'),
+					'description' => 'Fehler Monitoring',
+					'expand' => true,
+					'sort' => 30,
+					'requiredPermissions' => 'system/issues_verwalten:r'
+				),
+				'plausichecks' => array(
+					'link' => site_url('system/issues/Plausichecks'),
+					'description' => 'Plausichecks',
+					'expand' => true,
+					'sort' => 40,
+					'requiredPermissions' => 'system/issues_verwalten:r'
+				),
+				'gruppenmanagement' => array(
+					'link' => site_url('person/Gruppenmanagement'),
+					'description' => 'Gruppenmanagement',
+					'expand' => true,
+					'sort' => 50,
+					'requiredPermissions' => 'lehre/gruppenmanager:r'
 				)
 			)
 		),
@@ -95,7 +151,7 @@ $config['navigation_header'] = array(
 			'expand' => false,
 			'sort' => 50,
 			'requiredPermissions' => 'admin:r',
-			'children'=> array(
+			'children' => array(
 				'extensions' => array(
 					'link' => site_url('system/extensions/Manager'),
 					'description' => 'Extensions Manager',
@@ -116,7 +172,14 @@ $config['navigation_header'] = array(
 					'expand' => true,
 					'sort' => 20,
 					'requiredPermissions' => 'system/developer:r'
-				)
+				),
+                'anrechnungen' => array(
+                    'link' => site_url('lehre/anrechnung/AdminAnrechnung'),
+                    'description' => 'Anrechnungen',
+                    'expand' => true,
+                    'sort' => 30,
+                    'requiredPermissions' => 'lehre/anrechnungszeitfenster:rw'
+                )
 			)
 		)
 	)
@@ -136,6 +199,15 @@ $config['navigation_menu']['Vilesci/index'] = array(
 	)
 );
 
+$config['navigation_menu']['Vilesci/index'] = array(
+    'dashboard' => array(
+        'link' => '#',
+        'description' => 'Dashboard',
+        'icon' => 'dashboard',
+        'sort' => 1
+    )
+);
+
 $config['navigation_menu']['organisation/Reihungstest/index'] = array(
 	'reihungstestverwalung' => array(
 		'link' => base_url('vilesci/stammdaten/reihungstestverwaltung.php'),
@@ -160,7 +232,8 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
 		'icon' => 'dashboard',
 		'sort' => 1,
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
-	),'lehrauftragBestellen' => array(
+	),
+	'lehrauftragBestellen' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
 		'description' => 'Lehrauftrag bestellen',
 		'icon' => '',
@@ -182,6 +255,7 @@ $config['navigation_menu']['lehre/lehrauftrag/Lehrauftrag/*'] = array(
 		'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
 	)
 );
+
 $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 	'lehrauftragDashboard' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag/Dashboard'),
@@ -189,7 +263,8 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 		'icon' => 'dashboard',
 		'sort' => 1,
 		'requiredPermissions' => array('lehre/lehrauftrag_bestellen:r','lehre/lehrauftrag_erteilen:r')
-	),'lehrauftragBestellen' => array(
+	),
+	'lehrauftragBestellen' => array(
 		'link' => site_url('lehre/lehrauftrag/Lehrauftrag'),
 		'description' => 'Lehrauftrag bestellen',
 		'icon' => '',
@@ -211,3 +286,23 @@ $config['navigation_menu']['lehre/lehrauftrag/LehrauftragErteilen/*'] = array(
 		'requiredPermissions' => array('lehre/lehrauftrag_erteilen:r')
 	)
 );
+
+$config['navigation_menu']['system/issues/Issues/*'] = array(
+	'fehlerzustaendigkeiten' => array(
+		'link' => site_url('system/issues/IssuesZustaendigkeiten'),
+		'description' => 'Fehler Zuständigkeiten',
+		'icon' => 'users',
+		'sort' => 100,
+		'target' => '_blank',
+		'requiredPermissions' => array('admin:rw')
+	),
+	'fehlerkonfiguration' => array(
+		'link' => site_url('system/issues/IssuesKonfiguration'),
+		'description' => 'Fehler Konfiguration',
+		'icon' => 'cogs',
+		'sort' => 200,
+		'target' => '_blank',
+		'requiredPermissions' => array('admin:rw')
+	),
+);
+

application/config/routes.php

@@ -60,3 +60,26 @@ $route['api/v1/organisation/[G|g]eschaeftsjahr/(:any)'] = 'api/v1/organisation/g
 $route['api/v1/organisation/[O|o]rganisationseinheit/(:any)'] = 'api/v1/organisation/organisationseinheit2/$1';
 $route['api/v1/ressource/[B|b]etriebsmittelperson/(:any)'] = 'api/v1/ressource/betriebsmittelperson2/$1';
 $route['api/v1/system/[S|s]prache/(:any)'] = 'api/v1/system/sprache2/$1';
+
+// load routes from extensions
+$subdir = 'application/config/extensions';
+$dirlist = scandir($subdir);
+
+if ($dirlist)
+{
+	$files = array_diff($dirlist, array('.','..'));
+
+	foreach ($files as &$item)
+	{
+		if (is_dir($subdir . DIRECTORY_SEPARATOR . $item))
+		{
+			$routes_file = $subdir . DIRECTORY_SEPARATOR . $item . DIRECTORY_SEPARATOR . 'routes.php';
+
+			if (file_exists($routes_file))
+			{
+				require($routes_file);
+			}
+		}
+	}
+}
+

application/config/studierendenantrag.php

@@ -0,0 +1,170 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
+$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
+
+// TODO(chris): review this!
+#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
+$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
+
+/**
+ * UPLOAD
+ */
+
+/**
+ * Allowed filetypes for attachment upload in unterbrechung antrag
+ *
+ * @var array           An array of fileextensions
+ */
+$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
+
+
+/**
+ * GRADES
+ */
+
+/**
+ * On wiederholung the student must repeat certain lvs.
+ * This lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_angerechnet'] = 19;
+
+/**
+ * On wiederholung the student can not attend certain lvs.
+ * Those lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_nicht_zugelassen'] = 20;
+
+
+/**
+ * JOBS
+ */
+
+/**
+ * The Job will remind for every Unterbrecher who has a
+ * wiedereinstieg_datum between the date the Job is run
+ * and the modified date
+ * e.g.: If the Job is running on 2023-04-20 and the modifier
+ * is '+3 days' it will remind of everyone that
+ * has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
+ *
+ * @var string	        A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
+
+/**
+ * The Job will sent a request to everyone who faild the 3rd committee exam
+ * and respecting the given conditions (not repeated yet, stg not in blacklist)
+ * to decide if he/she will repeat or not
+ *
+ * First request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
+
+/**
+ * Second request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
+
+/**
+ * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
+
+/**
+ * before this exam dates for Wiederholer will be ignored
+ *
+ * @var string           A string formated as Date
+ *
+ */
+$config['digitalization_start'] = '2022-07-01';
+
+
+
+
+/**
+ * Objection period - the student will be abgemeldet if he hasn't objected in this period
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
+
+
+
+/**
+ * System User - uid of a user that is allowed to set prestudentstatus
+ *
+ * @var string
+ */
+$config['antrag_job_systemuser'] = '';
+
+
+/**
+ * WHITELISTS
+ */
+
+/**
+ * List of stati who entitle a prestudent to create an Antrag
+ *
+ * @var array			Array of tbl_status.status_kurzbz's
+ */
+$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
+$config['antrag_prestudentstatus_whitelist_abmeldung'] = ['Student', 'Diplomand', 'Unterbrecher'];
+
+
+/**
+ * BLACKLISTS
+ */
+
+/**
+ * List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
+ *
+ * @var array			An array of tbl_status_grund.statusgrund_id's
+ */
+$config['status_gruende_wiederholer'] = [16, 15];
+
+/**
+ * Blacklisted for abmeldung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_abmeldung'] = [];
+
+/**
+ * Blacklisted for unterbrechung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_unterbrechung'] = [];
+
+/**
+ * Blacklisted for wiederholung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_wiederholung'] = [];
+
+/**
+ * Blacklisted noten for negative committee exams
+ * noten with this ids won't be seen as negative
+ *
+ * @var array           An array of noten ids
+ */
+$config['note_blacklist_wiederholung'] = [];

application/config/udfmasterschema.json

@@ -9,6 +9,13 @@
 		"name": {
 			"type": "string"
 		},
+		"type": {
+			"type": "string",
+			"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
+		},
+		"requiredPermissions": {
+			"type": "array"
+		},
 		"description": {
 			"type": "array",
 		},
@@ -18,10 +25,6 @@
 		"title": {
 			"type": "array",
 		},
-		"type": {
-			"type": "string",
-			"enum": ["checkbox", "textfield", "textarea", "date", "dropdown", "multipledropdown"]
-		},
 		"sort": {
 			"type": "integer"
 		},
@@ -67,5 +70,6 @@
 			}
 		}
 	},
-	"required": ["type", "name"]
-}
+	"required": ["type", "name", "requiredPermissions"]
+}
+

application/controllers/Test.php

@@ -0,0 +1,16 @@
+<?php
+ 
+if ( !defined("PHPUNIT_TEST") ) {
+    show_404();
+}
+ 
+class Test extends CI_Controller
+{
+    public function index()
+    {
+        // Yep... This is all we need.
+        ini_set('error_reporting', E_ALL); // or error_reporting(E_ALL);
+        ini_set('display_errors', '1');
+        ini_set('display_startup_errors', '1');
+    }
+}

application/controllers/api/v1/CheckUserAuth.php

@@ -12,7 +12,7 @@ class CheckUserAuth extends RESTFul_Controller
 		parent::__construct();
 
 		// Loads helper message to manage returning messages
-		// NOTE: loaded here because it does not extend the APIv1_Controller
+		// NOTE: loaded here because it does not extend the API_Controller
 		$this->load->helper('hlp_return_object');
 	}
 

application/controllers/api/v1/accounting/Aufteilung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Aufteilung extends APIv1_Controller
+class Aufteilung extends API_Controller
 {
 	/**
 	 * Aufteilung API constructor.

application/controllers/api/v1/accounting/Bestelldetail.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bestelldetail extends APIv1_Controller
+class Bestelldetail extends API_Controller
 {
 	/**
 	 * Bestelldetail API constructor.

application/controllers/api/v1/accounting/Bestelldetailtag.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bestelldetailtag extends APIv1_Controller
+class Bestelldetailtag extends API_Controller
 {
 	/**
 	 * Bestelldetailtag API constructor.

application/controllers/api/v1/accounting/Bestellstatus.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bestellstatus extends APIv1_Controller
+class Bestellstatus extends API_Controller
 {
 	/**
 	 * Bestellstatus API constructor.

application/controllers/api/v1/accounting/Bestellung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bestellung extends APIv1_Controller
+class Bestellung extends API_Controller
 {
 	/**
 	 * Bestellung API constructor.

application/controllers/api/v1/accounting/Bestellungtag.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bestellungtag extends APIv1_Controller
+class Bestellungtag extends API_Controller
 {
 	/**
 	 * Bestellungtag API constructor.

application/controllers/api/v1/accounting/Buchung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Buchung extends APIv1_Controller
+class Buchung extends API_Controller
 {
 	/**
 	 * Buchung API constructor.

application/controllers/api/v1/accounting/Buchungstyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Buchungstyp extends APIv1_Controller
+class Buchungstyp extends API_Controller
 {
 	/**
 	 * Buchungstyp API constructor.

application/controllers/api/v1/accounting/Budget.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Budget extends APIv1_Controller
+class Budget extends API_Controller
 {
 	/**
 	 * Budget API constructor.

application/controllers/api/v1/accounting/Konto.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Konto extends APIv1_Controller
+class Konto extends API_Controller
 {
 	/**
 	 * Konto API constructor.

application/controllers/api/v1/accounting/Kostenstelle.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Kostenstelle extends APIv1_Controller
+class Kostenstelle extends API_Controller
 {
 	/**
 	 * Kostenstelle API constructor.

application/controllers/api/v1/accounting/Rechnung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Rechnung extends APIv1_Controller
+class Rechnung extends API_Controller
 {
 	/**
 	 * Rechnung API constructor.

application/controllers/api/v1/accounting/Rechnungsbetrag.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Rechnungsbetrag extends APIv1_Controller
+class Rechnungsbetrag extends API_Controller
 {
 	/**
 	 * Rechnungsbetrag API constructor.

application/controllers/api/v1/accounting/Rechnungstyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Rechnungstyp extends APIv1_Controller
+class Rechnungstyp extends API_Controller
 {
 	/**
 	 * Rechnungstyp API constructor.

application/controllers/api/v1/accounting/Vertrag.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Vertrag extends APIv1_Controller
+class Vertrag extends API_Controller
 {
 	/**
 	 * Vertrag API constructor.

application/controllers/api/v1/accounting/Vertragsstatus.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Vertragsstatus extends APIv1_Controller
+class Vertragsstatus extends API_Controller
 {
 	/**
 	 * Vertragsstatus API constructor.

application/controllers/api/v1/accounting/Vertragstyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Vertragstyp extends APIv1_Controller
+class Vertragstyp extends API_Controller
 {
 	/**
 	 * Vertragstyp API constructor.

application/controllers/api/v1/accounting/Zahlungstyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zahlungstyp extends APIv1_Controller
+class Zahlungstyp extends API_Controller
 {
 	/**
 	 * Zahlungstyp API constructor.

application/controllers/api/v1/codex/Akadgrad.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Akadgrad extends APIv1_Controller
+class Akadgrad extends API_Controller
 {
 	/**
 	 * Akadgrad API constructor.

application/controllers/api/v1/codex/Archiv.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Archiv extends APIv1_Controller
+class Archiv extends API_Controller
 {
 	/**
 	 * Archiv API constructor.

application/controllers/api/v1/codex/Aufmerksamdurch.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Aufmerksamdurch extends APIv1_Controller
+class Aufmerksamdurch extends API_Controller
 {
 	/**
 	 * Aufmerksamdurch API constructor.

application/controllers/api/v1/codex/Ausbildung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Ausbildung extends APIv1_Controller
+class Ausbildung extends API_Controller
 {
 	/**
 	 * Ausbildung API constructor.

application/controllers/api/v1/codex/Berufstaetigkeit.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Berufstaetigkeit extends APIv1_Controller
+class Berufstaetigkeit extends API_Controller
 {
 	/**
 	 * Berufstaetigkeit API constructor.

application/controllers/api/v1/codex/Beschaeftigungsausmass.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Beschaeftigungsausmass extends APIv1_Controller
+class Beschaeftigungsausmass extends API_Controller
 {
 	/**
 	 * Beschaeftigungsausmass API constructor.

application/controllers/api/v1/codex/Besqual.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Besqual extends APIv1_Controller
+class Besqual extends API_Controller
 {
 	/**
 	 * Besqual API constructor.

application/controllers/api/v1/codex/Bisfunktion.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bisfunktion extends APIv1_Controller
+class Bisfunktion extends API_Controller
 {
 	/**
 	 * Bisfunktion API constructor.

application/controllers/api/v1/codex/Bisio.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bisio extends APIv1_Controller
+class Bisio extends API_Controller
 {
 	/**
 	 * Bisio API constructor.

application/controllers/api/v1/codex/Bisorgform.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bisorgform extends APIv1_Controller
+class Bisorgform extends API_Controller
 {
 	/**
 	 * Bisorgform API constructor.

application/controllers/api/v1/codex/Bisverwendung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bisverwendung extends APIv1_Controller
+class Bisverwendung extends API_Controller
 {
 	/**
 	 * Bisverwendung API constructor.

application/controllers/api/v1/codex/Bundesland.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bundesland extends APIv1_Controller
+class Bundesland extends API_Controller
 {
 	/**
 	 * Course API constructor.

application/controllers/api/v1/codex/Entwicklungsteam.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Entwicklungsteam extends APIv1_Controller
+class Entwicklungsteam extends API_Controller
 {
 	/**
 	 * Entwicklungsteam API constructor.

application/controllers/api/v1/codex/Gemeinde.php

@@ -14,7 +14,7 @@
 
 if (!defined("BASEPATH")) exit("No direct script access allowed");
 
-class Gemeinde extends APIv1_Controller
+class Gemeinde extends API_Controller
 {
 	/**
 	 * Gemeinde API constructor.

application/controllers/api/v1/codex/Hauptberuf.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Hauptberuf extends APIv1_Controller
+class Hauptberuf extends API_Controller
 {
 	/**
 	 * Hauptberuf API constructor.

application/controllers/api/v1/codex/Lehrform.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Lehrform extends APIv1_Controller
+class Lehrform extends API_Controller
 {
 	/**
 	 * Lehrform API constructor.

application/controllers/api/v1/codex/Lgartcode.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Lgartcode extends APIv1_Controller
+class Lgartcode extends API_Controller
 {
 	/**
 	 * Lgartcode API constructor.

application/controllers/api/v1/codex/Mobilitaetsprogramm.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Mobilitaetsprogramm extends APIv1_Controller
+class Mobilitaetsprogramm extends API_Controller
 {
 	/**
 	 * Mobilitaetsprogramm API constructor.

application/controllers/api/v1/codex/Nation.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Nation extends APIv1_Controller
+class Nation extends API_Controller
 {
 	/**
 	 * Course API constructor.

application/controllers/api/v1/codex/Note.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Note extends APIv1_Controller
+class Note extends API_Controller
 {
 	/**
 	 * Note API constructor.

application/controllers/api/v1/codex/Orgform.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Orgform extends APIv1_Controller
+class Orgform extends API_Controller
 {
 	/**
 	 * Orgform API constructor.

application/controllers/api/v1/codex/Verwendung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Verwendung extends APIv1_Controller
+class Verwendung extends API_Controller
 {
 	/**
 	 * Verwendung API constructor.

application/controllers/api/v1/codex/Zgv.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zgv extends APIv1_Controller
+class Zgv extends API_Controller
 {
 	/**
 	 * Zgv API constructor.

application/controllers/api/v1/codex/Zgvdoktor.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zgvdoktor extends APIv1_Controller
+class Zgvdoktor extends API_Controller
 {
 	/**
 	 * Zgvdoktor API constructor.

application/controllers/api/v1/codex/Zgvgruppe.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zgvgruppe extends APIv1_Controller
+class Zgvgruppe extends API_Controller
 {
 	/**
 	 * Zgvgruppe API constructor.

application/controllers/api/v1/codex/Zgvmaster.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zgvmaster extends APIv1_Controller
+class Zgvmaster extends API_Controller
 {
 	/**
 	 * Zgvmaster API constructor.

application/controllers/api/v1/codex/Zweck.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Zweck extends APIv1_Controller
+class Zweck extends API_Controller
 {
 	/**
 	 * Zweck API constructor.

application/controllers/api/v1/content/Ampel.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Ampel extends APIv1_Controller
+class Ampel extends API_Controller
 {
 	/**
 	 * Ampel API constructor.

application/controllers/api/v1/content/Content.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Content extends APIv1_Controller
+class Content extends API_Controller
 {
 	/**
 	 * Content API constructor.

application/controllers/api/v1/content/Contentchild.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Contentchild extends APIv1_Controller
+class Contentchild extends API_Controller
 {
 	/**
 	 * Contentchild API constructor.

application/controllers/api/v1/content/Contentgruppe.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Contentgruppe extends APIv1_Controller
+class Contentgruppe extends API_Controller
 {
 	/**
 	 * Contentgruppe API constructor.

application/controllers/api/v1/content/Contentlog.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Contentlog extends APIv1_Controller
+class Contentlog extends API_Controller
 {
 	/**
 	 * Contentlog API constructor.

application/controllers/api/v1/content/Contentsprache.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Contentsprache extends APIv1_Controller
+class Contentsprache extends API_Controller
 {
 	/**
 	 * Contentsprache API constructor.

application/controllers/api/v1/content/Dms.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Dms extends APIv1_Controller
+class Dms extends API_Controller
 {
 	/**
 	 *

application/controllers/api/v1/content/Infoscreen.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Infoscreen extends APIv1_Controller
+class Infoscreen extends API_Controller
 {
 	/**
 	 * Infoscreen API constructor.

application/controllers/api/v1/content/News.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class News extends APIv1_Controller
+class News extends API_Controller
 {
 	/**
 	 * News API constructor.

application/controllers/api/v1/content/Template.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Template extends APIv1_Controller
+class Template extends API_Controller
 {
 	/**
 	 * Template API constructor.

application/controllers/api/v1/content/Veranstaltung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Veranstaltung extends APIv1_Controller
+class Veranstaltung extends API_Controller
 {
 	/**
 	 * Veranstaltung API constructor.

application/controllers/api/v1/content/Veranstaltungskategorie.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Veranstaltungskategorie extends APIv1_Controller
+class Veranstaltungskategorie extends API_Controller
 {
 	/**
 	 * Veranstaltungskategorie API constructor.

application/controllers/api/v1/crm/Akte.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Akte extends APIv1_Controller
+class Akte extends API_Controller
 {
 	/**
 	 * Akte API constructor.

application/controllers/api/v1/crm/Aufnahmeschluessel.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Aufnahmeschluessel extends APIv1_Controller
+class Aufnahmeschluessel extends API_Controller
 {
 	/**
 	 * Aufnahmeschluessel API constructor.

application/controllers/api/v1/crm/Aufnahmetermin.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Aufnahmetermin extends APIv1_Controller
+class Aufnahmetermin extends API_Controller
 {
 	/**
 	 * Aufnahmetermin API constructor.

application/controllers/api/v1/crm/Aufnahmetermintyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Aufnahmetermintyp extends APIv1_Controller
+class Aufnahmetermintyp extends API_Controller
 {
 	/**
 	 * Aufnahmetermintyp API constructor.

application/controllers/api/v1/crm/Bewerbungstermine.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Bewerbungstermine extends APIv1_Controller
+class Bewerbungstermine extends API_Controller
 {
 	/**
 	 * Bewerbungstermine API constructor.

application/controllers/api/v1/crm/Buchungstyp.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Buchungstyp extends APIv1_Controller
+class Buchungstyp extends API_Controller
 {
 	/**
 	 * Buchungstyp API constructor.

application/controllers/api/v1/crm/Dokument.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Dokument extends APIv1_Controller
+class Dokument extends API_Controller
 {
 	/**
 	 * Dokument API constructor.

application/controllers/api/v1/crm/Dokumentprestudent.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Dokumentprestudent extends APIv1_Controller
+class Dokumentprestudent extends API_Controller
 {
 	/**
 	 * Dokumentprestudent API constructor.

application/controllers/api/v1/crm/Dokumentstudiengang.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Dokumentstudiengang extends APIv1_Controller
+class Dokumentstudiengang extends API_Controller
 {
 	/**
 	 * Dokumentstudiengang API constructor.

application/controllers/api/v1/crm/Konto.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Konto extends APIv1_Controller
+class Konto extends API_Controller
 {
 	/**
 	 * Konto API constructor.

application/controllers/api/v1/crm/Preincoming.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Preincoming extends APIv1_Controller
+class Preincoming extends API_Controller
 {
 	/**
 	 * Preincoming API constructor.

application/controllers/api/v1/crm/Preinteressent.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Preinteressent extends APIv1_Controller
+class Preinteressent extends API_Controller
 {
 	/**
 	 * Person API constructor.

application/controllers/api/v1/crm/Preinteressentstudiengang.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Preinteressentstudiengang extends APIv1_Controller
+class Preinteressentstudiengang extends API_Controller
 {
 	/**
 	 * Preinteressentstudiengang API constructor.

application/controllers/api/v1/crm/Preoutgoing.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Preoutgoing extends APIv1_Controller
+class Preoutgoing extends API_Controller
 {
 	/**
 	 * Preoutgoing API constructor.

application/controllers/api/v1/crm/Prestudent.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Prestudent extends APIv1_Controller
+class Prestudent extends API_Controller
 {
 	/**
 	 * Prestudent API constructor.

application/controllers/api/v1/crm/Prestudentstatus.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Prestudentstatus extends APIv1_Controller
+class Prestudentstatus extends API_Controller
 {
 	/**
 	 * Prestudentstatus API constructor.

application/controllers/api/v1/crm/Reihungstest.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Reihungstest extends APIv1_Controller
+class Reihungstest extends API_Controller
 {
 	/**
 	 * Reihungstest API constructor.

application/controllers/api/v1/crm/RtPerson.php

@@ -14,7 +14,7 @@
 
 if (!defined("BASEPATH")) exit("No direct script access allowed");
 
-class RtPerson extends APIv1_Controller
+class RtPerson extends API_Controller
 {
 	/**
 	 * Status API constructor.

application/controllers/api/v1/crm/Status.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Status extends APIv1_Controller
+class Status extends API_Controller
 {
 	/**
 	 * Status API constructor.

application/controllers/api/v1/crm/Statusgrund.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Statusgrund extends APIv1_Controller
+class Statusgrund extends API_Controller
 {
 	/**
 	 * Status API constructor.

application/controllers/api/v1/crm/Student.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Student extends APIv1_Controller
+class Student extends API_Controller
 {
 	/**
 	 * Student API constructor.

application/controllers/api/v1/education/Abgabe.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Abgabe extends APIv1_Controller
+class Abgabe extends API_Controller
 {
 	/**
 	 * Abgabe API constructor.

application/controllers/api/v1/education/Abschlussbeurteilung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Abschlussbeurteilung extends APIv1_Controller
+class Abschlussbeurteilung extends API_Controller
 {
 	/**
 	 * Abschlussbeurteilung API constructor.

application/controllers/api/v1/education/Abschlusspruefung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Abschlusspruefung extends APIv1_Controller
+class Abschlusspruefung extends API_Controller
 {
 	/**
 	 * Abschlusspruefung API constructor.

application/controllers/api/v1/education/Anrechnung.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Anrechnung extends APIv1_Controller
+class Anrechnung extends API_Controller
 {
 	/**
 	 * Anrechnung API constructor.

application/controllers/api/v1/education/Anwesenheit.php

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Anwesenheit extends APIv1_Controller
+class Anwesenheit extends API_Controller
 {
 	/**
 	 * Anwesenheit API constructor.