Merge branch 'master' into dbskel

.gitignore

@@ -24,7 +24,6 @@ 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": "^1.3.0",
+    "grunt": "^0.4.5",
     "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.info/)
+* [Wiki](https://wiki.fhcomplete.org/)
 * [Changelog](CHANGELOG.md)

application/components/filters/LogsViewer.php

@@ -1,19 +0,0 @@
-<?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/anrechnung.php

@@ -1,23 +0,0 @@
-<?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,6 +57,14 @@ 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/dbskel.php

@@ -0,0 +1,28 @@
+<?php
+
+if (!defined('BASEPATH')) exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable DBSkel procedure
+|--------------------------------------------------------------------------
+|
+| DBSkel is disabled by default for security reasons.
+| You should enable DBSkel whenever you intend to use DBSkel
+|
+*/
+$config['dbskel_enabled'] = false;
+
+/*
+|--------------------------------------------------------------------------
+| DBSkel mode
+|--------------------------------------------------------------------------
+|
+| This is used to set the dbskel mode:
+|	- dryrun: run without changing the database, useful for testing
+|	- new: build a new database or if database is already present creates only new objects
+|	- diff: like new, but it also remove object from database that are NOT present in configuration files
+|
+*/
+$config['dbskel_mode'] = 'dryrun';
+

application/config/infocenter.php

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

application/config/ldap.php

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

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,14 +23,6 @@ $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'
 				)
 			)
 		),
@@ -40,7 +32,7 @@ $config['navigation_header'] = array(
 			'description' => 'Lehre',
 			'sort' => 30,
 			'requiredPermissions' => 'basis/vilesci:r',
-			'children' => array(
+			'children'=> array(
 				'cis' => array(
 					'link' => CIS_ROOT,
 					'icon' => '',
@@ -70,25 +62,6 @@ $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'
-					)
 				)
 			)
 		),
@@ -98,7 +71,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' => '',
@@ -112,27 +85,6 @@ $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'
 				)
 			)
 		),
@@ -143,7 +95,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',
@@ -164,14 +116,7 @@ $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'
-                )
+				)
 			)
 		)
 	)
@@ -191,15 +136,6 @@ $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'),
@@ -224,8 +160,7 @@ $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' => '',
@@ -247,7 +182,6 @@ $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'),
@@ -255,8 +189,7 @@ $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' => '',
@@ -278,15 +211,3 @@ $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' => 'cogs',
-		'sort' => 100,
-		'target' => '_blank',
-		'requiredPermissions' => array('admin:rw')
-	)
-);
-

application/config/routes.php

@@ -60,26 +60,3 @@ $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/udfmasterschema.json

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

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 API_Controller
+		// NOTE: loaded here because it does not extend the APIv1_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 API_Controller
+class Aufteilung extends APIv1_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 API_Controller
+class Bestelldetail extends APIv1_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 API_Controller
+class Bestelldetailtag extends APIv1_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 API_Controller
+class Bestellstatus extends APIv1_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 API_Controller
+class Bestellung extends APIv1_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 API_Controller
+class Bestellungtag extends APIv1_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 API_Controller
+class Buchung extends APIv1_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 API_Controller
+class Buchungstyp extends APIv1_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 API_Controller
+class Budget extends APIv1_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 API_Controller
+class Konto extends APIv1_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 API_Controller
+class Kostenstelle extends APIv1_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 API_Controller
+class Rechnung extends APIv1_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 API_Controller
+class Rechnungsbetrag extends APIv1_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 API_Controller
+class Rechnungstyp extends APIv1_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 API_Controller
+class Vertrag extends APIv1_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 API_Controller
+class Vertragsstatus extends APIv1_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 API_Controller
+class Vertragstyp extends APIv1_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 API_Controller
+class Zahlungstyp extends APIv1_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 API_Controller
+class Akadgrad extends APIv1_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 API_Controller
+class Archiv extends APIv1_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 API_Controller
+class Aufmerksamdurch extends APIv1_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 API_Controller
+class Ausbildung extends APIv1_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 API_Controller
+class Berufstaetigkeit extends APIv1_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 API_Controller
+class Beschaeftigungsausmass extends APIv1_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 API_Controller
+class Besqual extends APIv1_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 API_Controller
+class Bisfunktion extends APIv1_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 API_Controller
+class Bisio extends APIv1_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 API_Controller
+class Bisorgform extends APIv1_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 API_Controller
+class Bisverwendung extends APIv1_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 API_Controller
+class Bundesland extends APIv1_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 API_Controller
+class Entwicklungsteam extends APIv1_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 API_Controller
+class Gemeinde extends APIv1_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 API_Controller
+class Hauptberuf extends APIv1_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 API_Controller
+class Lehrform extends APIv1_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 API_Controller
+class Lgartcode extends APIv1_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 API_Controller
+class Mobilitaetsprogramm extends APIv1_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 API_Controller
+class Nation extends APIv1_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 API_Controller
+class Note extends APIv1_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 API_Controller
+class Orgform extends APIv1_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 API_Controller
+class Verwendung extends APIv1_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 API_Controller
+class Zgv extends APIv1_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 API_Controller
+class Zgvdoktor extends APIv1_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 API_Controller
+class Zgvgruppe extends APIv1_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 API_Controller
+class Zgvmaster extends APIv1_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 API_Controller
+class Zweck extends APIv1_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 API_Controller
+class Ampel extends APIv1_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 API_Controller
+class Content extends APIv1_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 API_Controller
+class Contentchild extends APIv1_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 API_Controller
+class Contentgruppe extends APIv1_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 API_Controller
+class Contentlog extends APIv1_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 API_Controller
+class Contentsprache extends APIv1_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 API_Controller
+class Dms extends APIv1_Controller
 {
 	/**
 	 *

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

@@ -14,7 +14,7 @@
 
 if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-class Infoscreen extends API_Controller
+class Infoscreen extends APIv1_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 API_Controller
+class News extends APIv1_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 API_Controller
+class Template extends APIv1_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 API_Controller
+class Veranstaltung extends APIv1_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 API_Controller
+class Veranstaltungskategorie extends APIv1_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 API_Controller
+class Akte extends APIv1_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 API_Controller
+class Aufnahmeschluessel extends APIv1_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 API_Controller
+class Aufnahmetermin extends APIv1_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 API_Controller
+class Aufnahmetermintyp extends APIv1_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 API_Controller
+class Bewerbungstermine extends APIv1_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 API_Controller
+class Buchungstyp extends APIv1_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 API_Controller
+class Dokument extends APIv1_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 API_Controller
+class Dokumentprestudent extends APIv1_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 API_Controller
+class Dokumentstudiengang extends APIv1_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 API_Controller
+class Konto extends APIv1_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 API_Controller
+class Preincoming extends APIv1_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 API_Controller
+class Preinteressent extends APIv1_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 API_Controller
+class Preinteressentstudiengang extends APIv1_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 API_Controller
+class Preoutgoing extends APIv1_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 API_Controller
+class Prestudent extends APIv1_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 API_Controller
+class Prestudentstatus extends APIv1_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 API_Controller
+class Reihungstest extends APIv1_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 API_Controller
+class RtPerson extends APIv1_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 API_Controller
+class Status extends APIv1_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 API_Controller
+class Statusgrund extends APIv1_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 API_Controller
+class Student extends APIv1_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 API_Controller
+class Abgabe extends APIv1_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 API_Controller
+class Abschlussbeurteilung extends APIv1_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 API_Controller
+class Abschlusspruefung extends APIv1_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 API_Controller
+class Anrechnung extends APIv1_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 API_Controller
+class Anwesenheit extends APIv1_Controller
 {
 	/**
 	 * Anwesenheit API constructor.

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

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

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

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

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

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

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

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