ZeiterfassungCSVValidierungBeiNegativerPause

application/config/constants.php

@@ -10,26 +10,26 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 | Used to indicate the conditions under which the script is exit()ing.
 |
 */
-define('EXIT_SUCCESS',				0); // no errors
-define('EXIT_ERROR',				1); // generic error
-define('EXIT_MODEL',				2); // model error
-define('EXIT_CONFIG',				3); // configuration error
-define('EXIT_UNKNOWN_FILE',			4); // file not found
-define('EXIT_UNKNOWN_CLASS',			5); // unknown class
-define('EXIT_UNKNOWN_METHOD',			6); // unknown class method
-define('EXIT_USER_INPUT',			7); // invalid user input
-define('EXIT_DATABASE',				8); // database error
-define('EXIT_VALIDATION_UDF',			10); // UDF validation has been failed
+define('EXIT_SUCCESS',						0); // no errors
+define('EXIT_ERROR',						1); // generic error
+define('EXIT_MODEL',						2); // model error
+define('EXIT_CONFIG',						3); // configuration error
+define('EXIT_UNKNOWN_FILE',					4); // file not found
+define('EXIT_UNKNOWN_CLASS',				5); // unknown class
+define('EXIT_UNKNOWN_METHOD',				6); // unknown class method
+define('EXIT_USER_INPUT',					7); // invalid user input
+define('EXIT_DATABASE',						8); // database error
+define('EXIT_VALIDATION_UDF',				10); // UDF validation has been failed
 define('EXIT_VALIDATION_UDF_MIN_VALUE',		11); // UDF validation has been failed -> MIN VALUE
 define('EXIT_VALIDATION_UDF_MAX_VALUE',		12); // UDF validation has been failed -> MAX VALUE
 define('EXIT_VALIDATION_UDF_MIN_LENGTH',	13); // UDF validation has been failed -> MIN LENGTH
 define('EXIT_VALIDATION_UDF_MAX_LENGTH',	14); // UDF validation has been failed -> MAX LENGTH
-define('EXIT_VALIDATION_UDF_REGEX',		15); // UDF validation has been failed -> REGEX
+define('EXIT_VALIDATION_UDF_REGEX',			15); // UDF validation has been failed -> REGEX
 define('EXIT_VALIDATION_UDF_REQUIRED',		16); // UDF validation has been failed -> REQUIRED
 define('EXIT_VALIDATION_UDF_NOT_VALID_VAL',	17); // UDF validation has been failed -> Not valid value, object or array
 
-define('EXIT_AUTO_MIN',				1000); // lowest automatically-assigned error code
-define('EXIT_AUTO_MAX',				2000); // highest automatically-assigned error code
+define('EXIT_AUTO_MIN',						1000); // lowest automatically-assigned error code
+define('EXIT_AUTO_MAX',						2000); // highest automatically-assigned error code
 
 /*
 |--------------------------------------------------------------------------
@@ -45,7 +45,7 @@ define('BEGINNING_OF_TIME',					'1970-01-01');
 */
 // Foreign authentication methods
 define('AUTH_HBALDAP',	'httpBasicAuthLDAP');
-define('AUTH_BT',	'bewerbung');
+define('AUTH_BT',		'bewerbung');
 
 // Login methods
 define('AUTH_LDAP',	'ldap');
@@ -53,7 +53,7 @@ define('AUTH_DB',	'database');
 define('AUTH_SSO',	'sso');
 
 // Authentication return codes
-define('AUTH_SUCCESS',			0);
+define('AUTH_SUCCESS',				0);
 define('AUTH_NOT_AUTHENTICATED',	1);
 define('AUTH_INVALID_CREDENTIALS',	2);
 
@@ -112,7 +112,7 @@ define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
 | of this setting
 |
 */
-define('SHOW_DEBUG_BACKTRACE', true);
+define('SHOW_DEBUG_BACKTRACE', TRUE);
 
 /*
 |--------------------------------------------------------------------------
@@ -127,25 +127,24 @@ define('EMAIL_CONFIG_INDEX', 'mail');
 |--------------------------------------------------------------------------
 */
 // Message statuses
-define('MSG_STATUS_UNREAD',	0);
-define('MSG_STATUS_READ',	1);
+define('MSG_STATUS_UNREAD',		0);
+define('MSG_STATUS_READ',		1);
 define('MSG_STATUS_ARCHIVED',	2);
 define('MSG_STATUS_DELETED',	3);
 
 // Message priorities
-define('MSG_PRIORITY_LOW',	1);
+define('MSG_PRIORITY_LOW',		1);
 define('MSG_PRIORITY_NORMAL',	2);
-define('MSG_PRIORITY_HIGH',	3);
+define('MSG_PRIORITY_HIGH',		3);
 define('MSG_PRIORITY_URGENT',	4);
 
 // Message error status
-define('MSG_ERR_INVALID_SUBJECT',	40);
-define('MSG_ERR_INVALID_BODY',		41);
-define('MSG_ERR_INVALID_TEMPLATE',	42);
-define('MSG_ERR_INVALID_MSG_ID',	43);
-define('MSG_ERR_INVALID_STATUS_ID',	44);
-define('MSG_ERR_INVALID_SENDER',	45);
+define('MSG_ERR_INVALID_SUBJECT',		40);
+define('MSG_ERR_INVALID_BODY',			41);
+define('MSG_ERR_INVALID_TEMPLATE',		42);
+define('MSG_ERR_INVALID_MSG_ID',		43);
+define('MSG_ERR_INVALID_STATUS_ID',		44);
+define('MSG_ERR_INVALID_SENDER',		45);
 define('MSG_ERR_INVALID_RECIPIENTS',	46);
-define('MSG_ERR_INVALID_OU',		47);
-define('MSG_ERR_INVALID_TOKEN',		48);
-
+define('MSG_ERR_INVALID_OU',			47);
+define('MSG_ERR_INVALID_TOKEN',			48);

application/config/navigation.php

@@ -120,18 +120,11 @@ $config['navigation_header'] = array(
 					'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,
+					'sort' => 40,
 					'requiredPermissions' => 'lehre/gruppenmanager:r'
 				)
 			)

application/controllers/jobs/IssueResolver.php

@@ -22,33 +22,7 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
 			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
 			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
-			'CORE_INOUT_0006' => 'CORE_INOUT_0006',
-			'CORE_INOUT_0007' => 'CORE_INOUT_0007',
-			'CORE_INOUT_0008' => 'CORE_INOUT_0008',
-			'CORE_INOUT_0009' => 'CORE_INOUT_0009',
-			'CORE_STG_0001' => 'CORE_STG_0001',
-			'CORE_STG_0002' => 'CORE_STG_0002',
-			'CORE_STG_0003' => 'CORE_STG_0003',
-			'CORE_STG_0004' => 'CORE_STG_0004',
-			'CORE_STUDENTSTATUS_0001' => 'CORE_STUDENTSTATUS_0001',
-			'CORE_STUDENTSTATUS_0002' => 'CORE_STUDENTSTATUS_0002',
-			'CORE_STUDENTSTATUS_0003' => 'CORE_STUDENTSTATUS_0003',
-			'CORE_STUDENTSTATUS_0004' => 'CORE_STUDENTSTATUS_0004',
-			'CORE_STUDENTSTATUS_0005' => 'CORE_STUDENTSTATUS_0005',
-			'CORE_STUDENTSTATUS_0006' => 'CORE_STUDENTSTATUS_0006',
-			'CORE_STUDENTSTATUS_0007' => 'CORE_STUDENTSTATUS_0007',
-			'CORE_STUDENTSTATUS_0008' => 'CORE_STUDENTSTATUS_0008',
-			'CORE_STUDENTSTATUS_0009' => 'CORE_STUDENTSTATUS_0009',
-			'CORE_STUDENTSTATUS_0010' => 'CORE_STUDENTSTATUS_0010',
-			'CORE_STUDENTSTATUS_0011' => 'CORE_STUDENTSTATUS_0011',
-			'CORE_STUDENTSTATUS_0012' => 'CORE_STUDENTSTATUS_0012',
-			'CORE_STUDENTSTATUS_0013' => 'CORE_STUDENTSTATUS_0013',
-			'CORE_STUDENTSTATUS_0014' => 'CORE_STUDENTSTATUS_0014',
-			'CORE_STUDENTSTATUS_0015' => 'CORE_STUDENTSTATUS_0015',
-			'CORE_PERSON_0001' => 'CORE_PERSON_0001',
-			'CORE_PERSON_0002' => 'CORE_PERSON_0002',
-			'CORE_PERSON_0003' => 'CORE_PERSON_0003',
-			'CORE_PERSON_0004' => 'CORE_PERSON_0004'
+			'CORE_INOUT_0006' => 'CORE_INOUT_0006'
 		);
 	}
 }

application/controllers/jobs/PlausiIssueProducer.php

@@ -1,62 +0,0 @@
-<?php
-
-/**
- * Job for producing Plausicheck issues
- */
-class PlausiIssueProducer extends JOB_Controller
-{
-	public function __construct()
-	{
-		parent::__construct();
-
-		$this->load->library('issues/PlausicheckProducerLib');
-		$this->load->library('IssuesLib');
-	}
-
-	/**
-	 * Runs issue production job.
-	 * @param studiensemester_kurzbz string job is run for students of a certain semester.
-	 * @param studiengang_kz int job is run for students of certain Studiengang.
-	 */
-	public function run($studiensemester_kurzbz = null, $studiengang_kz = null)
-	{
-		$fehlerKurzbz = $this->plausicheckproducerlib->getFehlerKurzbz();
-
-		$this->logInfo("Plausicheck issue producer job started");
-
-		// get the data returned by Plausicheck
-		foreach ($fehlerKurzbz as $fehler_kurzbz)
-		{
-			// execute the check
-			$this->logInfo("Checking " . $fehler_kurzbz . "...");
-			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz);
-
-			if (isError($plausicheckRes)) $this->logError(getError($plausicheckRes));
-
-			if (hasData($plausicheckRes))
-			{
-				$plausicheckData = getData($plausicheckRes);
-
-				foreach ($plausicheckData as $plausiData)
-				{
-					// get the data needed for issue production
-					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
-					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
-					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
-					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
-
-					// write the issue
-					$addIssueRes = $this->issueslib->addFhcIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $fehlertext_params, $resolution_params);
-
-					// log if error, or log info if inserted new issue
-					if (isError($addIssueRes))
-						$this->logError(getError($addIssueRes));
-					elseif (hasData($addIssueRes) && is_integer(getData($addIssueRes)))
-						$this->logInfo("Plausicheck issue " . $fehler_kurzbz . " successfully produced, person_id: " . $person_id);
-				}
-			}
-		}
-
-		$this->logInfo("Plausicheck issue producer job stopped");
-	}
-}

application/controllers/jobs/ReihungstestJob.php

@@ -1,32 +1,8 @@
 <?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');
 
-use \stdClass as stdClass;
-use \DateTime as DateTime;
-use \DB_Model as DB_Model;
-
 class ReihungstestJob extends JOB_Controller
 {
-	// OE used to as sender for the test deadline reminder
-	const OU_SENDER_TEST_REMINDER = 'infocenter';
-
 	/**
 	 * Constructor
 	 */
@@ -45,9 +21,6 @@ class ReihungstestJob extends JOB_Controller
 
 		// Load helpers
 		$this->load->helper('hlp_sancho_helper');
-
-		// Loads CLMessagesModel
-		$this->load->model('CL/Messages_model', 'CLMessagesModel');
 	}
 
 	/**
@@ -91,8 +64,7 @@ class ReihungstestJob extends JOB_Controller
 				'ReihungstestJob',
 				$content_data_arr,
 				MAIL_INFOCENTER,
-				'Support für die Reihungstest-Verwaltung'
-			);
+				'Support für die Reihungstest-Verwaltung');
 		}
 	}
 
@@ -141,8 +113,6 @@ class ReihungstestJob extends JOB_Controller
 
 		foreach ($reachedRegistration_rt_arr as $reihungstest)
 		{
-			$reihungstestDatum = date_format(date_create($reihungstest->datum), 'd.m.Y');
-
 			$applicants = $this->ReihungstestModel->getApplicantsOfPlacementTestForCronjob($reihungstest->reihungstest_id);
 
 			if (hasData($applicants))
@@ -183,22 +153,14 @@ class ReihungstestJob extends JOB_Controller
 				}
 				if ($applicantCounter == 0)
 				{
-					$mailcontent = '<p style="font-family: verdana, sans-serif;">Der Anmeldeschluss für den zentralen Reihungstest am ' .
-						$reihungstestDatum . ' um ' . $reihungstest->uhrzeit . ' Uhr wurde gestern erreicht.</p>';
-
-					$mailcontent .= '<p style="font-family: verdana, sans-serif;"><b>Für den Studiengang '.
-						$studiengang_kuerzel.
-						' nehmen keine InteressentInnen an diesem Reihungstest teil</b></p>';
+					$mailcontent = '<p style="font-family: verdana, sans-serif;">Der Anmeldeschluss für den zentralen Reihungstest am ' . date_format(date_create($reihungstest->datum), 'd.m.Y') . ' um ' . $reihungstest->uhrzeit . ' Uhr wurde gestern erreicht.</p>';
+					$mailcontent .= '<p style="font-family: verdana, sans-serif;"><b>Für den Studiengang '.$studiengang_kuerzel.' nehmen keine InteressentInnen an diesem Reihungstest teil</b></p>';
 				}
 				else
 				{
-					$mailcontent = '<p style="font-family: verdana, sans-serif;">Der Anmeldeschluss für den zentralen Reihungstest am ' .
-						$reihungstestDatum .
-						' um ' . $reihungstest->uhrzeit . ' Uhr wurde gestern erreicht.</p>';
-
+					$mailcontent = '<p style="font-family: verdana, sans-serif;">Der Anmeldeschluss für den zentralen Reihungstest am ' . date_format(date_create($reihungstest->datum), 'd.m.Y') . ' um ' . $reihungstest->uhrzeit . ' Uhr wurde gestern erreicht.</p>';
 					$mailcontent .= '
-					<p style="font-family: verdana, sans-serif;"><b>' . $applicantCounter . '</b> InteressentIn(nen) des Studiengangs ' .
-					$studiengang_kuerzel . ' nehmen daran teil:</p>
+					<p style="font-family: verdana, sans-serif;"><b>' . $applicantCounter . '</b> InteressentIn(nen) des Studiengangs ' . $studiengang_kuerzel . ' nehmen daran teil:</p>
 					<p style="font-family: verdana, sans-serif;">
 						<a href="'.APP_ROOT.'vilesci/stammdaten/auswertung_fhtw.php?reihungstest='.$reihungstest->reihungstest_id.'&studiengang='.$bachelorStudiengang->studiengang_kz.'" target="_blank">
 							Liste der Anmeldungen
@@ -214,13 +176,12 @@ class ReihungstestJob extends JOB_Controller
 						'Sancho_ReihungstestteilnehmerJob',
 						$mailcontent_data_arr,
 						$bachelorStudiengang->email,
-						'Anmeldeschluss Reihungstest ' . $reihungstestDatum . ' ' . $reihungstest->uhrzeit . ' Uhr',
+						'Anmeldeschluss Reihungstest ' . date_format(date_create($reihungstest->datum), 'd.m.Y') . ' ' . $reihungstest->uhrzeit . ' Uhr',
 						'sancho_header_min_bw.jpg',
 						'sancho_footer_min_bw.jpg',
 						$from,
 						'',
-						$bcc
-					);
+						$bcc);
 				}
 			}
 		}
@@ -268,6 +229,7 @@ class ReihungstestJob extends JOB_Controller
 		}
 
 		$studiengang = '';
+		$mailReceipients = ''; // String with all mailadresses
 		$mailcontent_data_arr = array();
 		$headerstyle = 'style="background: #DCE4EF; border: 1px solid #FFF; padding: 4px; text-align: left;"';
 		$rowstyle = 'style="background-color: #EEEEEE; padding: 4px;"';
@@ -286,10 +248,10 @@ class ReihungstestJob extends JOB_Controller
 						$mailcontent .= $applicants_list;
 						$mailcontent .= '</tbody></table>';
 						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
-							<a href="'.APP_ROOT.'vilesci/stammdaten/auswertung_fhtw.php?reihungstest='.$applicant->reihungstest_id.'&studiengang='.$studiengang.'" target="_blank">
-								Liste der Anmeldungen
-							</a>
-						</p>';
+											<a href="'.APP_ROOT.'vilesci/stammdaten/auswertung_fhtw.php?reihungstest='.$applicant->reihungstest_id.'&studiengang='.$studiengang.'" target="_blank">
+												Liste der Anmeldungen
+											</a>
+										</p>';
 						$mailcontent_data_arr['table'] = $mailcontent;
 						sendSanchoMail(
 							'Sancho_ReihungstestteilnehmerJob',
@@ -300,15 +262,12 @@ class ReihungstestJob extends JOB_Controller
 							'sancho_footer_min_bw.jpg',
 							$from,
 							'',
-							$bcc
-						);
+							$bcc);
 						$applicants_list = '';
 						$mailcontent_data_arr = array();
 					}
 
-					$mailcontent = '<p style="font-family: verdana, sans-serif;">
-						Folgende InteressentInnen wurden <b>nach</b> der Anmeldefrist zu einem Reihungstest hinzugefügt.<br>Details siehe Link
-					</p>';
+					$mailcontent = '<p style="font-family: verdana, sans-serif;">Folgende InteressentInnen wurden <b>nach</b> der Anmeldefrist zu einem Reihungstest hinzugefügt.<br>Details siehe Link</p>';
 					$mailcontent .= '
 					<table width="100%" style="cellpadding: 3px; font-family: verdana, sans-serif; border: 1px solid #000000;">
 						<thead>
@@ -324,6 +283,7 @@ class ReihungstestJob extends JOB_Controller
 				}
 
 				$studiengang = $applicant->studiengang_kz;
+				$mailReceipients .= $applicant->email . ';';
 				$applicants_list .= '
 						<tr ' . $rowstyle . '>
 						<td>' . date_format(date_create($applicant->datum), 'd.m.Y') . '</td>
@@ -339,10 +299,10 @@ class ReihungstestJob extends JOB_Controller
 			$mailcontent .= $applicants_list;
 			$mailcontent .= '</tbody></table>';
 			$mailcontent .= '<p style="font-family: verdana, sans-serif;">
-				<a href="'.APP_ROOT.'vilesci/stammdaten/auswertung_fhtw.php?reihungstest='.$applicant->reihungstest_id.'&studiengang='.$studiengang.'" target="_blank">
-					Liste der Anmeldungen
-				</a>
-			</p>';
+								<a href="'.APP_ROOT.'vilesci/stammdaten/auswertung_fhtw.php?reihungstest='.$applicant->reihungstest_id.'&studiengang='.$studiengang.'" target="_blank">
+									Liste der Anmeldungen
+								</a>
+							</p>';
 			$mailcontent_data_arr['table'] = $mailcontent;
 			sendSanchoMail(
 				'Sancho_ReihungstestteilnehmerJob',
@@ -353,8 +313,7 @@ class ReihungstestJob extends JOB_Controller
 				'sancho_footer_min_bw.jpg',
 				$from,
 				'',
-				$bcc
-			);
+				$bcc);
 		}
 	}
 
@@ -387,7 +346,6 @@ class ReihungstestJob extends JOB_Controller
 
 		// Get placement tests with testdate within the next 2 weeks
 		$resultNextTestDates = $this->ReihungstestModel->getNextPlacementtests($degreeProgram, 14);
-
 		if (hasData($resultNextTestDates))
 		{
 			$nextTestDates = $resultNextTestDates->retval;
@@ -399,8 +357,7 @@ class ReihungstestJob extends JOB_Controller
 				$testsOndate = array();
 
 				// Deduct days till 2 working days are reached
-				// NOTE: the condition is to avoid a never ending loop
-				for ($i = 1; $workingdays < 10; $i++)
+				for ($i = 1; ; $i++)
 				{
 					if (isDateWorkingDay($testDates->datum, $i) === true)
 					{
@@ -436,8 +393,7 @@ class ReihungstestJob extends JOB_Controller
 				{
 					foreach ($testsOndate as $reihungstest)
 					{
-						// Loads applicants of a test with prestudent ID
-						$applicants_arr = '';
+						// Loads applicants of a test
 						$applicants = $this->ReihungstestModel->getApplicantsOfPlacementTest($reihungstest->reihungstest_id);
 
 						if (hasData($applicants))
@@ -449,35 +405,34 @@ class ReihungstestJob extends JOB_Controller
 							show_error(getError($applicants));
 						}
 
-						if (!empty($applicants_arr))
+						foreach ($applicants_arr as $applicant)
 						{
-							foreach ($applicants_arr as $applicant)
+							$mailcontent_data_arr = array();
+							$mailcontent_data_arr['anrede'] = $applicant->anrede;
+							$mailcontent_data_arr['nachname'] = $applicant->nachname;
+							$mailcontent_data_arr['vorname'] = $applicant->vorname;
+							$mailcontent_data_arr['rt_datum'] = date_format(date_create($reihungstest->datum), 'd.m.Y');
+							$mailcontent_data_arr['rt_uhrzeit'] = date_format(date_create($reihungstest->uhrzeit), 'H:i');
+							$mailcontent_data_arr['rt_raum'] = $applicant->planbezeichnung;
+							if ($applicant->lageplan == '')
 							{
-								$mailcontent_data_arr = array();
-								$mailcontent_data_arr['anrede'] = $applicant->anrede;
-								$mailcontent_data_arr['nachname'] = $applicant->nachname;
-								$mailcontent_data_arr['vorname'] = $applicant->vorname;
-								$mailcontent_data_arr['rt_datum'] = date_format(date_create($reihungstest->datum), 'd.m.Y');
-								$mailcontent_data_arr['rt_uhrzeit'] = date_format(date_create($reihungstest->uhrzeit), 'H:i');
-								$mailcontent_data_arr['rt_raum'] = $applicant->planbezeichnung;
-								if ($applicant->lageplan == '')
-								{
-									$mailcontent_data_arr['wegbeschreibung'] = 'Für diesen Raum liegt noch keine Wegbeschreibung vor.
-										<br><br>No directions were found for this room';
-								}
-								else
-								{
-									$mailcontent_data_arr['wegbeschreibung'] = $applicant->lageplan;
-								}
-
-								$this->CLMessagesModel->sendExplicitTemplateSenderId(
-									$this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID),
-									$applicant->prestudent_id,
-									self::OU_SENDER_TEST_REMINDER,
-									'Sancho_RemindApplicantsOfTest',
-									$mailcontent_data_arr
-								);
+								$mailcontent_data_arr['wegbeschreibung'] = 'Für diesen Raum liegt noch keine Wegbeschreibung vor.<br><br>No directions were found for this room';
 							}
+							else
+							{
+								$mailcontent_data_arr['wegbeschreibung'] = $applicant->lageplan;
+							}
+
+							sendSanchoMail(
+								'Sancho_RemindApplicantsOfTest',
+								$mailcontent_data_arr,
+								$applicant->email,
+								'Ihre Anmeldung zum Reihungstest - Reminder / Your registration for the placement test - Reminder',
+								DEFAULT_SANCHO_HEADER_IMG,
+								DEFAULT_SANCHO_FOOTER_IMG,
+								$from,
+								'',
+								$bcc);
 						}
 					}
 				}
@@ -539,7 +494,7 @@ class ReihungstestJob extends JOB_Controller
 				person_id,
 				tbl_reihungstest.studiensemester_kurzbz,
 				tbl_reihungstest.reihungstest_id,
-				(SELECT(tbl_reihungstest.datum::text || \' \' || tbl_reihungstest.uhrzeit::text)::timestamp) as reihungstest_timestamp
+				(SELECT(tbl_reihungstest.datum::text || \' \' || tbl_reihungstest.uhrzeit::text)::timestamp) AS reihungstest_timestamp
 			');
 			$this->PrestudentModel->addJoin('public.tbl_studiengang', 'studiengang_kz');
 			$this->PrestudentModel->addJoin('public.tbl_studiengangstyp', 'typ');
@@ -585,9 +540,11 @@ class ReihungstestJob extends JOB_Controller
 		}
 
 		// Sort by STG. This is important to send the mails clustered by STG to the different STG assistances.
-		usort($result_arr, function ($a, $b) {
-			if ($a->studiengang_kz == $b->studiengang_kz) return 0;
-
+		usort($result_arr, function ($a, $b)
+		{
+			if ($a->studiengang_kz == $b->studiengang_kz) {
+				return 0;
+			}
 			return ($a->studiengang_kz < $b->studiengang_kz) ? -1 : 1;
 		});
 
@@ -730,7 +687,6 @@ class ReihungstestJob extends JOB_Controller
 		}
 
 		// Set associative array with the prepared HTML tables and URL be used by the template's variables
-		$content_data_arr = array();
 		$content_data_arr['studienplan_list'] = $studienplan_list;
 		$content_data_arr['freie_plaetze_list'] = $freie_plaetze_list;
 		$content_data_arr['link'] = site_url('/organisation/Reihungstest');
@@ -753,9 +709,7 @@ class ReihungstestJob extends JOB_Controller
 			$counter++;
 		}
 
-		$content_data_arr = array();
 		$content_data_arr['link'] = $content;
-
 		return $content_data_arr;
 	}
 
@@ -854,13 +808,13 @@ class ReihungstestJob extends JOB_Controller
 			return;
 		}
 
-		$qry = "WITH prst as (
+		$qry = "WITH prst AS (
 					SELECT DISTINCT
-						get_rolle_prestudent (tbl_prestudent.prestudent_id, ?) as laststatus,
+						get_rolle_prestudent (tbl_prestudent.prestudent_id, ?) AS laststatus,
 						tbl_prestudentstatus.studiensemester_kurzbz,
-						tbl_prestudentstatus.datum as prestudenstatus_datum,
+						tbl_prestudentstatus.datum AS prestudenstatus_datum,
 						tbl_prestudent.*,
-						tbl_studiengang.typ as studiengang_typ
+						tbl_studiengang.typ AS studiengang_typ
 					FROM PUBLIC.tbl_person
 						JOIN PUBLIC.tbl_prestudent USING (person_id)
 						JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
@@ -868,26 +822,16 @@ class ReihungstestJob extends JOB_Controller
 						JOIN lehre.tbl_studienordnung USING (studienordnung_id)
 						JOIN PUBLIC.tbl_studiengang ON (tbl_studienordnung.studiengang_kz = tbl_studiengang.studiengang_kz)
 					WHERE get_rolle_prestudent (tbl_prestudent.prestudent_id, ?) IN ('Aufgenommener','Bewerber','Wartender','Abgewiesener')
-						AND studiensemester_kurzbz = ?
+						AND studiensemester_kurzbz = ? 
 						AND tbl_studiengang.typ IN ('b', 'm')
 				)
 				SELECT * FROM prst
 				WHERE prestudenstatus_datum >= (SELECT CURRENT_DATE - 1)
-				AND (
-					studiengang_typ = 'b'
-					OR
-					(
-						studiengang_typ = 'm'
-						AND
-						EXISTS (
-							SELECT 1 /* Master Studiengänge berücksichtigen wenn auch Bachelor im gleichen Semester */
-							FROM prst prstb
-							WHERE studiengang_typ = 'b'
-							AND laststatus != 'Abgewiesener'
-							AND prstb.person_id = prst.person_id
-						)
-					)
-				)
+				AND (studiengang_typ = 'b' OR (studiengang_typ = 'm' AND EXISTS (SELECT 1 /* Master Studiengänge berücksichtigen wenn auch Bachelor im gleichen Semester */
+																					FROM prst prstb
+																					WHERE studiengang_typ = 'b'
+																					AND laststatus != 'Abgewiesener'
+																					AND prstb.person_id = prst.person_id )))
 				ORDER BY studiengang_kz, laststatus";
 
 		// Encode Params
@@ -919,12 +863,12 @@ class ReihungstestJob extends JOB_Controller
 				// Alle niedrigeren Prios laden
 				$qryNiedrPrios = "
 						SELECT DISTINCT
-							get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') as laststatus,
+							get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') AS laststatus,
 							tbl_studienplan.orgform_kurzbz,
 							tbl_person.nachname,
 							tbl_person.vorname,
 							tbl_prestudent.*,
-							tbl_studiengang.typ as studiengang_typ
+							tbl_studiengang.typ AS studiengang_typ
 						FROM PUBLIC.tbl_person
 							JOIN PUBLIC.tbl_prestudent USING (person_id)
 							JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
@@ -932,10 +876,7 @@ class ReihungstestJob extends JOB_Controller
 							JOIN PUBLIC.tbl_studiengang ON (tbl_prestudent.studiengang_kz = tbl_studiengang.studiengang_kz)
 						WHERE tbl_prestudent.person_id = ".$row_ps->person_id."
 							AND tbl_prestudent.prestudent_id != ".$row_ps->prestudent_id."
-							AND get_rolle_prestudent(
-								tbl_prestudent.prestudent_id,
-								'".$row_ps->studiensemester_kurzbz."'
-							) IN ('Aufgenommener','Bewerber','Wartender')
+							AND get_rolle_prestudent (tbl_prestudent.prestudent_id, '".$row_ps->studiensemester_kurzbz."') IN ('Aufgenommener','Bewerber','Wartender')
 							AND studiensemester_kurzbz = '".$row_ps->studiensemester_kurzbz."'
 							AND tbl_studiengang.typ IN ('b', 'm')
 							AND priorisierung > ".$row_ps->priorisierung."
@@ -1078,12 +1019,12 @@ class ReihungstestJob extends JOB_Controller
 		// Mails senden
 		if (!isEmptyArray($mailArray))
 		{
-			foreach ($mailArray as $stg => $orgform)
+			foreach ($mailArray AS $stg=>$orgform)
 			{
 				$studiengang = $this->StudiengangModel->load($stg);
 				$mailcontent = '';
 
-				foreach ($orgform as $art => $value)
+				foreach ($orgform AS $art=>$value)
 				{
 					// Orgform nur dazu schreiben, wenn es mehr als Eine gibt
 					if (count($orgform) > 1)
@@ -1093,12 +1034,12 @@ class ReihungstestJob extends JOB_Controller
 					if (isset($value['AbgewiesenGesetztWartender']) && !isEmptyArray($value['AbgewiesenGesetztWartender']))
 					{
 						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
-							Folgende Personen auf der Warteliste wurden in einem höher priorisierten Studiengang aufgenommen und haben deshalb einen Status "Abgewiesen" erhalten:
-						</p>';
+									Folgende Personen auf der Warteliste wurden in einem höher priorisierten Studiengang aufgenommen und haben deshalb einen Status "Abgewiesen" erhalten:</p>';
 						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Zuvor Warteliste</th></thead>';
 						$mailcontent .= '					<tbody>';
 						sort($value['AbgewiesenGesetztWartender']);
-						foreach ($value['AbgewiesenGesetztWartender'] as $key => $bewerber)
+						foreach ($value['AbgewiesenGesetztWartender'] AS $key=>$bewerber)
 						{
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
@@ -1109,9 +1050,10 @@ class ReihungstestJob extends JOB_Controller
 						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
 									Folgende Aufgenommene wurden in einem höher priorisierten Studiengang aufgenommen:</p>';
 						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Aufgenommene</th></thead>';
 						$mailcontent .= '					<tbody>';
 						sort($value['AufnahmeHoeherePrio']);
-						foreach ($value['AufnahmeHoeherePrio'] as $key => $bewerber)
+						foreach ($value['AufnahmeHoeherePrio'] AS $key=>$bewerber)
 						{
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
@@ -1124,7 +1066,7 @@ class ReihungstestJob extends JOB_Controller
 						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
 						$mailcontent .= '					<tbody>';
 						sort($value['AbgewiesenHoeherePrio']);
-						foreach ($value['AbgewiesenHoeherePrio'] as $key => $bewerber)
+						foreach ($value['AbgewiesenHoeherePrio'] AS $key=>$bewerber)
 						{
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
@@ -1135,9 +1077,10 @@ class ReihungstestJob extends JOB_Controller
 						$mailcontent .= '<p style="font-family: verdana, sans-serif;">
 										Folgende BewerberInnen wurden zu Abgewiesenen gemacht:</p>';
 						$mailcontent .= '<table style="border-collapse: collapse; border: 1px solid grey;">';
+						//$mailcontent .= '<thead><th style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px; text-align: left">Aufgenommene</th></thead>';
 						$mailcontent .= '					<tbody>';
 						sort($value['AbgewiesenWeilBewerber']);
-						foreach ($value['AbgewiesenWeilBewerber'] as $key => $bewerber)
+						foreach ($value['AbgewiesenWeilBewerber'] AS $key => $bewerber)
 						{
 							$mailcontent .= '<tr><td style="font-family: verdana, sans-serif; border: 1px solid grey; padding: 3px">'.$bewerber.'</td></tr>';
 						}
@@ -1145,7 +1088,6 @@ class ReihungstestJob extends JOB_Controller
 					}
 				}
 
-				$mailcontent_data_arr = array();
 				$mailcontent_data_arr['table'] = $mailcontent;
 
 				// Send email in Sancho design
@@ -1160,8 +1102,7 @@ class ReihungstestJob extends JOB_Controller
 						'sancho_footer_min_bw.jpg',
 						$from,
 						'',
-						$bcc
-					);
+						$bcc);
 				}
 			}
 		}

application/controllers/system/infocenter/InfoCenter.php

@@ -109,8 +109,8 @@ class InfoCenter extends Auth_Controller
 	 * Constructor
 	 */
 	public function __construct()
-	{
-		parent::__construct(
+    {
+        parent::__construct(
 			array(
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
@@ -121,7 +121,6 @@ class InfoCenter extends Auth_Controller
 				'unlockPerson' => 'infocenter:rw',
 				'saveFormalGeprueft' => 'infocenter:rw',
 				'saveDocTyp' => 'infocenter:rw',
-				'updateStammdaten' => 'infocenter:rw',
 				'saveNachreichung' => 'infocenter:rw',
 				'getPrestudentData' => 'infocenter:r',
 				'getLastPrestudentWithZgvJson' => 'infocenter:r',
@@ -166,23 +165,18 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('crm/ZGVPruefungStatus_model', 'ZGVPruefungStatusModel');
 		$this->load->model('person/Notiz_model', 'NotizModel');
 		$this->load->model('person/Person_model', 'PersonModel');
+		$this->load->model('system/Message_model', 'MessageModel');
 		$this->load->model('system/Filters_model', 'FiltersModel');
 		$this->load->model('system/PersonLock_model', 'PersonLockModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 		$this->load->model('codex/Zgv_model', 'ZgvModel');
 		$this->load->model('codex/Zgvmaster_model', 'ZgvmasterModel');
 		$this->load->model('codex/Nation_model', 'NationModel');
-		$this->load->model('person/Kontakt_model', 'KontaktModel');
-		$this->load->model('person/Geschlecht_model', 'GeschlechtModel');
-		$this->load->model('person/adresse_model', 'AdresseModel');
-		$this->load->model('CL/Messages_model', 'CLMessagesModel');
 
 		// Loads libraries
 		$this->load->library('PersonLogLib');
 		$this->load->library('WidgetLib');
 
-		$this->load->config('infocenter');
-
 		$this->loadPhrases(
 			array(
 				'global',
@@ -199,7 +193,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->library('VariableLib', array('uid' => $this->_uid));
 
 		$this->setControllerId(); // sets the controller id
-	}
+    }
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
@@ -407,7 +401,7 @@ class InfoCenter extends Auth_Controller
 						'saveformalgep',
 						array(
 							isEmptyString($akte->retval[0]->titel) ? $akte->retval[0]->bezeichnung : $akte->retval[0]->titel,
-							is_null($timestamp) ? 'null' : $timestamp
+							is_null($timestamp) ? 'NULL' : $timestamp
 						)
 					);
 				}
@@ -608,8 +602,7 @@ class InfoCenter extends Auth_Controller
 	/**
 	 * Sendet bei einer neuen ZGV Prüfung die Mail raus an den Studiengang
 	 */
-	private function sendZgvMail($mail, $typ, $person)
-	{
+	private function sendZgvMail($mail, $typ, $person){
 		$data = array(
 			'vorname' => $person->vorname,
 			'nachname' => $person->nachname,
@@ -693,6 +686,7 @@ class InfoCenter extends Auth_Controller
 				'openZgv' => $openZgv
 			)
 		);
+
 	}
 
 	/**
@@ -866,7 +860,7 @@ class InfoCenter extends Auth_Controller
 
 		$person_id = $logdata['person_id'];
 
-		$akteresult = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'formal_geprueft_amum !=' => null));
+		$akteresult = $this->AkteModel->loadWhere(array('person_id' => $person_id, 'formal_geprueft_amum !=' => NULL));
 
 		if (hasData($lastStatus) && isSuccess($akteresult))
 		{
@@ -1085,23 +1079,8 @@ class InfoCenter extends Auth_Controller
 	 */
 	public function reloadMessages($person_id)
 	{
-		$messages = $this->CLMessagesModel->getReceivedAndSentMessages($person_id);
-
-		// If there are messages
-		if (hasData($messages))
-		{
-			$personexists = $this->PersonModel->load($person_id);
-
-			if (isError($personexists)) show_error(getError($personexists));
-
-			if (!hasData($personexists)) show_error('Person does not exist!');
-
-			$this->load->view('system/infocenter/messageList.php', getData($messages));
-		}
-		elseif (isError($messages)) // Otherwise if an error occurred
-		{
-			show_error(getError($messages));
-		}
+		$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
+		$this->load->view('system/infocenter/messageList.php', array('messages' => $messages->retval));
 	}
 
 	/**
@@ -1132,14 +1111,14 @@ class InfoCenter extends Auth_Controller
 
 	public function reloadDoks($person_id)
 	{
-		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false);
+		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
 
 		$this->load->view('system/infocenter/dokNachzureichend.php', array('dokumente_nachgereicht' => $dokumente_nachgereicht->retval));
 	}
 
 	public function reloadUebersichtDoks($person_id)
 	{
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false);
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false);
 
 		$this->DokumentModel->addOrder('bezeichnung');
 		$dokumentdata = array('dokumententypen' => (getData($this->DokumentModel->load())));
@@ -1243,9 +1222,7 @@ class InfoCenter extends Auth_Controller
 		$person_id = $this->input->post('person_id');
 		$date = $this->input->post('onholddate');
 
-		$result = $this->personloglib->setOnHold(
-			$person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid
-		);
+		$result = $this->personloglib->setOnHold($person_id, date_format(date_create($date), 'Y-m-d'), self::TAETIGKEIT, self::APP, null, $this->_uid);
 
 		$this->outputJson($result);
 	}
@@ -1343,129 +1320,10 @@ class InfoCenter extends Auth_Controller
 		$this->outputJsonSuccess('success');
 	}
 
-	public function updateStammdaten()
-	{
-		if (isEmptyString($this->input->post('nachname')) ||
-			isEmptyString($this->input->post('geschlecht')) ||
-			isEmptyString($this->input->post('gebdatum')))
-		{
-			$this->terminateWithJsonError($this->p->t('infocenter', 'stammdatenFeldFehlt'));
-		}
-
-		$datum = explode('.', $this->input->post('gebdatum'));
-
-		if (!checkdate($datum[1], $datum[0], $datum[2]))
-		{
-			$this->terminateWithJsonError($this->p->t('infocenter', 'datumUngueltig'));
-		}
-
-		$person_id = $this->input->post('personid');
-
-		$update = $this->PersonModel->update(
-			array
-			(
-				'person_id' => $person_id
-			),
-			array
-			(
-				'titelpre' => isEmptyString($this->input->post('titelpre')) ? null : $this->input->post('titelpre'),
-				'vorname' => isEmptyString($this->input->post('vorname')) ? null : $this->input->post('vorname'),
-				'nachname' => $this->input->post('nachname'),
-				'titelpost' => isEmptyString($this->input->post('titelpost')) ? null : $this->input->post('titelpost'),
-				'gebdatum' => isEmptyString($this->input->post('gebdatum')) ? null : date("Y-m-d", strtotime($this->input->post('gebdatum'))),
-				'svnr' => isEmptyString($this->input->post('svnr')) ? null : $this->input->post('svnr'),
-				'staatsbuergerschaft' => isEmptyString($this->input->post('buergerschaft')) ? null : $this->input->post('buergerschaft'),
-				'geschlecht' => $this->input->post('geschlecht'),
-				'geburtsnation' => isEmptyString($this->input->post('gebnation')) ? null : $this->input->post('gebnation'),
-				'gebort' => isEmptyString($this->input->post('gebort')) ? null : $this->input->post('gebort'),
-				'updateamum' => date('Y-m-d H:i:s'),
-				'updatevon' => $this->_uid
-			)
-		);
-
-		if (isError($update))
-			$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-
-		$kontakte = $this->input->post('kontakt');
-		foreach ($kontakte as $kontakt)
-		{
-			$kontaktExists = $this->KontaktModel->loadWhere(array(
-				'kontakt_id' => $kontakt['id'],
-				'person_id' => $person_id,
-			));
-
-			if (hasData($kontaktExists))
-			{
-				$kontaktExists = getData($kontaktExists)[0];
-
-				if ($kontaktExists->kontakt === $kontakt['value'])
-					continue;
-
-				$update = $this->KontaktModel->update(
-					array
-					(
-						'kontakt_id' => $kontakt['id']
-					),
-					array
-					(
-						'kontakt' => isEmptyString($kontakt['value']) ? null : $kontakt['value'],
-						'updateamum' => date('Y-m-d H:i:s'),
-						'updatevon' => $this->_uid
-					)
-				);
-
-				if (isError($update))
-					$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-			}
-		}
-
-		$adressen = $this->input->post('adresse');
-
-		foreach ($adressen as $adresse)
-		{
-			$adresseExists = $this->AdresseModel->loadWhere(array(
-				'adresse_id' => $adresse['id'],
-				'person_id' => $person_id,
-			));
-
-			if (hasData($adresseExists))
-			{
-				$adresse = $adresse['value'];
-				$adresseExists = getData($adresseExists)[0];
-				if ($adresseExists->strasse !== $adresse['strasse'] ||
-					$adresseExists->plz !== $adresse['plz'] ||
-					$adresseExists->ort !== $adresse['ort'] ||
-					$adresseExists->nation !== $adresse['nation'])
-				{
-					$update = $this->AdresseModel->update(
-						array
-						(
-							'adresse_id' => $adresseExists->adresse_id
-						),
-						array
-						(
-							'strasse' => isEmptyString($adresse['strasse']) ? null : $adresse['strasse'],
-							'plz' => isEmptyString($adresse['plz']) ? null : $adresse['plz'],
-							'ort' => isEmptyString($adresse['ort']) ? null : $adresse['ort'],
-							'nation' => isEmptyString($adresse['nation']) ? null : $adresse['nation'],
-							'updateamum' => date('Y-m-d H:i:s'),
-							'updatevon' => $this->_uid
-						)
-					);
-
-					if (isError($update))
-						$this->terminateWithJsonError($this->p->t('ui', 'fehlerBeimSpeichern'));
-				}
-			}
-		}
-
-		$this->outputJsonSuccess('Success');
-	}
-
 	public function saveNachreichung($person_id)
 	{
 		$nachreichungAm = $this->input->post('nachreichungAm');
-		$nachreichungAnmerkung = empty($this->input->post('nachreichungAnmerkung')) ? null : $this->input->post('nachreichungAnmerkung');
+		$nachreichungAnmerkung = empty($this->input->post('nachreichungAnmerkung')) ? NULL : $this->input->post('nachreichungAnmerkung');
 		$typ = $this->input->post('typ');
 
 		$allowedTypes = [
@@ -1522,14 +1380,14 @@ class InfoCenter extends Auth_Controller
 				array(
 					'dokument_kurzbz' => $allowedTypes[$typ],
 					'person_id' => $person_id,
-					'erstelltam' => null,
+					'erstelltam' => NULL,
 					'gedruckt' => false,
 					'anmerkung' => $nachreichungAnmerkung,
 					'updateamum' => $today,
 					'updatevon' => get_uid(),
 					'insertamum' => $today,
 					'insertvon' => get_uid(),
-					'uid' => null,
+					'uid' => NULL,
 					'nachgereicht' => true,
 					'nachgereicht_am' => $nachreichungAm
 				)
@@ -1538,78 +1396,6 @@ class InfoCenter extends Auth_Controller
 
 		$this->outputJsonSuccess("Done!");
 	}
-
-	/**
-	 * One day I'll be given some nice comment
-	 */
-	public function getAbsageData()
-	{
-		$stg_typ = $this->getStudienArtBerechtigung(['b', 'm']);
-
-		if (!is_null($stg_typ))
-		{
-			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
-			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
-
-			$data = array (
-				'statusgruende' => $statusgruende,
-				'studiengaenge' => $studiengaenge->retval
-			);
-
-			$this->outputJsonSuccess($data);
-		}
-		else
-			$this->outputJsonSuccess(null);
-	}
-
-	/**
-	 * One day I'll be given some nice comment
-	 */
-	public function getStudienArtBerechtigung($typ = null)
-	{
-		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
-		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, $typ);
-		return getData($stg_typ);
-	}
-
-	/**
-	 * One day I'll be given some nice comment
-	 */
-	public function getStudienartData()
-	{
-		$this->outputJsonSuccess($this->getStudienArtBerechtigung(['b', 'm', 'l']));
-	}
-
-	/**
-	 * One day I'll be given some nice comment
-	 */
-	public function saveAbsageForAll()
-	{
-		$statusgrund = $this->input->post('statusgrund');
-		$studiengang = $this->input->post('studiengang');
-		$abgeschickt = $this->input->post('abgeschickt');
-		$personen = $this->input->post('personen');
-		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
-
-		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
-			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
-
-		foreach($personen as $person)
-		{
-			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt);
-
-			if (!hasData($prestudent))
-				continue;
-
-			$prestudentData = getData($prestudent);
-
-			$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
-		}
-
-		$this->outputJsonSuccess("Success");
-	}
-
 	// -----------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -2008,21 +1794,21 @@ class InfoCenter extends Auth_Controller
 		if (!isset($stammdaten->retval))
 			return null;
 
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false);
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false);
 
 		if (isError($dokumente))
 		{
 			show_error(getError($dokumente));
 		}
 
-		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false);
+		$dokumente_nachgereicht = $this->AkteModel->getAktenWithDokInfo($person_id, null, true);
 
 		if (isError($dokumente_nachgereicht))
 		{
 			show_error(getError($dokumente_nachgereicht));
 		}
 
-		$messages = $this->CLMessagesModel->getReceivedAndSentMessages($person_id);
+		$messages = $this->MessageModel->getMessagesOfPerson($person_id, 1);
 
 		if (isError($messages))
 		{
@@ -2055,13 +1841,13 @@ class InfoCenter extends Auth_Controller
 		$data = array (
 			'lockedby' => $lockedby,
 			'lockedbyother' => $lockedbyother,
-			'stammdaten' => getData($stammdaten),
-			'dokumente' => getData($dokumente),
-			'dokumente_nachgereicht' => getData($dokumente_nachgereicht),
-			'messages' => getData($messages) == null ? array() : getData($messages),
+			'stammdaten' => $stammdaten->retval,
+			'dokumente' => $dokumente->retval,
+			'dokumente_nachgereicht' => $dokumente_nachgereicht->retval,
+			'messages' => $messages->retval,
 			'logs' => $logs,
-			'notizen' => getData($notizen),
-			'notizenbewerbung' => getData($notizen_bewerbung)
+			'notizen' => $notizen->retval,
+			'notizenbewerbung' => $notizen_bewerbung->retval
 		);
 
 		return $data;
@@ -2099,21 +1885,15 @@ class InfoCenter extends Auth_Controller
 				//get orgform for german and english
 				if (isset($zgvpruefung->prestudentstatus->bezeichnung_orgform) && is_array($zgvpruefung->prestudentstatus->bezeichnung_orgform))
 				{
-					$zgvpruefung->prestudentstatus->bezeichnung_orgform_german = getPhraseByLanguage(
-						$zgvpruefung->prestudentstatus->bezeichnung_orgform, 'German'
-					);
-					$zgvpruefung->prestudentstatus->bezeichnung_orgform_english = getPhraseByLanguage(
-						$zgvpruefung->prestudentstatus->bezeichnung_orgform, 'English'
-					);
+					$zgvpruefung->prestudentstatus->bezeichnung_orgform_german = getPhraseByLanguage($zgvpruefung->prestudentstatus->bezeichnung_orgform, 'German');
+					$zgvpruefung->prestudentstatus->bezeichnung_orgform_english = getPhraseByLanguage($zgvpruefung->prestudentstatus->bezeichnung_orgform, 'English');
 				}
 
 				$position = strpos($zgvpruefung->prestudentstatus->anmerkung, 'Alt:');
 
 				//parse Anmerkung for Alternative (Prio is given in orgform and sprache anyway)
-				$zgvpruefung->prestudentstatus->alternative = is_numeric($position) ?
-					substr($zgvpruefung->prestudentstatus->anmerkung, $position) : null;
+				$zgvpruefung->prestudentstatus->alternative = is_numeric($position) ? substr($zgvpruefung->prestudentstatus->anmerkung, $position) : null;
 			}
-
 			//if prestudent is not interessent or is already bestaetigt, then show only as information, non-editable
 			$zgvpruefung->infoonly = !isset($zgvpruefung->prestudentstatus)
 				|| isset($zgvpruefung->prestudentstatus->bestaetigtam)
@@ -2124,21 +1904,15 @@ class InfoCenter extends Auth_Controller
 			//wether prestudent was freigegeben for RT/Stg
 			$zgvpruefung->isRtFreigegeben = false;
 			$zgvpruefung->isStgFreigegeben = false;
-			// Wether Stgudiengangfreigabemessage can be sent (for "exceptions", Studiengänge with no message sending)
-			$zgvpruefung->sendStgFreigabeMsg = true;
+			$zgvpruefung->sendStgFreigabeMsg = true;//wether Stgudiengangfreigabemessage can be sent (for "exceptions", Studiengänge with no message sending)
 
 			$isFreigegeben = null;
 			if (isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz))
 			{
-				$this->PrestudentstatusModel->addSelect(
-					'bestaetigtam, statusgrund_id, tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund'
-				);
+				$this->PrestudentstatusModel->addSelect('bestaetigtam, statusgrund_id, tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund');
 				$this->PrestudentstatusModel->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
-				$isFreigegeben = $this->PrestudentstatusModel->loadWhere(array(
-					'studiensemester_kurzbz' => $zgvpruefung->prestudentstatus->studiensemester_kurzbz,
-					'tbl_prestudentstatus.status_kurzbz' => self::INTERESSENTSTATUS,
-					'prestudent_id' => $prestudent->prestudent_id)
-				);
+				$isFreigegeben = $this->PrestudentstatusModel->loadWhere(array('studiensemester_kurzbz' => $zgvpruefung->prestudentstatus->studiensemester_kurzbz,
+															  'tbl_prestudentstatus.status_kurzbz' => self::INTERESSENTSTATUS, 'prestudent_id' => $prestudent->prestudent_id));
 			}
 
 			if (hasData($isFreigegeben))
@@ -2147,14 +1921,11 @@ class InfoCenter extends Auth_Controller
 				{
 					if (isset($prestudentstatus->bestaetigtam))
 					{
-						// If statusgrund set - freigegeben for Studiengang, otherwise freigegeben for RT
+						//if statusgrund set - freigegeben for Studiengang, otherwise freigegeben for RT
 						if (isset($prestudentstatus->statusgrund_id))
 						{
 							if (isset($prestudentstatus->bezeichnung_statusgrund[0])
-								&& in_array(
-									$prestudentstatus->bezeichnung_statusgrund[0],
-									$this->_statusgruendeNoStgFreigabeMessage)
-							)
+								&& in_array($prestudentstatus->bezeichnung_statusgrund[0], $this->_statusgruendeNoStgFreigabeMessage))
 								$zgvpruefung->sendStgFreigabeMsg = false;
 							else
 								$zgvpruefung->isStgFreigegeben = true;
@@ -2164,52 +1935,43 @@ class InfoCenter extends Auth_Controller
 							$zgvpruefung->isRtFreigegeben = true;
 					}
 				}
-			}
+            }
 
-			// Application priority change possible?
-			$zgvpruefung->changeup = false;
-			$zgvpruefung->changedown = false;
-			$zgvpruefung->hasBewerber = false;
-			
-			if (isset($zgvpruefung->prestudentstatus->status_kurzbz)
-				&& $zgvpruefung->prestudentstatus->status_kurzbz == self::INTERESSENTSTATUS)
-			{
-				if (isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz))
-				{
-					$studiensemester = $zgvpruefung->prestudentstatus->studiensemester_kurzbz;
-					//show warning if there is already another bewerber (RT result already exists)
-					$bewerber = $this->PersonModel->hasBewerber($person_id, $studiensemester, 'b');
-					
-					if (hasData($bewerber))
-					{
-						$bewerbercnt = getData($bewerber);
-						
-						if (is_numeric($bewerbercnt[0]->anzahl_bewerber) && $bewerbercnt[0]->anzahl_bewerber > 0)
-						{
-							$zgvpruefung->hasBewerber = true;
-						}
-					}
-					
-					$zgvpruefung->changeup = $this->PrestudentModel->checkPrioChange(
-						$zgvpruefung->prestudent_id, $studiensemester, -1
-					);
-					$zgvpruefung->changedown = $this->PrestudentModel->checkPrioChange(
-						$zgvpruefung->prestudent_id, $studiensemester, 1
-					);
-				}
-			}
+            //application priority change possible?
+            $zgvpruefung->changeup = false;
+            $zgvpruefung->changedown = false;
+            $zgvpruefung->hasBewerber = false;
+
+            if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz == self::INTERESSENTSTATUS)
+            {
+                if (isset($zgvpruefung->prestudentstatus->studiensemester_kurzbz))
+                {
+                    $studiensemester = $zgvpruefung->prestudentstatus->studiensemester_kurzbz;
+                    //show warning if there is already another bewerber (RT result already exists)
+                    $bewerber = $this->PersonModel->hasBewerber($person_id, $studiensemester, 'b');
+
+                    if (hasData($bewerber))
+                    {
+                        $bewerbercnt = getData($bewerber);
+
+                        if (is_numeric($bewerbercnt[0]->anzahl_bewerber) && $bewerbercnt[0]->anzahl_bewerber > 0)
+                        {
+                            $zgvpruefung->hasBewerber = true;
+                        }
+                    }
+
+                    $zgvpruefung->changeup = $this->PrestudentModel->checkPrioChange($zgvpruefung->prestudent_id, $studiensemester, -1);
+                    $zgvpruefung->changedown = $this->PrestudentModel->checkPrioChange($zgvpruefung->prestudent_id, $studiensemester, 1);
+                }
+            }
 			$zgvExist = $this->ZGVPruefungModel->loadWhere(array('prestudent_id' => $zgvpruefung->prestudent_id));
 
-			if (isSuccess($zgvExist) && hasData($zgvExist))
+            if (isSuccess($zgvExist) && hasData($zgvExist))
 			{
 				$this->ZGVPruefungStatusModel->addOrder('datum', 'DESC');
 				$this->ZGVPruefungStatusModel->addLimit(1);
 
-				$statusZGV = $this->ZGVPruefungStatusModel->loadWhere(
-					array(
-						'zgvpruefung_id' => $zgvExist->retval[0]->zgvpruefung_id
-					)
-				);
+				$statusZGV = $this->ZGVPruefungStatusModel->loadWhere(array('zgvpruefung_id' => $zgvExist->retval[0]->zgvpruefung_id));
 
 				if (isSuccess($statusZGV) && hasData($statusZGV))
 					$zgvpruefung->statusZGV = $statusZGV->retval[0]->status;
@@ -2234,13 +1996,7 @@ class InfoCenter extends Auth_Controller
 		$this->NationModel->addOrder('langtext');
 		$allNations = getData($this->NationModel->load());
 
-
-		$additional_stg = explode(',', ($this->config->item('infocenter_studiengang_kz')));
-
-		$this->GeschlechtModel->addOrder('sort');
-		$allGenders = getData($this->GeschlechtModel->load());
-
-		$data = array(
+		$data = array (
 			'zgvpruefungen' => $zgvpruefungen,
 			'abwstatusgruende' => $abwstatusgruende,
 			'intstatusgruende' => $intstatusgruende,
@@ -2248,8 +2004,6 @@ class InfoCenter extends Auth_Controller
 			'all_zgvs' => $allZGVs,
 			'all_zgvs_master' => $allZGVsMaster,
 			'all_nations' => $allNations,
-			'additional_stg' => $additional_stg,
-			'all_genders' => $allGenders
 		);
 
 		return $data;
@@ -2263,7 +2017,7 @@ class InfoCenter extends Auth_Controller
 	{
 		$this->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
 
-		@usort($zgvpruefungen, function($a, $b) {
+		@usort($zgvpruefungen, function ($a, $b) {
 			//sort:
 			// 1: Studiensemester
 			if (isset($a->prestudentstatus->studiensemester_kurzbz) || isset($b->prestudentstatus->studiensemester_kurzbz))
@@ -2364,13 +2118,7 @@ class InfoCenter extends Auth_Controller
 		$studiengang_mail = $prestudentdata->studiengangmail;
 		$studiengang_typ = $prestudentdata->studiengangtyp;
 
-		return array(
-			'person_id' => $person_id,
-			'studiengang_kurzbz' => $studiengang_kurzbz,
-			'studiengang_bezeichnung' => $studiengang_bezeichnung,
-			'studiengang_mail' => $studiengang_mail,
-			'studiengang_typ' => $studiengang_typ
-		);
+		return array('person_id' => $person_id, 'studiengang_kurzbz' => $studiengang_kurzbz, 'studiengang_bezeichnung' => $studiengang_bezeichnung, 'studiengang_mail' => $studiengang_mail, 'studiengang_typ' => $studiengang_typ);
 	}
 
 	/**
@@ -2416,8 +2164,8 @@ class InfoCenter extends Auth_Controller
 		$prestudentstatus = $prestudent->prestudentstatus;
 		$person_id = $prestudent->person_id;
 		$person = $this->PersonModel->getPersonStammdaten($person_id, true)->retval;
-		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false, false)->retval;
-		$dokumenteNachzureichen = $this->AkteModel->getAktenWithDokInfo($person_id, null, true, false)->retval;
+		$dokumente = $this->AkteModel->getAktenWithDokInfo($person_id, null, false)->retval;
+		$dokumenteNachzureichen = $this->AkteModel->getAktenWithDokInfo($person_id, null, true)->retval;
 
 		//fill mail variables
 		$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
@@ -2446,13 +2194,8 @@ class InfoCenter extends Auth_Controller
 		foreach ($dokumenteNachzureichen as $dokument)
 		{
 			$anmerkung = !isEmptyString($dokument->anmerkung) ? ' | Anmerkung: '.$dokument->anmerkung : '';
-			$nachgereichtam = !isEmptyString($dokument->nachgereicht_am) ?
-				' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : '';
-			$dokumenteNachzureichenMail[] = array(
-				'dokument_bezeichnung' => $dokument->dokument_bezeichnung,
-				'anmerkung' => $anmerkung,
-				'nachgereicht_am' => $nachgereichtam
-			);
+			$nachgereichtam = !isEmptyString($dokument->nachgereicht_am) ? ' | wird nachgereicht bis '.date_format(date_create($dokument->nachgereicht_am), 'd.m.Y') : '';
+			$dokumenteNachzureichenMail[] = array('dokument_bezeichnung' => $dokument->dokument_bezeichnung, 'anmerkung' => $anmerkung, 'nachgereicht_am' => $nachgereichtam);
 		}
 
 		$notizenBewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung')->retval;
@@ -2481,6 +2224,11 @@ class InfoCenter extends Auth_Controller
 			'nachname' => $person->nachname,
 			'prestudentid' => $prestudent_id,
 			'statusgrund' => $statusgrund,
+			/*'zgvbez' => $prestudent->zgv_bez,
+			'zgvort' => $zgvort,
+			'zgvdatum' => $zgvdatum,
+			'zgvnation' => $zgvnation,
+			*/
 			'notizentext' => $notizentext,
 			'dokumente' => $dokumenteMail,
 			'dokumente_nachgereicht' => $dokumenteNachzureichenMail,
@@ -2490,11 +2238,7 @@ class InfoCenter extends Auth_Controller
 		$this->load->library('LogLib');
 		$this->load->helper('hlp_sancho');
 
-		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').
-			$person->vorname.' '.
-			$person->nachname.' für '.
-			$prestudentstatus->studiengangbezeichnung.
-			$orgform.' freigegeben';
+		$subject = ($person->geschlecht == 'm' ? 'Interessent ' : 'Interessentin ').$person->vorname.' '.$person->nachname.' für '.$prestudentstatus->studiengangbezeichnung.$orgform.' freigegeben';
 
 		$receiver = $prestudent->studiengangmail;
 
@@ -2515,5 +2259,64 @@ class InfoCenter extends Auth_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
-}
 
+	public function getAbsageData()
+	{
+		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, ['b', 'm']);
+
+		if (hasData($stg_typ))
+		{
+			$stg_typ = getData($stg_typ);
+			$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+			$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+			$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(array_column($stg_typ, 'typ'), $studienSemester);
+
+			$data = array (
+				'statusgruende' => $statusgruende,
+				'studiengaenge' => $studiengaenge->retval
+			);
+
+			$this->outputJsonSuccess($data);
+		}
+		else
+			$this->outputJsonSuccess(null);
+	}
+
+	public function getStudienArtBerechtigung()
+	{
+		$studiengang_kz_all = $this->permissionlib->getSTG_isEntitledFor('infocenter');
+		$stg_typ = $this->StudiengangModel->getStudiengangTyp($studiengang_kz_all, ['b', 'm', 'l']);
+		return getData($stg_typ);
+	}
+	public function getStudienartData()
+	{
+		$this->outputJsonSuccess($this->getStudienArtBerechtigung());
+	}
+
+	public function saveAbsageForAll()
+	{
+		$statusgrund = $this->input->post('statusgrund');
+		$studiengang = $this->input->post('studiengang');
+		$abgeschickt = $this->input->post('abgeschickt');
+		$personen = $this->input->post('personen');
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+
+		if ($statusgrund === 'null' || $studiengang === 'null' || $abgeschickt === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte füllen Sie alle Felder aus");
+
+		foreach($personen as $person)
+		{
+			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester, $abgeschickt);
+
+			if (!hasData($prestudent))
+				continue;
+
+			$prestudentData = getData($prestudent);
+
+			$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
+		}
+
+		$this->outputJsonSuccess("Success");
+	}
+}

application/controllers/system/issues/Plausichecks.php

@@ -1,142 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class Plausichecks extends Auth_Controller
-{
-	const GENERIC_ISSUE_OCCURED_TEXT = 'Issue aufgetreten';
-
-	public function __construct()
-	{
-		parent::__construct(
-			array(
-				'index' => array('system/issues_verwalten:r'),
-				'runChecks' => array('system/issues_verwalten:r')
-			)
-		);
-
-		// Load libraries
-		$this->load->library('issues/PlausicheckProducerLib');
-		$this->load->library('WidgetLib');
-
-		// Load models
-		$this->load->model('system/Fehler_model', 'FehlerModel');
-		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-	}
-
-	/*
-	 * Get data for filtering the plausichecks and load the view.
-	 */
-	public function index()
-	{
-		$filterData = $this->_getFilterData();
-		$this->load->view('system/issues/plausichecks', $filterData);
-	}
-
-	/**
-	 * Initiate plausichecks run.
-	 */
-	public function runChecks()
-	{
-		$studiensemester_kurzbz = $this->input->get('studiensemester_kurzbz');
-		$studiengang_kz = $this->input->get('studiengang_kz');
-		$fehler_kurzbz = $this->input->get('fehler_kurzbz');
-
-		// issues array for passing issue texts
-		$issueTexts = array();
-		// all fehler kurzbz which are going to be checked
-		$fehlerKurzbz = !isEmptyString($fehler_kurzbz) ? array($fehler_kurzbz) : $this->plausicheckproducerlib->getFehlerKurzbz();
-		// set Studiengang to null if not passed
-		if (isEmptyString($studiengang_kz)) $studiengang_kz = null;
-
-		// get the data returned by Plausicheck
-		foreach ($fehlerKurzbz as $fehler_kurzbz)
-		{
-			// execute the check
-			$issueTexts[$fehler_kurzbz] = array();
-			$plausicheckRes = $this->plausicheckproducerlib->producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz, $studiengang_kz);
-
-			if (isError($plausicheckRes)) $this->terminateWithJsonError(getError($plausicheckRes));
-
-			if (hasData($plausicheckRes))
-			{
-				$plausicheckData = getData($plausicheckRes);
-
-				foreach ($plausicheckData as $plausiData)
-				{
-					// get the data needed for issue production
-					$person_id = isset($plausiData['person_id']) ? $plausiData['person_id'] : null;
-					$oe_kurzbz = isset($plausiData['oe_kurzbz']) ? $plausiData['oe_kurzbz'] : null;
-					$fehlertext_params = isset($plausiData['fehlertext_params']) ? $plausiData['fehlertext_params'] : null;
-					$resolution_params = isset($plausiData['resolution_params']) ? $plausiData['resolution_params'] : null;
-
-					// get Text of the Fehler
-					$this->FehlerModel->addSelect('fehlertext');
-					$fehlerRes = $this->FehlerModel->loadWhere(array('fehler_kurzbz' => $fehler_kurzbz));
-
-					if (isError($fehlerRes)) $this->outputJsonError(getError($fehlerRes));
-
-					// optionally replace fehler parameters in text, output the fehlertext
-					if (hasData($fehlerRes))
-					{
-						// use issue fehler text from database if present
-						$fehlerText = getData($fehlerRes)[0]->fehlertext;
-
-						if (!isEmptyArray($fehlertext_params))
-						{
-							// replace placeholder with params, if present
-							if (count($fehlertext_params) != substr_count($fehlerText, '%s'))
-								$this->terminateWithJsonError('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehler_kurzbz);
-
-							$fehlerText = vsprintf($fehlerText, $fehlertext_params);
-						}
-					}
-					else // if no issue text found, use generic text
-					{
-						$fehlerText = self::GENERIC_ISSUE_OCCURED_TEXT;
-					}
-
-					// add generic parameters to issue text
-					if (isset($person_id)) $fehlerText .= "; person_id: $person_id";
-					if (isset($oe_kurzbz)) $fehlerText .= "; oe_kurzbz: $oe_kurzbz";
-					$issueTexts[$fehler_kurzbz][] = $fehlerText;
-				}
-			}
-		}
-
-		$this->outputJsonSuccess($issueTexts);
-	}
-
-	/**
-	 * Get the data needed for filtering for limiting checks.
-	 */
-	private function _getFilterData()
-	{
-		$this->StudiensemesterModel->addOrder('start', 'DESC');
-		$studiensemesterRes = $this->StudiensemesterModel->load();
-
-		if (isError($studiensemesterRes)) show_error(getError($studiensemesterRes));
-
-		$currSemRes = $this->StudiensemesterModel->getAkt();
-
-		if (isError($currSemRes)) show_error(getError($currSemRes));
-
-		$this->StudiengangModel->addSelect('studiengang_kz, tbl_studiengang.bezeichnung, tbl_studiengang.typ,
-			tbl_studiengangstyp.bezeichnung AS typbezeichnung, UPPER(tbl_studiengang.typ::varchar(1) || tbl_studiengang.kurzbz) as kuerzel');
-		$this->StudiengangModel->addJoin('public.tbl_studiengangstyp', 'typ');
-		$this->StudiengangModel->addOrder('kuerzel, tbl_studiengang.bezeichnung, studiengang_kz');
-		$studiengaengeRes = $this->StudiengangModel->loadWhere(array('aktiv' => true));
-
-		if (isError($studiengaengeRes)) show_error(getError($studiengaengeRes));
-
-		$fehlerKurzbz = $this->plausicheckproducerlib->getFehlerKurzbz();
-
-		return array(
-			'semester' => hasData($studiensemesterRes) ? getData($studiensemesterRes) : array(),
-			'currsemester' => hasData($currSemRes) ? getData($currSemRes) : array(),
-			'studiengaenge' => hasData($studiengaengeRes) ? getData($studiengaengeRes) : array(),
-			'fehler' => $fehlerKurzbz
-		);
-	}
-}

application/core/IIssueExistsChecker.php

@@ -1,21 +0,0 @@
-<?php
-
-/**
- * Interface defining method to implement for issue producer (from core and extensions)
- */
-interface IIssueExistsChecker
-{
-	/**
-	 * Checks if an issue exists.
-	 * @param array $params parameters needed for issue detection
-	 * @return object with success(true) if issue exists, success(false) otherwise
-	 */
-	public function checkIfIssueExists($paramsForChecking);
-
-	/**
-	 * Produces an issue.
-	 * @param array $params parameters needed for issue detection
-	 * @return object with success(true) if issue exists, success(false) otherwise
-	 */
-	//public function produceIssue($person_id, $oe_kurzbz, $paramsForProducing);
-}

application/core/IssueResolver_Controller.php

@@ -5,8 +5,7 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	const CI_PATH = 'application';
-	const ISSUE_RESOLVERS_FOLDER = 'issues/resolvers';
+	const ISSUES_FOLDER = 'issues';
 	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
 
 	protected $_codeLibMappings;
@@ -44,68 +43,71 @@ abstract class IssueResolver_Controller extends JOB_Controller
 			}
 			else
 			{
+
 				$openIssues = getData($openIssuesRes);
 
 				foreach ($openIssues as $issue)
 				{
-					// ignore if Fehlercode is not in libmappings (shouldn't be checked)
-					if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
-
-					$libName = $this->_codeLibMappings[$issue->fehlercode];
-
-					// add person id and oe kurzbz automatically as params, merge it with additional params
-					// decode bewerbung_parameter into assoc array
-					$params = array_merge(
-						array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
-						isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
-					);
-
-					// if called from extension (extension name set), path includes extension names, otherwise it is the core library folder
-					$libRootPath = isset($this->_extensionName) ? 'extensions/' . $this->_extensionName . '/' : '';
-					$issuesLibPath = $libRootPath . self::ISSUE_RESOLVERS_FOLDER . '/';
-					$issuesLibFilePath = DOC_ROOT . self::CI_PATH . '/' . $libRootPath . 'libraries/' . self::ISSUE_RESOLVERS_FOLDER . '/' . $libName . '.php';
-
-					// check if library file exists
-					if (!file_exists($issuesLibFilePath))
+					if (isset($this->_codeLibMappings[$issue->fehlercode]))
 					{
-						// log error and continue with next issue if not
-						$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
-						continue;
-					}
+						$libName = $this->_codeLibMappings[$issue->fehlercode];
 
-					// load library connected to fehlercode
-					$this->load->library($issuesLibPath . $libName);
+						// add person id and oe kurzbz automatically as params, merge it with additional params
+						// decode bewerbung_parameter into assoc array
+						$params = array_merge(
+							array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
+							isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
+						);
 
-					$lowercaseLibName = mb_strtolower($libName);
+						// if called from extension (extension name set), path includes extension names, otherwise it is the core library folder
+						$libRootPath = isset($this->_extensionName) ? 'extensions/' . $this->_extensionName . '/' : '';
+						$issuesLibPath = $libRootPath . self::ISSUES_FOLDER . '/';
+						$issuesLibFilePath = DOC_ROOT . 'application/' . $libRootPath . 'libraries/' . self::ISSUES_FOLDER . '/' . $libName . '.php';
 
-					// check if method is defined in library class
-					if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
-					{
-						// log error and continue with next issue if not
-						$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
-						continue;
-					}
-
-					// call the function for checking for issue resolution
-					$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
-
-					if (isError($issueResolvedRes))
-					{
-						$this->logError(getError($issueResolvedRes));
-					}
-					else
-					{
-						$issueResolvedData = getData($issueResolvedRes);
-
-						if ($issueResolvedData === true)
+						// check if library file exists
+						if (!file_exists($issuesLibFilePath))
 						{
-							// set issue to resolved if needed
-							$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
+							// log error and continue with next issue if not
+							$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
+							continue;
+						}
 
-							if (isError($behobenRes))
-								$this->logError(getError($behobenRes));
-							else
-								$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
+						// load library connected to fehlercode
+						$this->load->library(
+							$issuesLibPath . $libName
+						);
+
+						$lowercaseLibName = mb_strtolower($libName);
+
+						// check if method is defined in libary class
+						if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
+						{
+							// log error and continue with next issue if not
+							$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
+							continue;
+						}
+
+						// call the function for checking for issue resolution
+						$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+						if (isError($issueResolvedRes))
+						{
+							$this->logError(getError($issueResolvedRes));
+						}
+						else
+						{
+							$issueResolvedData = getData($issueResolvedRes);
+
+							if ($issueResolvedData === true)
+							{
+								// set issue to resolved if needed
+								$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
+
+								if (isError($behobenRes))
+									$this->logError(getError($behobenRes));
+								else
+									$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
+							}
 						}
 					}
 				}

application/libraries/DocsboxLib.php

@@ -1,304 +0,0 @@
-<?php
-/* Copyright (C) 2022 fhcomplete.net
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- */
-
-require_once(dirname(__FILE__).'/../../vendor/nategood/httpful/bootstrap.php');
-
-use \ZipArchive as ZipArchive;
-
-/**
- * Simple client to convert documents using Docsbox
- */
-class DocsboxLib
-{
-	const ERROR = 1;
-	const SUCCESS = 0;
-	const STATUS_FINISHED = 'finished'; // Docsbox status when a document conversion ended
-	const STATUS_QUEUED = 'queued'; // Docsbox status when a file has been queued for the conversion
-	const STATUS_STARTED = 'started'; // Docsbox status when a file has started being worked
-	const STATUS_WORKING = 'working'; // Docsbox status when a file is being converted
-	const OUTPUT_FILENAME = 'out.zip.pdf'; // File name used by docsbox to save a converted document
-
-	const DEFAULT_FORMAT = 'pdf'; // Default supported format
-
-	// -------------------------------------------------------------------------------------------------
-	// Public static methods
-
-	/**
-	 * Static method used to convert a document using a Docsbox installation (local/remote) over the network
-	 * It return 0 on success and any other integer on error
-	 * NOTE: currently format is not supported
-	 */
-	public static function convert($inputFileName, $outputFileName, $format)
-	{
-		// If a format has not been given
-		if (($format == null) || ($format != null && ctype_space($format) === true)) $format = self::DEFAULT_FORMAT;
-
-		// Posts the file to docsbox
-		$queueId = self::_postFile($inputFileName);
-		// If an error occurred
-		if ($queueId == null) return self::ERROR;
-
-		// Checks and waits if the file has been converted
-		$resultUrl = self::_checkConvertion($queueId);
-		// If an error occurred
-		if ($resultUrl == null) return self::ERROR;
-
-		// Download and rename the converted file
-		$downloaded = self::_downloadFile($resultUrl, $outputFileName);
-		// If an error occurred
-		if (!$downloaded) return self::ERROR;
-
-		return self::SUCCESS;
-	}
-
-	// -------------------------------------------------------------------------------------------------
-	// Private static methods
-
-	/**
-	 * Posts the given file to a Docsboxserver and checks the response to return a valid queue id
-	 * On failure it returns a null value
-	 */
-	private static function _postFile($inputFileName)
-	{
-		$queueId = null;
-
-		try
-		{
-			// Posts the given file and expects a response in JSON format
-			$postFileResponse = \Httpful\Request::post(DOCSBOX_SERVER.DOCSBOX_PATH_API)
-				->attach(array('file' => $inputFileName))
-				->expectsJson()
-				->send();
-
-			// Checks that:
-			// - the response is not empty
-			// - the reponse body has the property id
-			// - the property id is a valid string
-			// - the reponse body has the property status
-			// - docsbox queued the conversion of the posted file
-			if (is_object($postFileResponse)
-				&& isset($postFileResponse->body)
-				&& isset($postFileResponse->body->id)
-				&& $postFileResponse->body->id != '' && $postFileResponse->body->id != null
-				&& isset($postFileResponse->body->status)
-				&& $postFileResponse->body->status == self::STATUS_QUEUED)
-			{
-				$queueId = $postFileResponse->body->id;
-			}
-			else
-			{
-				// If docsbox refused to convert the posted file
-				if (isset($postFileResponse->body->status)
-					&& $postFileResponse->body->status != self::STATUS_QUEUED)
-				{
-					error_log(
-						'Docsbox did not queue the posted file. Returned status: '.
-						$postFileResponse->body->status
-					);
-				}
-				else // any other generic error
-				{
-					error_log(
-						'An error occurred while posting to docsbox. Response: '.
-						print_r($postFileResponse, 1)
-					);
-				}
-			}
-		}
-		catch(\Httpful\Exception\ConnectionErrorException $cee) // Httpful exception
-		{
-			error_log($cee->getMessage());
-		}
-		catch (Exception $e) // any other exception
-		{
-			error_log($e->getMessage());
-		}
-
-		return $queueId;
-	}
-
-	/**
-	 * Check the status of the file convertion identified by the given queue element id
-	 * A URL is returned with the path where it is possible to download the converted file
-	 * If an error occurred then a null value is returned
-	 */
-	private static function _checkConvertion($queueId)
-	{
-		$resultUrl = null;
-		$startConvertionsTime = time(); // time when the file conversion has started
-
-		// Until a timeout has occurred
-		while (time() - $startConvertionsTime <= DOCSBOX_CONVERSION_TIMEOUT)
-		{
-			sleep(DOCSBOX_WAITING_SLEEP_TIME); // takes a nap on every round
-
-			try
-			{
-				// Calls the docsbox server to check the status of the
-				// file conversion using the provided queue id
-				// it expects a response in JSON format
-				$getStatusResponse = \Httpful\Request::get(DOCSBOX_SERVER.DOCSBOX_PATH_API.$queueId)
-					->expectsJson()
-					->send();
-
-				// Checks that:
-				// - the response is not empty
-				// - the reponse body has the property id
-				// - the property id is a valid string
-				// - the reponse body has the property status
-				// - docsbox is working the conversion of the posted file
-				if (is_object($getStatusResponse)
-					&& isset($getStatusResponse->body->id)
-					&& $getStatusResponse->body->id != '' && $getStatusResponse->body->id != null
-					&& isset($getStatusResponse->body->status))
-				{
-					// Checks that docsbox has finished working on the file conversion
-					// and that there is a valid resultUrl property
-					if ($getStatusResponse->body->status == self::STATUS_FINISHED
-						&& isset($getStatusResponse->body->result_url)
-						&& $getStatusResponse->body->result_url != ''
-						&& $getStatusResponse->body->result_url != null)
-					{
-						$resultUrl = $getStatusResponse->body->result_url;
-						break;
-					}
-					// Just started or still working on it
-					elseif ($getStatusResponse->body->status == self::STATUS_WORKING
-						|| $getStatusResponse->body->status == self::STATUS_STARTED)
-					{
-						// go on!
-					}
-					else // any other status is abnormal
-					{
-						error_log(
-							'Not valid status for queue element: '.$queueId.'. Response: '.
-							print_r($getStatusResponse, 1)
-						);
-						break; // interrupt the loop on error
-					}
-				}
-				else // if the response from the docsbox server is not valid
-				{
-					error_log(
-						'An error occurred while checking the docsbox activity. Response: '.
-						print_r($getStatusResponse, 1)
-					);
-					break; // interrupt the loop on error
-				}
-			}
-			catch(\Httpful\Exception\ConnectionErrorException $cee) // Httpful exception
-			{
-				error_log($cee->getMessage());
-				break; // interrupt the loop on error
-			}
-			catch (Exception $e) // any other exception
-			{
-				error_log($e->getMessage());
-				break; // interrupt the loop on error
-			}
-		}
-
-		return $resultUrl;
-	}
-
-	/**
-	 * Download the converted file using the provided URL, unzip it, and renames it into the provided file name
-	 */
-	private static function _downloadFile($resultUrl, $outputFileName)
-	{
-		$downloaded = false; // pessimistic assumption
-
-		try
-		{
-			// Download the file
-			$getFileResponse = \Httpful\Request::get(DOCSBOX_SERVER.$resultUrl)->send();
-
-			// If the downloaded file content is valid and not empty
-			if (isset($getFileResponse->body)
-				&& $getFileResponse->body != null
-				&& $getFileResponse->body != '')
-			{
-				// Output directory where to unzip the downloaded zip file
-				$outputDirectory = dirname($outputFileName);
-				// The path and name of the downloaded zip file
-				$temporaryDownloadedZip = sys_get_temp_dir().'/'.basename($resultUrl);
-
-				// Write the file content into a temporary directory and file
-				if (file_put_contents($temporaryDownloadedZip, $getFileResponse->body) != false)
-				{
-					$zipArchive = new ZipArchive;
-
-					// Open and extract the dowloaded zip file into the directory of the output file
-					if ($zipArchive->open($temporaryDownloadedZip) === true
-						&& $zipArchive->extractTo($outputDirectory) === true
-						&& $zipArchive->close() === true)
-					{
-						// Opened, extracted and closed!
-
-						// Rename the extracted file to the given output file name
-						if (rename($outputDirectory.'/'.self::OUTPUT_FILENAME, $outputFileName))
-						{
-							$downloaded = true;
-						}
-						else
-						{
-							error_log(
-								'An error occurred while renaming the extracted file: '.
-								$outputDirectory.'/'.self::OUTPUT_FILENAME.' into: '.
-								$outputFileName
-							);
-						}
-					}
-					else
-					{
-						error_log(
-							'An error occurred while working the dowloaded zip file: '.
-							$temporaryDownloadedZip
-						);
-					}
-				}
-				else // if an error occurred while writing
-				{
-					error_log(
-						'An error occurred while writing the file content to: '.
-						$temporaryDownloadedZip
-					);
-				}
-			}
-			else // if the downloaded file is not valid
-			{
-				error_log(
-					'An error occurred while downloading the file from the docsbox server: '.
-					print_r($getFileResponse, 1)
-				);
-			}
-		}
-		catch(\Httpful\Exception\ConnectionErrorException $cee)
-		{
-			error_log($cee->getMessage());
-		}
-		catch (Exception $e)
-		{
-			error_log($e->getMessage());
-		}
-
-		return $downloaded;
-	}
-}
-

application/libraries/DocumentLib.php

@@ -14,28 +14,20 @@ class DocumentLib
 		// Gets CI instance
 		$this->ci =& get_instance();
 
-		// Which document converter has to be used
-		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
-		{
-			// Use docsbox!!
-		}
-		else
-		{
-			exec('unoconv --version', $ret_arr);
+		exec('unoconv --version', $ret_arr);
 
-			if(isset($ret_arr[0]))
+		if(isset($ret_arr[0]))
+		{
+			$hlp = explode(' ', $ret_arr[0]);
+			if(isset($hlp[1]))
 			{
-				$hlp = explode(' ', $ret_arr[0]);
-				if(isset($hlp[1]))
-				{
-					$this->unoconv_version = $hlp[1];
-				}
-				else
-					show_error('Could not get Unoconv Version');
+				$this->unoconv_version = $hlp[1];
 			}
 			else
-				show_error('Unoconv not found - Please install Unoconv');
+				show_error('Could not get Unoconv Version');
 		}
+		else
+			show_error('Unoconv not found - Please install Unoconv');
 	}
 
 	/**
@@ -65,16 +57,9 @@ class DocumentLib
 			case 'application/vnd.ms-word':
 			case 'application/vnd.oasis.opendocument.text':
 			case 'text/plain':
-				if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
-				{
-					// Use docsbox
-				}
-				else
-				{
-					// Unoconv Version 0.6 seems to fail on converting TXT Files
-					if ($this->unoconv_version == '0.6')
-						return error();
-				}
+				// Unoconv Version 0.6 seems to fail on converting TXT Files
+				if ($this->unoconv_version == '0.6')
+					return error();
 
 				$ret = $this->convert($filename, $outFile, 'pdf');
 				if(isSuccess($ret))
@@ -120,7 +105,6 @@ class DocumentLib
 
 		finfo_close($finfo);
 
-		$out = null;
 		exec($cmd, $out, $ret);
 		if ($ret != 0)
 		{
@@ -139,26 +123,13 @@ class DocumentLib
 	 */
 	public function convert($inFile, $outFile, $format)
 	{
-		$ret = 0;
+		if ($this->unoconv_version == '0.6')
+			$command = 'unoconv -f %1$s  %3$s > %2$s';
+		else
+			$command = 'unoconv -f %s --output %s %s 2>&1';
+		$command = sprintf($command, $format, $outFile, $inFile);
 
-		// If it is set to use docsbox
-		if (defined('DOCSBOX_ENABLED') && DOCSBOX_ENABLED === true)
-		{
-			require_once(dirname(__FILE__).'/../application/libraries/DocsboxLib.php');
-
-			$ret = DocsboxLib::convert($inFile, $outFile, $format);
-		}
-		else // otherwise use unoconv
-		{
-			if ($this->unoconv_version == '0.6')
-				$command = 'unoconv -f %1$s  %3$s > %2$s';
-			else
-				$command = 'unoconv -f %s --output %s %s 2>&1';
-			$command = sprintf($command, $format, $outFile, $inFile);
-
-			$out = null;
-			exec($command, $out, $ret);
-		}
+		exec($command, $out, $ret);
 
 		if ($ret != 0)
 		{
@@ -220,7 +191,6 @@ class DocumentLib
 		$cmd .= '/countspaces {  [ exch { dup 32 ne { pop } if  } forall ] length } bind def  >> ';
 		$cmd .= 'setpagedevice viewJPEG"';
 
-		$out = null;
 		exec($cmd, $out, $ret);
 		if ($ret != 0)
 		{

application/libraries/IssuesLib.php

@@ -169,9 +169,6 @@ class IssuesLib
 		return $this->_changeIssueStatus($issue_id, $data, $user);
 	}
 
-	// --------------------------------------------------------------------------------------------------------------
-	// Private methods
-
 	/**
 	 * Changes status of an issue.
 	 * @param int $issue_id
@@ -218,15 +215,8 @@ class IssuesLib
 	 * @param string $inhalt_extern
 	 * @return object success or error
 	 */
-	private function _addIssue(
-		$fehlercode,
-		$person_id = null,
-		$oe_kurzbz = null,
-		$fehlertext_params = null,
-		$resolution_params = null,
-		$fehlercode_extern = null,
-		$inhalt_extern = null
-	) {
+	private function _addIssue($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null, $resolution_params = null, $fehlercode_extern = null, $inhalt_extern = null)
+	{
 		if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
 			return error("Person_id or oe_kurzbz must be set.");
 
@@ -236,15 +226,7 @@ class IssuesLib
 		if (hasData($fehlerRes))
 		{
 			$fehlertextVorlage = getData($fehlerRes)[0]->fehlertext;
-
-			$fehlertext = $fehlertextVorlage;
-			if (!isEmptyArray($fehlertext_params))
-			{
-				if (count($fehlertext_params) != substr_count($fehlertextVorlage, '%s'))
-					return error('Wrong number of parameters for Fehlertext, fehler_kurzbz ' . $fehlercode);
-
-				$fehlertext = vsprintf($fehlertextVorlage, $fehlertext_params);
-			}
+			$fehlertext = isEmptyArray($fehlertext_params) ? $fehlertextVorlage : vsprintf($fehlertextVorlage, $fehlertext_params);
 
 			$openIssuesCountRes = $this->_ci->IssueModel->getOpenIssueCount($fehlercode, $person_id, $oe_kurzbz, $fehlercode_extern);
 
@@ -270,7 +252,6 @@ class IssuesLib
 							return error("Invalid parameters for resolution");
 					}
 
-					// insert new issue
 					return $this->_ci->IssueModel->insert(
 						array(
 							'fehlercode' => $fehlercode,
@@ -286,8 +267,8 @@ class IssuesLib
 						)
 					);
 				}
-				else // return success if issue already exists
-					return success("Issue already exists");
+				else
+					return success($openIssueCount);
 			}
 			else
 				return error("Number of open issues could not be determined");

application/libraries/issues/CORE_INOUT_0006.php

@@ -15,6 +15,7 @@ class CORE_INOUT_0006 implements IIssueResolvedChecker
 		$this->_ci =& get_instance(); // get code igniter instance
 
 		$this->_ci->load->model('codex/Bisio_model', 'BisioModel');
+		//$this->_ci->load->model('codex/Aufenthaltfoerderung_model', 'AufenthaltfoerderungModel');
 
 		// get all Zwecke
 		$this->_ci->BisioModel->addSelect('ects_erworben');

application/libraries/issues/PlausicheckProducerLib.php

@@ -1,103 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-class PlausicheckProducerLib
-{
-	const CI_LIBRARY_PATH = 'application/libraries';
-	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
-	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
-
-	private $_ci; // ci instance
-	private $_currentStudiensemester; // current Studiensemester
-
-	// set fehler which can be produced by the job
-	// structure: fehler_kurzbz => class (library) name for resolving
-	private $_fehlerLibMappings = array(
-		'AbbrecherAktiv' => 'AbbrecherAktiv',
-		'AbschlussstatusFehlt' => 'AbschlussstatusFehlt',
-		'AktSemesterNull' => 'AktSemesterNull',
-		'AktiverStudentOhneStatus' => 'AktiverStudentOhneStatus',
-		'AktiverStudentstatusOhneKontobuchung' => 'AktiverStudentstatusOhneKontobuchung',
-		'AusbildungssemPrestudentUngleichAusbildungssemStatus' => 'AusbildungssemPrestudentUngleichAusbildungssemStatus',
-		'BewerberNichtZumRtAngetreten' => 'BewerberNichtZumRtAngetreten',
-		'DatumAbschlusspruefungFehlt' => 'DatumAbschlusspruefungFehlt',
-		'DatumSponsionFehlt' => 'DatumSponsionFehlt',
-		'DatumStudiensemesterFalscheReihenfolge' => 'DatumStudiensemesterFalscheReihenfolge',
-		'FalscheAnzahlAbschlusspruefungen' => 'FalscheAnzahlAbschlusspruefungen',
-		'FalscheAnzahlHeimatadressen' => 'FalscheAnzahlHeimatadressen',
-		'FalscheAnzahlZustelladressen' => 'FalscheAnzahlZustelladressen',
-		'GbDatumWeitZurueck' => 'GbDatumWeitZurueck',
-		'InaktiverStudentAktiverStatus' => 'InaktiverStudentAktiverStatus',
-		'IncomingHeimatNationOesterreich' => 'IncomingHeimatNationOesterreich',
-		'IncomingOhneIoDatensatz' => 'IncomingOhneIoDatensatz',
-		'IncomingOrGsFoerderrelevant' => 'IncomingOrGsFoerderrelevant',
-		'InskriptionVorLetzerBismeldung' => 'InskriptionVorLetzerBismeldung',
-		'NationNichtOesterreichAberGemeinde' => 'NationNichtOesterreichAberGemeinde',
-		'OrgformStgUngleichOrgformPrestudent' => 'OrgformStgUngleichOrgformPrestudent',
-		'PrestudentMischformOhneOrgform' => 'PrestudentMischformOhneOrgform',
-		'StgPrestudentUngleichStgStudienplan' => 'StgPrestudentUngleichStgStudienplan',
-		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
-		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
-		//'StudienplanUngueltig' => 'StudienplanUngueltig'
-	);
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance(); // get ci instance
-
-		// load models
-		$this->_ci->load->model('organisation/studiensemester_model', 'StudiensemesterModel');
-
-		// get current Studiensemester
-		$studiensemesterRes = $this->_ci->StudiensemesterModel->getAkt();
-		if (hasData($studiensemesterRes)) $this->_currentStudiensemester = getData($studiensemesterRes)[0]->studiensemester_kurzbz;
-	}
-
-	/**
-	 * Executes check for a fehler_kurzbz, returns the result.
-	 * @param $fehler_kurzbz string
-	 * @param $studiensemester_kurzbz string optionally needed for issue production
-	 * @param $studiengang_kz int optionally needed for issue production
-	 */
-	public function producePlausicheckIssue($fehler_kurzbz, $studiensemester_kurzbz = null, $studiengang_kz = null)
-	{
-		$libName = $this->_fehlerLibMappings[$fehler_kurzbz];
-
-		// get Studiensemester
-		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
-
-		// get path of library for issue to be produced
-		$issuesLibPath = DOC_ROOT . self::CI_LIBRARY_PATH . '/' . self::PLAUSI_ISSUES_FOLDER . '/';
-		$issuesLibFilePath = $issuesLibPath . $libName . '.php';
-
-		// check if library file exists
-		if (!file_exists($issuesLibFilePath)) return error("Issue library file " . $issuesLibFilePath . " does not exist");
-
-		// load library connected to fehlercode
-		$this->_ci->load->library(self::PLAUSI_ISSUES_FOLDER . '/'.$libName);
-
-		$lowercaseLibName = mb_strtolower($libName);
-
-		// check if method is defined in library class
-		if (!is_callable(array($this->_ci->{$lowercaseLibName}, self::EXECUTE_PLAUSI_CHECK_METHOD_NAME)))
-			return error("Method " . self::EXECUTE_PLAUSI_CHECK_METHOD_NAME . " is not defined in library $lowercaseLibName");
-
-		// pass the data needed for issue check
-		$paramsForCheck = array(
-			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'studiengang_kz' => $studiengang_kz
-		);
-
-		// call the function for checking for issue production
-		return $this->_ci->{$lowercaseLibName}->{self::EXECUTE_PLAUSI_CHECK_METHOD_NAME}($paramsForCheck);
-	}
-
-	/**
-	 * Gets all fehler_kurzbz for fehler which need to be checked.
-	 */
-	public function getFehlerKurzbz()
-	{
-		return array_keys($this->_fehlerLibMappings);
-	}
-}

application/libraries/issues/plausichecks/AbbrecherAktiv.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AbbrecherAktiv extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAbbrecherAktiv($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/AbschlussstatusFehlt.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AbschlussstatusFehlt extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/AktSemesterNull.php

@@ -1,50 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AktSemesterNull extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAktSemesterNull($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/AktiverStudentOhneStatus.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AktiverStudentOhneStatus extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAktiverStudentOhneStatus($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/AktiverStudentstatusOhneKontobuchung.php

@@ -1,50 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- * Student with active status should have been charged, i.e. have a Kontobuchung with negative or zero value.
- */
-class AktiverStudentstatusOhneKontobuchung extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAktiverStudentstatusOhneKontobuchung($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/AusbildungssemPrestudentUngleichAusbildungssemStatus.php

@@ -1,56 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class AusbildungssemPrestudentUngleichAusbildungssemStatus extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getAusbildungssemPrestudentUngleichAusbildungssemStatus(
-			$studiensemester_kurzbz,
-			$studiengang_kz
-		);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'status_ausbildungssemester' => $prestudent->status_ausbildungssemester,
-						'student_ausbildungssemester' => $prestudent->student_ausbildungssemester,
-						'student_uid' => $prestudent->student_uid,
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/BewerberNichtZumRtAngetreten.php

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class BewerberNichtZumRtAngetreten extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getBewerberNichtZumRtAngetreten($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array(
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz,
-						'prestudent_id' => $prestudent->prestudent_id
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/DatumAbschlusspruefungFehlt.php

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class DatumAbschlusspruefungFehlt extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumAbschlusspruefungFehlt($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'abschlusspruefung_id' => $prestudent->abschlusspruefung_id
-					),
-					'resolution_params' => array('abschlusspruefung_id' => $prestudent->abschlusspruefung_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/DatumSponsionFehlt.php

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class DatumSponsionFehlt extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumSponsionFehlt($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'abschlusspruefung_id' => $prestudent->abschlusspruefung_id
-					),
-					'resolution_params' =>  array('abschlusspruefung_id' => $prestudent->abschlusspruefung_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/DatumStudiensemesterFalscheReihenfolge.php

@@ -1,45 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class DatumStudiensemesterFalscheReihenfolge extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getDatumStudiensemesterFalscheReihenfolge($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/FalscheAnzahlAbschlusspruefungen.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscheAnzahlAbschlusspruefungen extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getFalscheAnzahlAbschlusspruefungen($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/FalscheAnzahlHeimatadressen.php

@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscheAnzahlHeimatadressen extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getFalscheAnzahlHeimatadressen($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'resolution_params' => array('person_id' => $person->person_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/FalscheAnzahlZustelladressen.php

@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class FalscheAnzahlZustelladressen extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getFalscheAnzahlZustelladressen($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'resolution_params' => array('person_id' => $person->person_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/GbDatumWeitZurueck.php

@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class GbDatumWeitZurueck extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getGbDatumWeitZurueck($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'resolution_params' => array('person_id' => $person->person_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/InaktiverStudentAktiverStatus.php

@@ -1,47 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class InaktiverStudentAktiverStatus extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getInaktiverStudentAktiverStatus($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php

@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class IncomingHeimatNationOesterreich extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getIncomingHeimatNationOesterreich($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'resolution_params' => array('person_id' => $person->person_id, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/IncomingOhneIoDatensatz.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class IncomingOhneIoDatensatz extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getIncomingOhneIoDatensatz($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/IncomingOrGsFoerderrelevant.php

@@ -1,44 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class IncomingOrGsFoerderrelevant extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/InskriptionVorLetzerBismeldung.php

@@ -1,51 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class InskriptionVorLetzerBismeldung extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getInskriptionVorLetzerBismeldung($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'datum_bismeldung' => date_format(date_create($prestudent->datum_bismeldung), 'd.m.Y'),
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/NationNichtOesterreichAberGemeinde.php

@@ -1,42 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class NationNichtOesterreichAberGemeinde extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$personRes = $this->_ci->plausichecklib->getNationNichtOesterreichAberGemeinde($studiengang_kz);
-
-		if (isError($personRes)) return $personRes;
-
-		if (hasData($personRes))
-		{
-			$persons = getData($personRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($persons as $person)
-			{
-				$results[] = array(
-					'person_id' => $person->person_id,
-					'fehlertext_params' => array('gemeinde' => $person->gemeinde, 'adresse_id' => $person->adresse_id),
-					'resolution_params' => array('adresse_id' => $person->adresse_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/OrgformStgUngleichOrgformPrestudent.php

@@ -1,52 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class OrgformStgUngleichOrgformPrestudent extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getOrgformStgUngleichOrgformPrestudent($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'student_studiengang' => $prestudent->student_studiengang,
-						'student_orgform' => $prestudent->student_orgform,
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/PlausiChecker.php

@@ -1,24 +0,0 @@
-<?php
-
-/**
- * class defining ressources and method to use for plausicheck issue producer
- */
-abstract class PlausiChecker
-{
-	protected $_ci; // code igniter instance
-
-	public function __construct()
-	{
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		// load libraries
-		$this->_ci->load->library('issues/PlausicheckLib'); // load plausicheck library
-	}
-
-	/**
-	 * Executes a plausi check.
-	 * @param $paramsForChecking array parameters needed for executing the check
-	 * @return array with objects which failed the plausi check
-	 */
-	abstract public function executePlausiCheck($paramsForChecking);
-}

application/libraries/issues/plausichecks/PrestudentMischformOhneOrgform.php

@@ -1,50 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class PrestudentMischformOhneOrgform extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getPrestudentMischformOhneOrgform($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudent.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StgPrestudentUngleichStgStudent extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudent($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/StgPrestudentUngleichStgStudienplan.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StgPrestudentUngleichStgStudienplan extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudienplan($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id, 'studienplan' => $prestudent->studienplan),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id, 'studienordnung_id' => $prestudent->studienordnung_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/StudentstatusNachAbbrecher.php

@@ -1,43 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StudentstatusNachAbbrecher extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStudentstatusNachAbbrecher($studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array('prestudent_id' => $prestudent->prestudent_id),
-					'resolution_params' => array('prestudent_id' => $prestudent->prestudent_id)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/plausichecks/StudienplanUngueltig.php

@@ -1,51 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-require_once('PlausiChecker.php');
-
-/**
- *
- */
-class StudienplanUngueltig extends PlausiChecker
-{
-	public function executePlausiCheck($params)
-	{
-		$results = array();
-
-		// pass parameters needed for plausicheck
-		$studiensemester_kurzbz = isset($params['studiensemester_kurzbz']) ? $params['studiensemester_kurzbz'] : null;
-		$studiengang_kz = isset($params['studiengang_kz']) ? $params['studiengang_kz'] : null;
-
-		// get all students failing the plausicheck
-		$prestudentRes = $this->_ci->plausichecklib->getStudienplanUngueltig($studiensemester_kurzbz, $studiengang_kz);
-
-		if (isError($prestudentRes)) return $prestudentRes;
-
-		if (hasData($prestudentRes))
-		{
-			$prestudents = getData($prestudentRes);
-
-			// populate results with data necessary for writing issues
-			foreach ($prestudents as $prestudent)
-			{
-				$results[] = array(
-					'person_id' => $prestudent->person_id,
-					'oe_kurzbz' => $prestudent->prestudent_stg_oe_kurzbz,
-					'fehlertext_params' => array(
-						'studienplan' => $prestudent->studienplan,
-						'ausbildungssemester' => $prestudent->ausbildungssemester,
-						'prestudent_id' => $prestudent->prestudent_id
-					),
-					'resolution_params' => array(
-						'prestudent_id' => $prestudent->prestudent_id,
-						'studiensemester_kurzbz' => $prestudent->studiensemester_kurzbz
-					)
-				);
-			}
-		}
-
-		// return the results
-		return success($results);
-	}
-}

application/libraries/issues/resolvers/CORE_INOUT_0007.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_INOUT_0007 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
-			return error('Person Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingHeimatNationOesterreich($params['studiensemester_kurzbz'], null, $params['issue_person_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_INOUT_0008.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_INOUT_0008 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingOhneIoDatensatz(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_INOUT_0009.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming or external GS student should not be foerderrelevant.
- */
-class CORE_INOUT_0009 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getIncomingOrGsFoerderrelevant(null, null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_PERSON_0001.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_PERSON_0001 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
-			return error('Person Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getGbDatumWeitZurueck(null, null, $params['issue_person_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_PERSON_0002.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_PERSON_0002 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
-			return error('Person Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getNationNichtOesterreichAberGemeinde(null, $params['issue_person_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_PERSON_0003.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_PERSON_0003 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
-			return error('Person Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlHeimatadressen(null, null, $params['issue_person_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_PERSON_0004.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_PERSON_0004 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['issue_person_id']) || !is_numeric($params['issue_person_id']))
-			return error('Person Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlZustelladressen(null, null, $params['issue_person_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STG_0001.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STG_0001 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudent(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STG_0002.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STG_0002 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getOrgformStgUngleichOrgformPrestudent($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STG_0003.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STG_0003 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getPrestudentMischformOhneOrgform($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STG_0004.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STG_0004 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studienordnung_id']) || !is_numeric($params['studienordnung_id']))
-			return error('Studienordnung Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStgPrestudentUngleichStgStudienplan(null, $params['prestudent_id'], $params['studienordnung_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0001.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0001 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAbbrecherAktiv(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0002.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0002 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStudentstatusNachAbbrecher(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0003.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0003 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAusbildungssemPrestudentUngleichAusbildungssemStatus($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0004.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0004 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getInaktiverStudentAktiverStatus($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0005.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0005 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getInskriptionVorLetzerBismeldung($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0006.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0006 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumStudiensemesterFalscheReihenfolge(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0007.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0007 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAktiverStudentOhneStatus(null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0008.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0008 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getStudienplanUngueltig($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0009.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0009 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getFalscheAnzahlAbschlusspruefungen(null, null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0010.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0010 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['abschlusspruefung_id']) || !is_numeric($params['abschlusspruefung_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumAbschlusspruefungFehlt(null, null, $params['abschlusspruefung_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0011.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0011 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['abschlusspruefung_id']) || !is_numeric($params['abschlusspruefung_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getDatumSponsionFehlt(null, null, $params['abschlusspruefung_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0012.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0012 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getBewerberNichtZumRtAngetreten($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0013.php

@@ -1,32 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0013 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAktSemesterNull($params['studiensemester_kurzbz'], null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0014.php

@@ -1,29 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Incoming shouldn't have austrian home address.
- */
-class CORE_STUDENTSTATUS_0014 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAbschlussstatusFehlt(null, null, $params['prestudent_id']);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/libraries/issues/resolvers/CORE_STUDENTSTATUS_0015.php

@@ -1,36 +0,0 @@
-<?php
-
-if (! defined('BASEPATH')) exit('No direct script access allowed');
-
-/**
- * Student with active status should have been charged, i.e. have a Kontobuchung with negative or zero value.
- */
-class CORE_STUDENTSTATUS_0015 implements IIssueResolvedChecker
-{
-	public function checkIfIssueIsResolved($params)
-	{
-		if (!isset($params['prestudent_id']) || !is_numeric($params['prestudent_id']))
-			return error('Prestudent Id missing, issue_id: '.$params['issue_id']);
-
-		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
-			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
-
-		$this->_ci =& get_instance(); // get code igniter instance
-
-		$this->_ci->load->library('issues/PlausicheckLib');
-
-		// check if issue persists
-		$checkRes = $this->_ci->plausichecklib->getAktiverStudentstatusOhneKontobuchung(
-			$params['studiensemester_kurzbz'],
-			null,
-			$params['prestudent_id']
-		);
-
-		if (isError($checkRes)) return $checkRes;
-
-		if (hasData($checkRes))
-			return success(false); // not resolved if issue is still present
-		else
-			return success(true); // resolved otherwise
-	}
-}

application/models/CL/Messages_model.php

@@ -1,23 +1,4 @@
 <?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/>.
- */
-
-use \stdClass as stdClass;
-use \DateTime as DateTime;
 
 /**
  * Messages GUI logic
@@ -46,7 +27,6 @@ class Messages_model extends CI_Model
 	const TYPE_PRESTUDENTS = 'prestudents';
 
 	const ALT_OE = 'infocenter'; // alternative organisation unit when no one is found for a presetudent
-	const SYSTEM_SENDER_NAME = 'System sender';
 
 	/**
 	 * Constructor
@@ -70,11 +50,7 @@ class Messages_model extends CI_Model
 		$this->load->model('crm/Prestudent_model', 'PrestudentModel');
 		// Loads model Benutzer_model
 		$this->load->model('person/Benutzer_model', 'BenutzerModel');
-		// Loads model Studiengang_model
-		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
-		// Loads model Organisationseinheitsmodel
-		$this->load->model('organisation/Organisationseinheit_model', 'OrganisationseinheitModel');
+		
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -152,8 +128,8 @@ class Messages_model extends CI_Model
 			{
 				$ouOptions .= sprintf(
 					"\n".'<option value="%s">%s</option>',
-					($ou->typ === 'l' ? $ou->oe_kurzbz : (is_numeric($ou->prestudent_id) ? $ou->oe_kurzbz : self::ALT_OE)),
-					$ou->bezeichnung . ((is_numeric($ou->prestudent_id) || $ou->typ === 'l' ) ? '' : ' *')
+					is_numeric($ou->prestudent_id) ? $ou->oe_kurzbz : self::ALT_OE,
+					$ou->bezeichnung . (is_numeric($ou->prestudent_id) ? '' : ' *')
 				);
 			}
 		}
@@ -225,23 +201,12 @@ class Messages_model extends CI_Model
 				$jsonRecord->message_id = $receivedMessage->message_id;
 				$jsonRecord->subject = $receivedMessage->subject;
 				$jsonRecord->body = $receivedMessage->body;
+				$jsonRecord->from = $receivedMessage->vorname.' '.$receivedMessage->nachname;
 				$sentDate = new DateTime($receivedMessage->sent);
 				$jsonRecord->sent = $sentDate->format('d/m/Y H:i:s');
-				$jsonRecord->status = $receivedMessage->lastStatus;
-				$jsonRecord->statusPersonId = $receivedMessage->senderPersonId;
+				$jsonRecord->status = $receivedMessage->status;
+				$jsonRecord->statusPersonId = $receivedMessage->statuspersonid;
 				$jsonRecord->token = $receivedMessage->token;
-				$jsonRecord->from = self::SYSTEM_SENDER_NAME; // default fallback
-
-				// If the sender id is the system sender then use the organisation unit
-				if ($receivedMessage->senderPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID))
-				{
-					// If the oe exists
-					if (!isEmptyString($receivedMessage->oe)) $jsonRecord->from = $receivedMessage->oe;
-				}
-				else // otherwise use the name and surname of the person sender
-				{
-					$jsonRecord->from = $receivedMessage->senderName.' '.$receivedMessage->senderSurname;
-				}
 
 				$jsonArray[] = $jsonRecord;
 			}
@@ -275,20 +240,17 @@ class Messages_model extends CI_Model
 				$jsonRecord->body = $sentMessage->body;
 				$sentDate = new DateTime($sentMessage->sent);
 				$jsonRecord->sent = $sentDate->format('d/m/Y H:i:s');
-				$jsonRecord->status = $sentMessage->lastStatus;
-				$jsonRecord->statusPersonId = $sentMessage->senderPersonId;
+				$jsonRecord->status = $sentMessage->status;
+				$jsonRecord->statusPersonId = $sentMessage->statuspersonid;
 				$jsonRecord->token = $sentMessage->token;
-				$jsonRecord->to = self::SYSTEM_SENDER_NAME; // default fallback
 
-				// If the recipient id is the system sender then use the organisation unit
-				if ($sentMessage->recipientPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID))
+				if ($sentMessage->person_id == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID))
 				{
-					// If the oe exists
-					if (!isEmptyString($sentMessage->oe)) $jsonRecord->to = $sentMessage->oe;
+					$jsonRecord->to = $sentMessage->oe;
 				}
-				else // otherwise use the name and surname of the person recipient
+				else
 				{
-					$jsonRecord->to = $sentMessage->recipientName.' '.$sentMessage->recipientSurname;
+					$jsonRecord->to = $sentMessage->vorname.' '.$sentMessage->nachname;
 				}
 
 				$jsonArray[] = $jsonRecord;
@@ -318,42 +280,18 @@ class Messages_model extends CI_Model
 		$srmsbtResult = $this->MessageTokenModel->setReadMessageStatusByToken($token);
 		if (isError($srmsbtResult)) show_error(getError($srmsbtResult));
 
-		// Sender name
-		$sender = self::SYSTEM_SENDER_NAME; // default fallback
+		// Retrieves message sender information
+		$senderResult = $this->MessageTokenModel->getSenderData($message->sender_id);
+		if (isError($senderResult)) show_error(getError($senderResult));
+		if (!hasData($senderResult)) show_error('No sender information found');
 
-		// If the sender is a person
-		if ($message->sender_id != $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID))
-		{
-			// Retrieves message sender information
-			$senderResult = $this->MessageTokenModel->getSenderData($message->sender_id);
-			if (isError($senderResult)) show_error(getError($senderResult));
-			if (!hasData($senderResult)) show_error('No sender information found');
+		$sender = getData($senderResult)[0]; // Found sender data
 
-			$sender = getData($senderResult)[0]->vorname.' '.getData($senderResult)[0]->nachname;
-		}
-		else // otherwise if the sender is an organization unit (degree program)
-		{
-			// Looks into the degree programs
-			$ouResult = $this->StudiengangModel->loadWhere(array('oe_kurzbz' => $message->oe_kurzbz));
-
-			if (isError($ouResult)) show_error(getError($ouResult));
-
-			// If not found here
-			if (!hasData($ouResult))
-			{
-				// Then looks into the organisation units
-				$ouResult = $this->OrganisationseinheitModel->loadWhere(array('oe_kurzbz' => $message->oe_kurzbz));
-
-				if (isError($ouResult)) show_error(getError($ouResult));
-			}
-
-			// If found then set it, otherwise the fallback is used
-			if (hasData($ouResult)) $sender = getData($ouResult)[0]->bezeichnung;
-		}
-
-		// If the sender is not the system sender and configurations to reply exist
+		// If the sender is not the system sender and the receiver is not the system sender
+		// and are present configurations to reply
 		$hrefReply = '';
 		if ($message->sender_id != $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID)
+			&& $message->receiver_id != $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID)
 			&& !isEmptyString($this->config->item(MessageLib::CFG_REDIRECT_VIEW_MESSAGE_URL)))
 		{
 			$hrefReply = $this->config->item(MessageLib::CFG_MESSAGE_SERVER).
@@ -469,7 +407,7 @@ class Messages_model extends CI_Model
 		{
 			// Merge receivers data with logged in user data
 			$msgVarsDataArray = $this->_addMsgVarsDataOfLoggedInUser($receiver);
-
+	
 			$msgVarsDataArray = $this->_lowerReplaceSpaceArrayKeys((array)getData($msgVarsDataArray)[0]); // replaces array keys
 			$parsedSubject = parseText($subject, $msgVarsDataArray);
 			$parsedBody = parseText($body, $msgVarsDataArray);
@@ -508,7 +446,7 @@ class Messages_model extends CI_Model
 
 		return success('Messages sent successfully');
 	}
-
+	
 	/**
 	 * Wrapper method for sendExplicitTemplateSenderId
 	 * The sender id is retrieved from the authentication session, if not present an error would be raised
@@ -521,7 +459,7 @@ class Messages_model extends CI_Model
 
 		return $this->sendExplicitTemplateSenderId($sender_id, $prestudents, $oe_kurzbz, $vorlage_kurzbz, $msgVars);
 	}
-
+	
 	/**
 	 * Sends a new message using the given template and information present in parameter prestudents
 	 * Extra variables can be added using parameter $msgVars
@@ -534,28 +472,28 @@ class Messages_model extends CI_Model
 		if (!hasData($msgVarsData)) show_error('No recipients were given');
 
 		$prestudentsData = $this->PrestudentModel->getOrganisationunits($prestudents);
-
+		
 		// Get the senders uid (if user is an active employee)
 		$this->BenutzerModel->addSelect('uid');
 		$this->BenutzerModel->addJoin('public.tbl_mitarbeiter ma', 'ma.mitarbeiter_uid = uid');
-		$benutzerResult = $this->BenutzerModel->getFromPersonId($sender_id);
-		if (isError($benutzerResult)) show_error(getError($benutzerResult));
-		if (!hasData($benutzerResult)) show_error('No sender uid found');
-
-		$sender_uid = getData($benutzerResult)[0]->uid;
+		if (!$result = getData($this->BenutzerModel->getFromPersonId($sender_id)))
+		{
+			show_error('No sender_uid found');
+		}
+		$sender_uid = $result[0]->uid;
 
 		// Adds the organisation unit to each prestudent
 		if (isEmptyString($oe_kurzbz) && hasData($msgVarsData) && hasData($prestudentsData))
 		{
-			$this->_addOeToPrestudents($msgVarsData, $prestudentsData);
+			$this->CLMessagesModel->_addOeToPrestudents($msgVarsData, $prestudentsData);
 		}
 
 		foreach (getData($msgVarsData) as $receiver)
 		{
 			/**
 			 * Merge receivers data with senders data
-			 * NOTE: _addMsgVarsDataOfLoggedInUser usually retrieves data of the logged in user that is set in the
-			 * templates user fields. As sendExplicitTemplateSenderId is run by a job, a sender uid is passed to be used
+			 * NOTE: _addMsgVarsDataOfLoggedInUser usually retrieves data of the logged in user that is set in the 
+			 * templates user fields. As sendExplicitTemplateSenderId is run by a job, a sender uid is passed to be used 
 			 * instead the logged in user.
 			 */
 			$msgVarsDataArray = $this->_addMsgVarsDataOfLoggedInUser($receiver, $sender_uid);
@@ -602,6 +540,8 @@ class Messages_model extends CI_Model
 		if (isError($senderResult)) show_error(getError($senderResult));
 		if (!hasData($senderResult)) show_error('No sender information found');
 
+		$sender = getData($senderResult)[0]; // Found sender data
+
 		$messageResult = $this->MessageTokenModel->getMessageByToken($token);
 		if (isError($messageResult)) show_error(getError($messageResult));
 		// Security check! It is possible to reply only to a received message!!
@@ -696,7 +636,7 @@ class Messages_model extends CI_Model
 		$parseMessageText = error('The given person_id is not a valid number');
 
 		if (is_numeric($person_id)) $parseMessageText = $this->MessageModel->getMsgVarsDataByPersonId($person_id);
-
+		
 		// Add message vars data of the logged in user
 		$parseMessageText = $this->_addMsgVarsDataOfLoggedInUser($parseMessageText);
 
@@ -722,10 +662,10 @@ class Messages_model extends CI_Model
 		$parseMessageText = error('The given prestudent_id is not a valid number');
 
 		if (is_numeric($prestudent_id)) $parseMessageText = $this->MessageModel->getMsgVarsDataByPrestudentId($prestudent_id);
-
+		
 		// Add message vars data of the logged in user
 		$parseMessageText = $this->_addMsgVarsDataOfLoggedInUser($parseMessageText);
-
+		
 		if (hasData($parseMessageText))
 		{
 			$parseMessageText = success(
@@ -761,17 +701,6 @@ class Messages_model extends CI_Model
 		}
 	}
 
-	/**
-	 * Returns all the received and sent messages for the given person
-	 */
-	public function getReceivedAndSentMessages($person_id)
-	{
-		return $this->RecipientModel->getReceivedAndSentMessages(
-			$person_id,
-			$this->config->item(MessageLib::CFG_OU_RECEIVERS)
-		);
-	}
-
 	//------------------------------------------------------------------------------------------------------------------
 	// Private methods
 
@@ -842,10 +771,7 @@ class Messages_model extends CI_Model
 	{
 		return sprintf(
 			self::REPLY_BODY_FORMAT,
-			date_format(date_create($sentDate), 'd.m.Y H:i'),
-			$receiverName,
-			$receiverSurname,
-			$body
+			date_format(date_create($sentDate), 'd.m.Y H:i'), $receiverName, $receiverSurname, $body
 		);
 	}
 
@@ -949,14 +875,14 @@ class Messages_model extends CI_Model
 
 			$variables[] = $tmpVar;
 		}
-
+		
 		// ---------------------------------------------------------------------------------------
 		// Retrieves message vars of logged in user from database view vw_msg_vars_person
 		$result = null;
-
+		
 		// If data contains a prestudent id
 		$result = $this->messagelib->getMessageVarsLoggedInUser();
-
+		
 		if (isError($result)) show_error(getError($result));
 
 		// Then builds an array that contains objects with field name and field description of logged in user data
@@ -966,7 +892,7 @@ class Messages_model extends CI_Model
 			$obj = new stdClass();
 			$obj->id = $id;
 			$obj->description = $description;
-
+			
 			$user_fields[] = $obj;
 		}
 
@@ -998,32 +924,30 @@ class Messages_model extends CI_Model
 			'type' => $type
 		);
 	}
-
+	
 	/**
 	 * Adds message vars data of the logged in user to the given object (that should also have message vars data)
 	 * @param object $otherMsgVarsDataObj Can be success object or simple object.
 	 * @return object Returns success object.
 	 */
-	private function _addMsgVarsDataOfLoggedInUser($otherMsgVarsDataObj, $uid = null)
+	public function _addMsgVarsDataOfLoggedInUser($otherMsgVarsDataObj, $uid = null)
 	{
 		// First check if param type is object
 		if (!is_object($otherMsgVarsDataObj)) show_error('Must pass an object to merge with data of logged in user');
-
+		
 		// If it is a return object, extract the simple data object
-		if (isSuccess($otherMsgVarsDataObj)) $otherMsgVarsDataObj = getData($otherMsgVarsDataObj)[0];
-
+		if (isSuccess($otherMsgVarsDataObj))
+		{
+			$otherMsgVarsDataObj = getData($otherMsgVarsDataObj)[0];
+		}
+		
 		// Retrieve message vars data of the logged in user
-		$msgVarsDataLoggedInUserResult = $this->MessageModel->getMsgVarsDataByLoggedInUser($uid);
-		if (isError($msgVarsDataLoggedInUserResult)) show_error(getError($msgVarsDataLoggedInUserResult));
-
-		// If no data have been found return only the given otherMsgVarsDataObj
-		if (!hasData($msgVarsDataLoggedInUserResult)) return success(array($otherMsgVarsDataObj));
-
-		// Otherwise get them...
-		$msgVarsDataLoggedInUser = getData($this->MessageModel->getMsgVarsDataByLoggedInUser($uid))[0];
-
-		// ...and return them merged with the otherMsgVarsDataObj
-		return success(array((object)(array_merge((array)$otherMsgVarsDataObj, (array)$msgVarsDataLoggedInUser))));
+		if (!$msgVarsDataLoggedInUser = getData($this->MessageModel->getMsgVarsDataByLoggedInUser($uid))[0])
+		{
+			return success($otherMsgVarsDataObj);   // If failed, return at least given object as expected success object
+		}
+		
+		return success(array((object)(array_merge((array) $otherMsgVarsDataObj, (array) $msgVarsDataLoggedInUser))));
+		
 	}
 }
-

application/models/crm/Akte_model.php

@@ -171,7 +171,7 @@ class Akte_model extends DB_Model
 	 * @param bool $nachgereicht if true, retrieves only nachgereichte Dokumente. if false, only not nachgereichte. default: null, all Dokumente
 	 * @return array
 	 */
-	public function getAktenWithDokInfo($person_id, $dokument_kurzbz = null, $nachgereicht = null, $archiv = null)
+	public function getAktenWithDokInfo($person_id, $dokument_kurzbz = null, $nachgereicht = null)
 	{
 		$this->addSelect('public.tbl_akte.*, bezeichnung_mehrsprachig, dokumentbeschreibung_mehrsprachig, public.tbl_dokument.bezeichnung as dokument_bezeichnung, bis.tbl_nation.*, ausstellungsdetails');
 		$this->addJoin('public.tbl_dokument', 'dokument_kurzbz');
@@ -184,9 +184,6 @@ class Akte_model extends DB_Model
 		if(is_bool($nachgereicht))
 			$where['nachgereicht'] = $nachgereicht;
 
-		if (is_bool($archiv))
-			$where['archiv'] = $archiv;
-
 		$dokumente = $this->loadWhere($where);
 
 		if($dokumente->error) return $dokumente;

application/models/crm/Prestudent_model.php

@@ -309,39 +309,13 @@ class Prestudent_model extends DB_Model
 	 */
 	public function getLastPrestudent($person_id, $withzgv = false)
 	{
-		$qry = 'SELECT * FROM public.tbl_prestudent ps
+		$qry = 'SELECT * FROM public.tbl_prestudent
+				WHERE person_id = ?
 				%s
-				WHERE ps.person_id = ?
 				ORDER BY updateamum DESC NULLS LAST, insertamum DESC NULLS LAST
 				LIMIT 1';
 
-		$zgvwhere = '';
-		if ($withzgv === true)
-		{
-			$zgvwhere = '
-				LEFT JOIN (
-					SELECT ps2.zgvmas_code,
-						ps2.zgvmanation,
-						ps2.zgvmadatum,
-						ps2.zgvmaort,
-						ps2.zgvmas_erfuellt,
-						ps2.person_id
-					FROM tbl_prestudent ps2
-					WHERE zgvmas_code IS NOT NULL
-					ORDER BY updateamum DESC NULLS LAST, insertamum DESC NULLS LAST
-				) zgvmas ON zgvmas.person_id = ps.person_id
-				LEFT JOIN (
-					SELECT ps2.zgv_code,
-						ps2.zgvnation,
-						ps2.zgvdatum,
-						ps2.zgvort,
-						ps2.zgv_erfuellt,
-						ps2.person_id
-					FROM tbl_prestudent ps2
-					WHERE zgv_code IS NOT NULL
-					ORDER BY updateamum DESC NULLS LAST, insertamum DESC NULLS LAST
-				)zgv ON zgv.person_id = ps.person_id';
-		}
+		$zgvwhere = $withzgv === true ? 'AND zgv_code IS NOT NULL' : '';
 
 		$qry = sprintf($qry, $zgvwhere);
 
@@ -586,10 +560,9 @@ class Prestudent_model extends DB_Model
 						o.bezeichnung,
 						(CASE
 							WHEN sg.typ = \'b\' THEN ps.prestudent_id
-							WHEN sg.typ = \'m\' THEN mps.prestudent_id
+							WHEN sg.typ = \'m\' THEN ps.prestudent_id
             				ELSE NULL
-       					END) AS prestudent_id,
-       					sg.typ
+       					END) AS prestudent_id
 					FROM public.tbl_prestudent p
 			  		JOIN public.tbl_studiengang sg USING(studiengang_kz)
 					JOIN public.tbl_organisationseinheit o USING(oe_kurzbz)
@@ -598,17 +571,11 @@ class Prestudent_model extends DB_Model
 							  FROM public.tbl_prestudentstatus
 							 WHERE status_kurzbz = \'Bewerber\'
 						) ps USING(prestudent_id)
-				LEFT JOIN (
-					SELECT prestudent_id
-					FROM public.tbl_prestudentstatus
-					WHERE status_kurzbz = \'Interessent\' AND bestaetigtam IS NOT NULL
-				) mps ON p.prestudent_id = mps.prestudent_id
 				   WHERE p.person_id = ?
 				GROUP BY o.oe_kurzbz,
 						o.bezeichnung,
 						sg.typ,
 						ps.prestudent_id,
-						mps.prestudent_id,
 						p.prestudent_id
 				ORDER BY o.bezeichnung';
 

application/models/crm/Reihungstest_model.php

@@ -1,20 +1,4 @@
 <?php
-/**
- * Copyright (C) 2022 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/>.
- */
 
 class Reihungstest_model extends DB_Model
 {
@@ -26,8 +10,8 @@ class Reihungstest_model extends DB_Model
 		parent::__construct();
 		$this->dbTable = 'public.tbl_reihungstest';
 		$this->pk = 'reihungstest_id';
-	}
-
+	}	
+	
 	/**
 	 * Gets a test from a test id only if it is available
 	 */
@@ -51,15 +35,15 @@ class Reihungstest_model extends DB_Model
 								 WHERE rt_id = tbl_reihungstest.reihungstest_id
 							) > 0
 					  AND reihungstest_id = ?';
-
+		
 		return $this->execQuery($query, array($reihungstest_id));
 	}
-
+	
 	/**
 	 * Checks if there are active studyplans which have no public placement tests assigned yet.
 	 * Only check assignment to studyplans that are
-	 *	- Bachelor,
-	 *	- active,
+	 *	- Bachelor, 
+	 *	- active, 
 	 *	- set as online application
 	 *  - valid for 1st terms
 	 * @return array Returns object array with studyplans that have no public placement tests assigned yet.
@@ -67,20 +51,20 @@ class Reihungstest_model extends DB_Model
 	public function checkMissingReihungstest()
 	{
 		$query = '
-			SELECT
+			SELECT 
 				bezeichnung
 			FROM
 				lehre.tbl_studienplan
 			WHERE
 				studienplan_id
-			IN
+			IN 
 			(
-				SELECT DISTINCT
+				SELECT DISTINCT 
 					studienplan_id
-				FROM
+				FROM 
 					public.tbl_studiensemester
 				JOIN
-					lehre.tbl_studienplan_semester
+					lehre.tbl_studienplan_semester 
 					USING (studiensemester_kurzbz)
 				JOIN
 					lehre.tbl_studienplan
@@ -97,31 +81,31 @@ class Reihungstest_model extends DB_Model
 					tbl_studiensemester.onlinebewerbung = \'t\'
 				AND
 					tbl_studienplan.onlinebewerbung_studienplan = \'t\'
-				AND
+				AND 
 					semester = 1
 				AND
 					typ = \'b\'
 
 				EXCEPT
 
-				SELECT DISTINCT
+				SELECT DISTINCT 
 					studienplan_id
-				FROM
-					public.tbl_reihungstest
+				FROM 
+					public.tbl_reihungstest 
 				JOIN
 					public.tbl_rt_studienplan
 					USING (reihungstest_id)
-				WHERE
-					datum >= now()
-				AND
+				WHERE 
+					datum >= now() 
+				AND 
 					oeffentlich = \'t\'
 				)
 			';
-
+		
 		return $this->execQuery($query);
 	}
-
-	/**
+	
+	/**	
 	 *  Gets amount of free places.
 	 * @return array Returns object array with faculty and amount of free places
 	 * for each public actual placement test date.
@@ -148,9 +132,9 @@ class Reihungstest_model extends DB_Model
 							SELECT
 								sum(arbeitsplaetze) - ceil(sum(arbeitsplaetze)/100.0*'. REIHUNGSTEST_ARBEITSPLAETZE_SCHWUND. ')
 							FROM
-								public.tbl_rt_ort
+								public.tbl_rt_ort  
 							JOIN
-								public.tbl_ort
+								public.tbl_ort 
 							ON (tbl_rt_ort.ort_kurzbz = tbl_ort.ort_kurzbz)
 							WHERE
 								tbl_rt_ort.rt_id = tbl_reihungstest.reihungstest_id
@@ -186,27 +170,27 @@ class Reihungstest_model extends DB_Model
 										oe_kurzbz
 									FROM
 										public.tbl_rt_studienplan
-									JOIN
+									JOIN 	
 										lehre.tbl_studienplan sp USING (studienplan_id)
-									JOIN
+									JOIN 
 										lehre.tbl_studienordnung USING (studienordnung_id)
 									JOIN
 										public.tbl_studiengang sg USING (studiengang_kz)
 										WHERE
 										tbl_rt_studienplan.reihungstest_id = tbl_reihungstest.reihungstest_id
 								)
-							AND
+							AND 
 								aktiv = true
-
+								
 							UNION ALL
-
+							
 							SELECT
 								o.oe_kurzbz, o.oe_parent_kurzbz, o.organisationseinheittyp_kurzbz
 							FROM
 								public.tbl_organisationseinheit o, meine_oes
 							WHERE
 								o.oe_kurzbz = meine_oes.oe_parent_kurzbz
-							AND
+							AND 
 								aktiv = true
 						)
 					SELECT
@@ -223,7 +207,7 @@ class Reihungstest_model extends DB_Model
 			JOIN
 				public.tbl_studiengang
 				USING (studiengang_kz)
-			WHERE
+			WHERE 
 				tbl_reihungstest.datum >= now()
 			AND
 				tbl_reihungstest.oeffentlich = \'t\'
@@ -237,10 +221,10 @@ class Reihungstest_model extends DB_Model
 			fakultaet,
 			freie_plaetze
 		';
-
+		
 		return $this->execQuery($query);
 	}
-
+	
 	/**
 	 * Checks if a registration date (Anmeldefrist) of a placement test has been reached yesterday.
 	 * @param integer $studiengang_kz Optional. Kennzahl of degree program whose registration date should be checked.
@@ -255,9 +239,9 @@ class Reihungstest_model extends DB_Model
 					SELECT CURRENT_DATE - 1
 					)
 			';
-
+		
 		$parametersArray = array();
-
+		
 		if (!isEmptyString($studiengang_kz))
 		{
 			$query .= ' AND studiengang_kz = ?';
@@ -266,7 +250,7 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, $parametersArray);
 	}
-
+	
 	/**
 	 * Loads all applicants of a placement test for runZentraleReihungstestAnmeldefristAssistenzJob
 	 * @param integer $reihungstest_id ID of placement test
@@ -342,11 +326,11 @@ class Reihungstest_model extends DB_Model
 				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
 				AND bewerbung_abgeschicktamum IS NOT NULL
 				AND bestaetigtam IS NOT NULL
-			ORDER BY studiengang_kz,
-				orgform_kurzbz,
-				prioritaet,
-				nachname,
-				vorname,
+			ORDER BY studiengang_kz, 
+				orgform_kurzbz, 
+				prioritaet, 
+				nachname, 
+				vorname, 
 				person_id
 			';
 
@@ -448,46 +432,43 @@ class Reihungstest_model extends DB_Model
 	}
 
 	/**
-	 * Loads all applicants of a placement test
-	 * @param integer $reihungstest_id ID of placement test
-	 * @return array Returns object array with data of applicants.
-	 */
+ * Loads all applicants of a placement test
+ * @param integer $reihungstest_id ID of placement test
+ * @return array Returns object array with data of applicants.
+ */
 	public function getApplicantsOfPlacementTest($reihungstest_id)
 	{
 		$query = '
-		SELECT *
-		FROM
-		(SELECT DISTINCT tbl_rt_person.person_id, ps.prestudent_id, anrede, nachname, vorname,
-		 (
-		  SELECT kontakt
-		  FROM PUBLIC.tbl_kontakt
-		  WHERE kontakttyp = \'email\'
-		   AND zustellung = true
-		   AND person_id = tbl_rt_person.person_id
-		  ORDER BY insertamum DESC,
-		   updateamum DESC LIMIT 1
-		  ) AS "email",
-		 tbl_ort.planbezeichnung,
-		 tbl_ort.lageplan,
-		 sg.oe_kurzbz,
-		row_number () over (partition by tbl_rt_person.person_id order by ps.priorisierung) as row_number
-		FROM PUBLIC.tbl_rt_person
-		JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
-		JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = reihungstest_id)
-		JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
-		JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
-		JOIN PUBLIC.tbl_studiengang sg ON(sg.studiengang_kz = rt.studiengang_kz)
-		LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
-		LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
-		WHERE rt_id = ?
-		 AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
-		 AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
-		 AND bewerbung_abgeschicktamum IS NOT NULL
-		 AND bestaetigtam IS NOT NULL
-		ORDER BY nachname,
-		 vorname,
-		 person_id)
-		temp where row_number = 1
+			SELECT DISTINCT tbl_rt_person.person_id,
+				anrede,
+				nachname,
+				vorname,
+				(
+					SELECT kontakt
+					FROM PUBLIC.tbl_kontakt
+					WHERE kontakttyp = \'email\'
+						AND zustellung = true
+						AND person_id = tbl_rt_person.person_id
+					ORDER BY insertamum DESC,
+						updateamum DESC LIMIT 1
+					) AS "email",
+				tbl_ort.planbezeichnung,
+				tbl_ort.lageplan
+			FROM PUBLIC.tbl_rt_person
+			JOIN PUBLIC.tbl_person ON (tbl_rt_person.person_id = tbl_person.person_id)
+			JOIN PUBLIC.tbl_reihungstest rt ON (rt_id = reihungstest_id)
+			JOIN PUBLIC.tbl_prestudent ps ON (ps.person_id = tbl_rt_person.person_id)
+			JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
+			LEFT JOIN bis.tbl_zgv ON (ps.zgv_code = tbl_zgv.zgv_code)
+			LEFT JOIN PUBLIC.tbl_ort ON (tbl_rt_person.ort_kurzbz = tbl_ort.ort_kurzbz)
+			WHERE rt_id = ?
+				AND get_rolle_prestudent(prestudent_id, rt.studiensemester_kurzbz) = \'Interessent\'
+				AND tbl_prestudentstatus.studiensemester_kurzbz = rt.studiensemester_kurzbz
+				AND bewerbung_abgeschicktamum IS NOT NULL
+				AND bestaetigtam IS NOT NULL
+			ORDER BY nachname,
+				vorname,
+				person_id
 			';
 
 		return $this->execQuery($query, array($reihungstest_id));
@@ -530,4 +511,4 @@ class Reihungstest_model extends DB_Model
 
 		return $this->execQuery($query, array($date, $studiengang_kz));
 	}
-}
+}

application/models/education/Paabgabe_model.php

@@ -1,6 +1,7 @@
 <?php
 class Paabgabe_model extends DB_Model
 {
+
 	/**
 	 * Constructor
 	 */
@@ -10,24 +11,4 @@ class Paabgabe_model extends DB_Model
 		$this->dbTable = 'campus.tbl_paabgabe';
 		$this->pk = 'paabgabe_id';
 	}
-
-	/**
-	 * Gets last Endabgabe of a Projektarbeit, including filename.
-	 * @param int $projektarbeit_id
-	 * @return object
-	 */
-	public function getEndabgabe($projektarbeit_id)
-	{
-		$qry = "SELECT paabgabe_id, student_uid, paabg.datum, paabg.abgabedatum, projekttyp_kurzbz, titel, titel_english,
-					paabgabe_id || '_' || student_uid || '.pdf' AS filename
-				FROM campus.tbl_paabgabe paabg
-				JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
-				WHERE projektarbeit_id = ?
-				AND paabgabetyp_kurzbz = 'end'
-				AND paabg.abgabedatum IS NOT NULL
-				ORDER BY paabg.abgabedatum, paabg.datum DESC
-				LIMIT 1";
-
-		return $this->execQuery($qry, array($projektarbeit_id));
-	}
 }

application/models/education/Projektbetreuer_model.php

@@ -54,28 +54,18 @@ class Projektbetreuer_model extends DB_Model
 		$qry = "SELECT DISTINCT ON (pers.person_id) pers.person_id, betreuerart_kurzbz, vorname, nachname,
 				trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as voller_name,
 				anrede, titelpre, titelpost, gebdatum, geschlecht, pa.projekttyp_kurzbz,
-				ben.uid, ben.alias, ma.personalnummer, mitarbeiter_uid, student_uid,
-				(
-					SELECT kontakt
-					FROM public.tbl_kontakt
-					WHERE kontakttyp = 'email'
-					AND person_id = pers.person_id
-					ORDER BY
-						CASE WHEN zustellung THEN 0 ELSE 1 END,
-						insertamum DESC NULLS LAST
-					LIMIT 1
-				) AS private_email
-				FROM lehre.tbl_projektarbeit pa
-				JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
-				JOIN public.tbl_person pers USING (person_id)
-				LEFT JOIN public.tbl_benutzer ben USING (person_id)
-				LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid = ma.mitarbeiter_uid
-				WHERE (ben.aktiv OR ben.aktiv IS NULL)
-				AND projektarbeit_id = ?
-				AND betreuerart_kurzbz = ?
-				ORDER BY pers.person_id, CASE WHEN ma.mitarbeiter_uid IS NULL THEN 1 ELSE 0 END, /*Mitarbeiter account first*/
-						CASE WHEN ben.uid IS NULL THEN 1 ELSE 0 END, /*user with account first*/
-						ben.insertamum";
+				ben.uid, ben.alias, ma.personalnummer, mitarbeiter_uid, student_uid
+			FROM lehre.tbl_projektarbeit pa
+			JOIN lehre.tbl_projektbetreuer USING (projektarbeit_id)
+			JOIN public.tbl_person pers USING (person_id)
+			LEFT JOIN public.tbl_benutzer ben USING (person_id)
+			LEFT JOIN public.tbl_mitarbeiter ma ON ben.uid =  ma.mitarbeiter_uid
+			WHERE ben.aktiv
+			AND projektarbeit_id = ?
+			AND betreuerart_kurzbz = ?
+			ORDER BY pers.person_id, CASE WHEN ma.mitarbeiter_uid IS NULL THEN 1 ELSE 0 END, /*Mitarbeiter account first*/
+					CASE WHEN ben.uid IS NULL THEN 1 ELSE 0 END, /*user with account first*/
+         			ben.insertamum";
 
 		return $this->execQuery($qry, array($projektarbeit_id, $betreuerart_kurzbz));
 	}
@@ -87,14 +77,14 @@ class Projektbetreuer_model extends DB_Model
 	 */
     public function getBetreuerByToken($zugangstoken)
 	{
-		$qry = "
+		$qry = '
 			SELECT tbl_projektbetreuer.person_id, tbl_projektbetreuer.projektarbeit_id, student_uid
 			FROM lehre.tbl_projektbetreuer
 			JOIN lehre.tbl_projektarbeit USING (projektarbeit_id)
 			WHERE zugangstoken = ? AND zugangstoken_gueltigbis >= NOW()
 			ORDER BY tbl_projektbetreuer.insertamum DESC, projektarbeit_id DESC
 			LIMIT 1
-		";
+		';
 
 		return $this->execQuery($qry, array($zugangstoken));
 	}
@@ -106,60 +96,31 @@ class Projektbetreuer_model extends DB_Model
 	 * @param $student_uid string uid des Studenten der Arbeit abgibt
 	 * @return object | bool
 	 */
-	public function getZweitbegutachterWithToken($erstbegutachter_person_id, $projektarbeit_id, $student_uid, $zweitbegutachter_person_id = null)
+	public function getZweitbegutachterWithToken($erstbegutachter_person_id, $projektarbeit_id, $student_uid)
 	{
-		$params = array($erstbegutachter_person_id, $erstbegutachter_person_id, $projektarbeit_id, $student_uid);
+		$qry_betr = "SELECT betr.person_id, betr.projektarbeit_id, pers.anrede, betr.zugangstoken, betr.zugangstoken_gueltigbis, tbl_benutzer.uid, kontakt,
+				trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as voller_name,
+				CASE WHEN tbl_benutzer.uid IS NULL THEN kontakt ELSE tbl_benutzer.uid || '@".DOMAIN."' END AS email, abg.abgabedatum
+				FROM lehre.tbl_projektbetreuer betr
+				JOIN lehre.tbl_projektarbeit parb ON betr.projektarbeit_id = parb.projektarbeit_id 
+				JOIN public.tbl_person pers ON betr.person_id = pers.person_id
+				LEFT JOIN public.tbl_kontakt ON pers.person_id = tbl_kontakt.person_id AND kontakttyp = 'email' AND zustellung = true
+				LEFT JOIN public.tbl_benutzer ON pers.person_id = tbl_benutzer.person_id
+				LEFT JOIN campus.tbl_paabgabe abg ON betr.projektarbeit_id = abg.projektarbeit_id AND abg.paabgabetyp_kurzbz = 'end'
+				WHERE betr.betreuerart_kurzbz = 'Zweitbegutachter'
+				AND betr.projektarbeit_id = ?
+				AND parb.student_uid = ?
+				AND EXISTS (
+					SELECT 1 FROM lehre.tbl_projektbetreuer
+					WHERE person_id = ?
+					AND betreuerart_kurzbz = 'Erstbegutachter'
+					AND projektarbeit_id = betr.projektarbeit_id
+				)
+				AND (tbl_benutzer.aktiv OR tbl_benutzer.aktiv IS NULL)
+				ORDER BY betr.insertamum DESC
+				LIMIT 1";
 
-		$qry_betr = "SELECT betr.person_id, betr.projektarbeit_id, pers.anrede, betr.zugangstoken, betr.zugangstoken_gueltigbis, tbl_benutzer.uid,
-					trim(COALESCE(titelpre,'')||' '||COALESCE(vorname,'')||' '||COALESCE(nachname,'')||' '||COALESCE(titelpost,'')) as voller_name,
-					CASE WHEN tbl_benutzer.uid IS NULL THEN kontakt ELSE tbl_benutzer.uid || '@".DOMAIN."' END AS email, kontakt,
-					abg.abgabedatum, betr.betreuerart_kurzbz
-					FROM lehre.tbl_projektbetreuer betr
-					JOIN lehre.tbl_projektarbeit parb ON betr.projektarbeit_id = parb.projektarbeit_id
-					JOIN public.tbl_person pers ON betr.person_id = pers.person_id
-					LEFT JOIN public.tbl_kontakt ON pers.person_id = tbl_kontakt.person_id AND kontakttyp = 'email' AND zustellung = true
-					LEFT JOIN public.tbl_benutzer ON pers.person_id = tbl_benutzer.person_id
-					LEFT JOIN campus.tbl_paabgabe abg ON betr.projektarbeit_id = abg.projektarbeit_id AND abg.paabgabetyp_kurzbz = 'end'
-					WHERE
-					(
-						(
-							betr.betreuerart_kurzbz  = 'Zweitbegutachter'
-							AND EXISTS (
-								SELECT 1 FROM lehre.tbl_projektbetreuer
-								WHERE person_id = ?
-								AND betreuerart_kurzbz = 'Erstbegutachter'
-								AND projektarbeit_id = betr.projektarbeit_id
-							)
-						)
-						OR /* either Zweitbegutachter of masterarbeit, or Kommissionsprüfer if Kommission */
-						(
-							betr.betreuerart_kurzbz  = 'Senatsmitglied'
-							AND EXISTS (
-								SELECT 1 FROM lehre.tbl_projektbetreuer
-								WHERE person_id = ?
-								AND betreuerart_kurzbz = 'Senatsvorsitz'
-								AND projektarbeit_id = betr.projektarbeit_id
-							)
-						)
-					)
-					AND betr.projektarbeit_id = ?
-					AND parb.student_uid = ?
-					AND (tbl_benutzer.aktiv OR tbl_benutzer.aktiv IS NULL)";
-
-					if (isset($zweitbegutachter_person_id))
-					{
-						$qry_betr .= " AND betr.person_id = ?";
-						$params[] = $zweitbegutachter_person_id;
-					}
-
-					$qry_betr .= " ORDER BY betr.person_id DESC,
-					(CASE WHEN EXISTS ( /* if multiple accounts, prioritize mitarbeiter */
-						SELECT 1 FROM public.tbl_mitarbeiter ma
-						WHERE ma.mitarbeiter_uid = tbl_benutzer.uid
-					) THEN 0 ELSE 1 END), betr.insertamum DESC
-					LIMIT 1";
-
-		return $this->execQuery($qry_betr, $params);
+		return $this->execQuery($qry_betr, array($projektarbeit_id, $student_uid, $erstbegutachter_person_id));
 	}
 
 	/**
@@ -170,23 +131,23 @@ class Projektbetreuer_model extends DB_Model
 	 */
 	public function generateZweitbegutachterToken($zweitbegutachter_person_id, $projektarbeit_id)
 	{
-		$betreuerUidQry = "SELECT uid, zugangstoken, zugangstoken_gueltigbis, tbl_projektbetreuer.person_id, betreuerart_kurzbz
+		$betreuerUidQry = "SELECT uid, zugangstoken, zugangstoken_gueltigbis, tbl_projektbetreuer.person_id
 							FROM lehre.tbl_projektbetreuer
 							JOIN public.tbl_person USING(person_id)
 							LEFT JOIN public.tbl_benutzer USING(person_id)
 							WHERE projektarbeit_id = ?
 							AND tbl_projektbetreuer.person_id = ?
-							AND betreuerart_kurzbz IN ('Zweitbegutachter', 'Senatsmitglied')
+							AND betreuerart_kurzbz = 'Zweitbegutachter'
 							LIMIT 1";
 
-		$betreueruidRes = $this->execQuery($betreuerUidQry, array($projektarbeit_id, $zweitbegutachter_person_id));
+		$betreueruidres = $this->execQuery($betreuerUidQry, array($projektarbeit_id, $zweitbegutachter_person_id));
 
-		if (!hasData($betreueruidRes))
+		if (!hasData($betreueruidres))
 			return error('Zweitbegutachter nicht gefunden');
 
-		$zweitbetreuer = getData($betreueruidRes)[0];
+		$row_betr = getData($betreueruidres)[0];
 
-		if (!isset($zweitbetreuer->uid))
+		if (!isset($row_betr->uid))
 		{
 			do {
 				$token = generateToken(16);
@@ -195,8 +156,8 @@ class Projektbetreuer_model extends DB_Model
 
 			$result = $this->update(
 				array('projektarbeit_id' => $projektarbeit_id,
-					'person_id' => $zweitbetreuer->person_id,
-					'betreuerart_kurzbz' => $zweitbetreuer->betreuerart_kurzbz),
+					'person_id' => $row_betr->person_id,
+					'betreuerart_kurzbz' => 'Zweitbegutachter'),
 				array('zugangstoken' => $token,
 					'zugangstoken_gueltigbis' => date('Y-m-d', strtotime('+1 year')))
 			);
@@ -206,29 +167,4 @@ class Projektbetreuer_model extends DB_Model
 		else
 			return success("Account vorhanden, kein Token benötigt");
 	}
-
-	/**
-	 * Gets betreuerart of a Betreuer for a Projektarbeit.
-	 * Main Betreuer are prioritized (normally one Betreuer should be assigned to a Projektarbeit another time with a different Betreuerart).
-	 * @param int projektarbeit_id
-	 * @param int betreuer_person_id
-	 * @return object success or error
-	 */
-	public function getBetreuerart($projektarbeit_id, $betreuer_person_id)
-	{
-		$qry = "SELECT betreuerart_kurzbz
-				FROM lehre.tbl_projektbetreuer
-				WHERE projektarbeit_id = ?
-				AND person_id = ?
-				ORDER BY CASE WHEN betreuerart_kurzbz = 'Senatsvorsitz' THEN 1 /*Senatsvorsitz has priority*/
-					WHEN betreuerart_kurzbz = 'Begutachter' THEN 2
-					WHEN betreuerart_kurzbz = 'Erstbegutachter' THEN 3
-					WHEN betreuerart_kurzbz = 'Zweitbegutachter' THEN 4
-					WHEN betreuerart_kurzbz = 'Senatsmitglied' THEN 5
-					ELSE 5
-				END, insertamum DESC
-				LIMIT 1";
-
-		return $this->execQuery($qry, array($projektarbeit_id, $betreuer_person_id));
-	}
 }

application/models/organisation/Studiengang_model.php

@@ -508,20 +508,13 @@ class Studiengang_model extends DB_Model
 		return $this->execQuery($query, array($typ, $semester));
 	}
 
-	public function getStudiengangTyp($studiengang_kz, $typ = null)
+	public function getStudiengangTyp($studiengang_kz, $typ)
 	{
 		$query = "SELECT DISTINCT(sgt.*)
 					FROM tbl_studiengangstyp sgt JOIN tbl_studiengang sg on sgt.typ = sg.typ 
-					WHERE studiengang_kz IN ?";
+					WHERE studiengang_kz IN ? and sgt.typ IN ?";
 
-		$params[] = $studiengang_kz;
+		return $this->execQuery($query, array($studiengang_kz, $typ));
 
-		if (!is_null($typ))
-		{
-			$query .= " AND sgt.typ IN ?";
-			$params[] = $typ;
-		}
-
-		return $this->execQuery($query, $params);
 	}
 }

application/models/person/Geschlecht_model.php

@@ -1,14 +0,0 @@
-<?php
-
-class Geschlecht_model extends DB_Model
-{
-	/**
-	 *
-	 */
-	public function __construct()
-	{
-		parent::__construct();
-		$this->dbTable = 'public.tbl_geschlecht';
-		$this->pk = 'geschlecht';
-	}
-}

application/models/system/Message_model.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('BASEPATH')) exit('No direct script access allowed');
+if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
 class Message_model extends DB_Model
 {
@@ -77,6 +77,67 @@ class Message_model extends DB_Model
 		return $this->execQuery($sql, $parametersArray);
 	}
 
+	/**
+	 * Gets massages with a person being sender OR receiver.
+	 * @param $person_id
+	 * @param null $status message status. by default, latest status is returned
+	 * @return array|null
+	 */
+	public function getMessagesOfPerson($person_id, $status = null)
+	{
+		$sql = 'SELECT m.message_id,
+						m.person_id,
+						m.subject,
+						m.body,
+						m.priority,
+						m.insertamum,
+						m.relationmessage_id,
+						m.oe_kurzbz,
+						se.person_id AS sepersonid,
+						se.anrede AS seanrede,
+						se.titelpost AS setitelpost,
+						se.titelpre AS setitelpre,
+						se.nachname AS senachname,
+						se.vorname AS sevorname,
+						se.vornamen AS sevornamen,
+						re.person_id AS repersonid,
+						re.anrede AS reanrede,
+						re.titelpost AS retitelpost,
+						re.titelpre AS retitelpre,
+						re.nachname AS renachname,
+						re.vorname AS revorname,
+						re.vornamen AS revornamen,
+						s.status,
+						s.statusinfo,
+						s.insertamum AS statusamum
+				  FROM public.tbl_msg_message m
+						JOIN public.tbl_msg_recipient r ON m.message_id = r.message_id
+						JOIN public.tbl_person se ON (m.person_id = se.person_id)
+						JOIN public.tbl_person re ON (r.person_id = re.person_id)
+						LEFT JOIN (
+							SELECT message_id, person_id, status, statusinfo, insertamum
+							  FROM public.tbl_msg_status
+							  %s
+						  ORDER BY insertamum DESC
+						  ) s ON (m.message_id = s.message_id AND re.person_id = s.person_id)
+				 WHERE se.person_id = ?
+				 OR re.person_id = ?
+				 ';
+
+		if (is_numeric($status))
+		{
+			$sql = sprintf($sql, 'WHERE status = '.$status);
+		}
+		else
+		{
+			$sql = sprintf($sql, '');
+		}
+
+		$parametersArray = array($person_id, $person_id);
+
+		return $this->execQuery($sql, $parametersArray);
+	}
+
 	/**
 	 * getMessageVars
 	 */
@@ -110,14 +171,14 @@ class Message_model extends DB_Model
 			return error($this->db->error(), FHC_DB_ERROR);
 		}
 	}
-
+	
 	/**
 	 * Get message variables for logged in user
 	 */
 	public function getMsgVarsLoggedInUser()
 	{
 		$result = $this->db->query('SELECT * FROM public.vw_msg_vars_user WHERE 0 = 1');
-
+		
 		if ($result)
 		{
 			return success($result->list_fields());
@@ -147,7 +208,7 @@ class Message_model extends DB_Model
 
 		return $this->execQuery(sprintf($query, is_array($person_id) ? 'IN' : '='), array($person_id));
 	}
-
+	
 	/**
 	 * Get message vars data for logged in user
 	 * @param string uid The UID should ONLY be passed if this method is called by a cronjob.
@@ -164,9 +225,9 @@ class Message_model extends DB_Model
 		{
 			$params = array(getAuthUID());
 		}
-
+		
 		$query = 'SELECT * FROM public.vw_msg_vars_user WHERE my_uid = ?';
-
+		
 		return $this->execQuery($query, $params);
 	}
 }

application/models/system/Recipient_model.php

@@ -1,20 +1,4 @@
 <?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/>.
- */
 
 class Recipient_model extends DB_Model
 {
@@ -127,11 +111,7 @@ class Recipient_model extends DB_Model
 		else
 		{
 			array_push($parametersArray, $person_id, $person_id);
-			$sql = sprintf(
-				$sql,
-				'WHERE person_id = ?
-				   AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)'
-			);
+			$sql = sprintf($sql, 'WHERE person_id = ? AND message_id NOT IN (SELECT message_id FROM public.tbl_msg_status WHERE status >= 3 AND person_id = ?)');
 		}
 
 		if ($oe_kurzbz != null)
@@ -287,14 +267,69 @@ class Recipient_model extends DB_Model
 	 */
 	public function getReceivedMessages($person_id, $functions)
 	{
-		return $this->execQuery(
-			$this->_getReceivedMessagesQuery().' ORDER BY sent DESC',
-			array(
-				$person_id,
-				$functions,
-				$person_id
-			)
-		);
+		$sql = '-- Messages sent directly to the person
+				SELECT mr.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						p.vorname,
+						p.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						mr.token
+				  FROM public.tbl_msg_recipient mr
+				  JOIN public.tbl_msg_message mm ON (mm.message_id = mr.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mr.message_id AND ms.person_id = mr.person_id)
+				  JOIN public.tbl_person p ON (p.person_id = mm.person_id)
+				 WHERE mr.person_id = ?
+			  GROUP BY mr.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						p.vorname,
+						p.nachname,
+						ms.person_id,
+						mr.token
+				 UNION
+				-- Messages sent to a person that belongs to the recipient organisation unit
+				SELECT mrou.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						pr.vorname,
+						pr.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						mrou.token
+				  FROM public.tbl_person p
+				  JOIN public.tbl_benutzer b ON (b.person_id = p.person_id)
+				  JOIN (
+					  	SELECT uid, oe_kurzbz
+						  FROM public.tbl_benutzerfunktion
+						 WHERE (datum_von IS NULL OR datum_von <= NOW())
+					  	   AND (datum_bis IS NULL OR datum_bis >= NOW())
+						   AND funktion_kurzbz IN ?
+						) bf ON (bf.uid = b.uid)
+				  JOIN public.tbl_msg_recipient mrou ON (mrou.oe_kurzbz = bf.oe_kurzbz)
+				  JOIN public.tbl_msg_message mm ON (mm.message_id = mrou.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mrou.message_id AND ms.person_id = mrou.person_id)
+				  JOIN public.tbl_person pr ON (pr.person_id = mm.person_id)
+				 WHERE p.person_id = ?
+			  GROUP BY mrou.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						pr.vorname,
+						pr.nachname,
+						ms.person_id,
+						mrou.token
+			  ORDER BY sent DESC';
+
+		return $this->execQuery($sql, array($person_id, $functions, $person_id));
 	}
 
 	/**
@@ -302,7 +337,38 @@ class Recipient_model extends DB_Model
 	 */
 	public function getSentMessages($person_id)
 	{
-		return $this->execQuery($this->_getSentMessagesQuery().' ORDER BY sent DESC', array($person_id));
+		$sql = 'SELECT mm.message_id,
+						mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum AS sent,
+						p.person_id,
+						p.vorname,
+						p.nachname,
+						MAX(ms.status) AS status,
+						ms.person_id AS statusPersonId,
+						oe.bezeichnung AS oe,
+						mr.token
+				  FROM public.tbl_msg_message mm
+				  JOIN public.tbl_msg_recipient mr ON (mr.message_id = mm.message_id)
+				  JOIN public.tbl_msg_status ms ON (ms.message_id = mm.message_id AND ms.person_id = mr.person_id)
+				  JOIN public.tbl_person p ON (p.person_id = mr.person_id)
+			 LEFT JOIN public.tbl_organisationseinheit oe ON (oe.oe_kurzbz = mr.oe_kurzbz)
+				 WHERE mm.person_id = ?
+			  GROUP BY mm.message_id,
+			  			mm.relationmessage_id,
+						mm.subject,
+						mm.body,
+						mm.insertamum,
+						p.person_id,
+						p.vorname,
+						p.nachname,
+						ms.person_id,
+						oe.bezeichnung,
+						mr.token
+			  ORDER BY sent DESC';
+
+		return $this->execQuery($sql, array($person_id));
 	}
 
 	/**
@@ -327,191 +393,4 @@ class Recipient_model extends DB_Model
 
 		return $this->execQuery($sql, array($messageIds));
 	}
-
-	/**
-	 *
-	 */
-	public function getReceivedAndSentMessages($person_id, $functions)
-	{
-		return $this->execQuery(
-			$this->_getReceivedMessagesQuery().
-			' UNION '.
-			$this->_getSentMessagesQuery().
-			' ORDER BY sent DESC',
-			array(
-				$person_id,
-				$functions,
-				$person_id,
-				$person_id
-			)
-		);
-	}
-
-	// -------------------------------------------------------------------------------------------------------------------------
-	// Private methods
-
-	/**
-	 * Returns the query used to get the sent messages for a given person
-	 */
-	private function _getSentMessagesQuery()
-	{
-		return '-- Messages sent from the given person
-			SELECT mm.message_id,
-				mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum AS sent,
-				pr.person_id AS "recipientPersonId",
-				pr.vorname AS "recipientName",
-				pr.nachname AS "recipientSurname",
-				ps.person_id AS "senderPersonId",
-				ps.vorname AS "senderName",
-				ps.nachname AS "senderSurname",
-				(SELECT MAX(status) FROM public.tbl_msg_status WHERE message_id = mm.message_id AND person_id = mr.person_id) AS "lastStatus",
-				(SELECT MAX(insertamum) FROM public.tbl_msg_status WHERE message_id = mm.message_id AND person_id = mr.person_id) AS "lastStatusDate",
-				oe.oe_kurzbz AS "oeId",
-				COALESCE(sg.bezeichnung, oe.bezeichnung) AS oe,
-				mr.token
-			  FROM public.tbl_msg_message mm
-			  JOIN public.tbl_msg_recipient mr ON (mr.message_id = mm.message_id)
-			  JOIN public.tbl_person pr ON (pr.person_id = mr.person_id)
-			  JOIN public.tbl_person ps ON (ps.person_id = mm.person_id)
-		     LEFT JOIN public.tbl_organisationseinheit oe ON (oe.oe_kurzbz = mr.oe_kurzbz)
-		     LEFT JOIN public.tbl_studiengang sg ON (sg.oe_kurzbz = mr.oe_kurzbz)
-			 WHERE mm.person_id = ?
-		      GROUP BY mm.message_id,
-		  		mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum,
-				pr.person_id,
-				pr.vorname,
-				pr.nachname,
-				ps.person_id,
-				ps.vorname,
-				ps.nachname,
-				"lastStatus",
-				"lastStatusDate",
-				oe.oe_kurzbz,
-				oe,
-				mr.token';
-	}
-
-	/**
-	 * Returns the query used to get the received messages for a given person
-	 */
-	private function _getReceivedMessagesQuery()
-	{
-		return '-- Messages sent directly to the person
-			SELECT mr.message_id,
-				mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum AS sent,
-				pr.person_id AS "recipientPersonId",
-				pr.vorname AS "recipientName",
-				pr.nachname AS "recipientSurname",
-				ps.person_id AS "senderPersonId",
-				ps.vorname AS "senderName",
-				ps.nachname AS "senderSurname",
-				(
-					SELECT MAX(status)
-					  FROM public.tbl_msg_status
-					 WHERE message_id = mm.message_id
-					   AND person_id = mr.person_id
-				) AS "lastStatus",
-				(
-					SELECT MAX(insertamum)
-					  FROM public.tbl_msg_status
-					 WHERE message_id = mm.message_id
-					   AND person_id = mr.person_id
-				) AS "lastStatusDate",
-				oe.oe_kurzbz AS "oeId",
-				COALESCE(sg.bezeichnung, oe.bezeichnung) AS oe,
-				mr.token
-			  FROM public.tbl_msg_recipient mr
-			  JOIN public.tbl_msg_message mm ON (mm.message_id = mr.message_id)
-			  JOIN public.tbl_person ps ON (ps.person_id = mm.person_id)
-			  JOIN public.tbl_person pr ON (pr.person_id = mr.person_id)
-		     LEFT JOIN public.tbl_organisationseinheit oe ON (oe.oe_kurzbz = mm.oe_kurzbz)
-		     LEFT JOIN public.tbl_studiengang sg ON (sg.oe_kurzbz = mm.oe_kurzbz)
-			 WHERE mr.person_id = ?
-		      GROUP BY mr.message_id,
-		  		mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum,
-				pr.person_id,
-				pr.vorname,
-				pr.nachname,
-				ps.person_id,
-				ps.vorname,
-				ps.nachname,
-				"lastStatus",
-				"lastStatusDate",
-				oe.oe_kurzbz,
-				oe,
-				mr.token
-			 UNION
-			-- Messages sent to a person that belongs to the recipient organisation unit
-			SELECT mrou.message_id,
-				mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum AS sent,
-				pr.person_id AS "recipientPersonId",
-				pr.vorname AS "recipientName",
-				pr.nachname AS "recipientSurname",
-				ps.person_id AS "senderPersonId",
-				ps.vorname AS "senderName",
-				ps.nachname AS "senderSurname",
-				(
-					SELECT MAX(status)
-					  FROM public.tbl_msg_status
-					 WHERE message_id = mrou.message_id
-					   AND person_id = mrou.person_id
-				) AS "lastStatus",
-				(
-					SELECT MAX(insertamum)
-					  FROM public.tbl_msg_status
-					 WHERE message_id = mrou.message_id
-					  AND person_id = mrou.person_id
-				) AS "lastStatusDate",
-				oe.oe_kurzbz AS "oeId",
-				COALESCE(sg.bezeichnung, oe.bezeichnung) AS oe,
-				mrou.token
-			  FROM public.tbl_person p
-			  JOIN public.tbl_benutzer b ON (b.person_id = p.person_id)
-			  JOIN (
-			  	SELECT uid, oe_kurzbz
-				  FROM public.tbl_benutzerfunktion
-				 WHERE (datum_von IS NULL OR datum_von <= NOW())
-			  	   AND (datum_bis IS NULL OR datum_bis >= NOW())
-				   AND funktion_kurzbz IN ?
-			  ) bf ON (bf.uid = b.uid)
-			  JOIN public.tbl_msg_recipient mrou ON (mrou.oe_kurzbz = bf.oe_kurzbz)
-			  JOIN public.tbl_msg_message mm ON (mm.message_id = mrou.message_id)
-			  JOIN public.tbl_person ps ON (ps.person_id = mm.person_id)
-			  JOIN public.tbl_person pr ON (pr.person_id = mrou.person_id)
-		     LEFT JOIN public.tbl_organisationseinheit oe ON (oe.oe_kurzbz = mrou.oe_kurzbz)
-		     LEFT JOIN public.tbl_studiengang sg ON (sg.oe_kurzbz = mrou.oe_kurzbz)
-			 WHERE p.person_id = ?
-		      GROUP BY mrou.message_id,
-		  		mm.relationmessage_id,
-				mm.subject,
-				mm.body,
-				mm.insertamum,
-				pr.person_id,
-				pr.vorname,
-				pr.nachname,
-				ps.person_id,
-				ps.vorname,
-				ps.nachname,
-				"lastStatus",
-				"lastStatusDate",
-				oe.oe_kurzbz,
-				oe,
-				mrou.token';
-	}
 }
-

application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php

@@ -213,7 +213,11 @@ $filterWidgetArray = array(
 		begruendung: {headerFilter:"input", visible: true},
 		student: {headerFilter:"input"},
 		zgv: {visible: false, headerFilter:"input"},
-		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
+		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
+		    labelField:"dokument_bezeichnung",
+			url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
+		    target:"_blank"
+		}},
 		anmerkung_student: {headerFilter:"input"},
 		antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
 		empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},

application/views/lehre/anrechnung/reviewAnrechnungUebersichtData.php

@@ -47,7 +47,7 @@ $query = '
 		JOIN lehre.tbl_anrechnung_anrechnungstatus USING (anrechnung_id)
 		JOIN lehre.tbl_anrechnung_begruendung AS begruendung USING (begruendung_id)
 	)
-
+	
 	SELECT DISTINCT ON (anrechnungen.*, lema.mitarbeiter_uid) anrechnungen.*,
 	array_to_json(anrechnungstatus.bezeichnung_mehrsprachig::varchar[])->>' . $LANGUAGE_INDEX . ' AS "status_bezeichnung"
 	FROM anrechnungen
@@ -134,7 +134,11 @@ $filterWidgetArray = array(
 		student: {headerFilter:"input"},
 		begruendung: {headerFilter:"input"},
 		zgv: {visible: false, headerFilter:"input"},
-		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams: paramLookup_dokBez},
+		dokument_bezeichnung: {headerFilter:"input", formatter:"link", formatterParams:{
+		    labelField:"dokument_bezeichnung",
+			url:function(cell){return "'. current_url() .'/download?dms_id=" + cell.getData().dms_id},
+		    target:"_blank"
+		}},
 		anmerkung_student: {headerFilter:"input"},
 		antragsdatum: {align:"center", headerFilter:"input", mutator: mut_formatStringDate},
 		empfehlung_anrechnung: {headerFilter:"input", align:"center", formatter: format_empfehlung_anrechnung, headerFilterFunc: hf_filterTrueFalse},
@@ -145,4 +149,4 @@ $filterWidgetArray = array(
 
 echo $this->widgetlib->widget('TableWidget', $filterWidgetArray);
 
-?>
+?>

application/views/system/infocenter/infocenterDetails.php

@@ -25,8 +25,7 @@
 			'public/js/infocenter/messageList.js',
 			'public/js/infocenter/infocenterDetails.js',
 			'public/js/infocenter/zgvUeberpruefung.js',
-			'public/js/infocenter/docUeberpruefung.js',
-			'public/js/infocenter/stammdaten.js'
+			'public/js/infocenter/docUeberpruefung.js'
 		),
 		'phrases' => array(
 			'infocenter' => array(
@@ -182,10 +181,7 @@
 								<div class="panel-body">
 									<div class="row" id="messagelist">
 										<?php
-											$this->load->view(
-												'system/infocenter/messageList.php',
-												$messages
-											);
+										$this->load->view('system/infocenter/messageList.php', $messages);
 										?>
 									</div>
 								</div>

application/views/system/infocenter/messageList.php

@@ -6,27 +6,21 @@ $widthColumn = $msgExists === true ? 8 : 12;
 	<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
 		<thead>
 		<tr>
-			<th><?php echo  ucfirst($this->p->t('global', 'gesendetAm')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global', 'sender')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global', 'empfaenger')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global', 'betreff')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global', 'gelesenAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','gesendetAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','sender')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','empfaenger')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','betreff')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global','gelesenAm')) ?></th>
 		</tr>
 		</thead>
 		<tbody>
 		<?php foreach ($messages as $message): ?>
-			<tr id="<?php echo $message->message_id.'_'.$message->recipientPersonId ?>" style="cursor: pointer">
-				<td><?php echo isset($message->sent) ? date_format(date_create($message->sent), 'd.m.Y H:i:s') : '' ?></td>
-				<td><?php
-					echo $message->senderPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID) && isset($message->oeId) ?
-						$message->oe : $message->senderName.' '.$message->senderSurname;
-				?></td>
-				<td><?php
-					echo $message->recipientPersonId == $this->config->item(MessageLib::CFG_SYSTEM_PERSON_ID) && isset($message->oeId) ?
-						$message->oe : $message->recipientName.' '.$message->recipientSurname;
-				?></td>
+			<tr id="<?php echo $message->message_id.'_'.$message->repersonid ?>" style="cursor: pointer">
+				<td><?php echo isset($message->insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?></td>
+				<td><?php echo $message->sevorname.' '.$message->senachname ?></td>
+				<td><?php echo $message->revorname.' '.$message->renachname ?></td>
 				<td><?php echo $message->subject ?></td>
-				<td><?php echo isset($message->lastStatusDate) ? date_format(date_create($message->lastStatusDate), 'd.m.Y H:i:s') : '' ?></td>
+				<td><?php echo isset($message->statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?></td>
 			</tr>
 		<?php endforeach; ?>
 		</tbody>

application/views/system/infocenter/stammdaten.php

@@ -1,104 +1,60 @@
 <div class="row">
-	<div class="col-lg-6 table-responsive stammdaten_form">
+	<div class="col-lg-6 table-responsive">
 		<table class="table">
+			<?php if (!empty($stammdaten->titelpre)): ?>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','titelpre')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="titelpre"><?php echo $stammdaten->titelpre ?></div>
-				</td>
+				<td><?php echo $stammdaten->titelpre ?></td>
 			</tr>
-
+			<?php endif; ?>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','vorname')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="vorname"><?php echo $stammdaten->vorname ?></div>
-				</td>
+				<td><?php echo $stammdaten->vorname ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','nachname')) ?></strong></td>
 				<td>
-					<div class='stammdaten' id="nachname"><?php echo $stammdaten->nachname ?></div>
-				</td>
-			</tr>
-			<tr>
-				<td><strong><?php echo  ucfirst($this->p->t('person','titelpost')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="titelpost"><?php echo $stammdaten->titelpost ?></div>
-				</td>
+					<?php echo $stammdaten->nachname ?></td>
 			</tr>
+			<?php if (!empty($stammdaten->titelpost)): ?>
+				<tr>
+					<td><strong><?php echo  ucfirst($this->p->t('person','titelpost')) ?></strong></td>
+					<td><?php echo $stammdaten->titelpost ?></td>
+				</tr>
+			<?php endif; ?>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsdatum')) ?></strong></td>
 				<td>
-					<div class='stammdaten' id="gebdatum"><?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></div>
-				</td>
+					<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','svnr')) ?></strong></td>
 				<td>
-					<div class='stammdaten' id="svnr"><?php echo $stammdaten->svnr ?></div>
-				</td>
+					<?php echo $stammdaten->svnr ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
 				<td>
-					<select id="buergerschaft" disabled>
-						<?php
-						foreach ($all_nations as $nation)
-						{
-							$selected = '';
-							if ($nation->nation_code === $stammdaten->staatsbuergerschaft_code)
-								$selected = 'selected';
-							echo "<option value='". $nation->nation_code ."' " . $selected . ">". $nation->langtext . "</option>";
-						}
-						?>
-					</select>
+					<?php echo $stammdaten->staatsbuergerschaft ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','geschlecht')) ?></strong></td>
 				<td>
-					<?php
-						$language = getUserLanguage() == 'German' ? 0 : 1;
-					?>
-					<select id="geschlecht" disabled>
-						<?php
-						foreach ($all_genders as $gender)
-						{
-							$selected = '';
-							if ($gender->geschlecht === $stammdaten->geschlecht)
-								$selected = 'selected';
-							echo "<option value='". $gender->geschlecht ."' " . $selected . ">". ucfirst($gender->bezeichnung_mehrsprachig[$language]) . "</option>";
-						}
-						?>
-					</select>
-				</td>
-
+					<?php echo $stammdaten->geschlecht ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsnation')) ?></strong></td>
 				<td>
-					<select id="gebnation" disabled>
-
-					<?php
-						foreach ($all_nations as $nation)
-						{
-							$selected = '';
-							if ($nation->nation_code === $stammdaten->geburtsnation_code)
-								$selected = 'selected';
-							echo "<option value='". $nation->nation_code ."' " . $selected . ">". $nation->langtext . "</option>";
-						}
-					?>
-					</select>
+					<?php echo $stammdaten->geburtsnation ?></td>
 			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','geburtsort')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="gebort"><?php echo $stammdaten->gebort ?></div>
-				</td>
+				<td><?php echo $stammdaten->gebort ?></td>
 			</tr>
 		</table>
 	</div>
 	<div class="col-lg-6 table-responsive">
-		<table class="table table-bordered stammdaten_form">
+		<table class="table table-bordered">
 			<thead>
 			<tr>
 				<th colspan="4" class="text-center"><?php echo  ucfirst($this->p->t('global','kontakt')) ?></th>
@@ -122,7 +78,7 @@
 					<td><?php echo ucfirst($kontakt->kontakttyp) ?></td>
 				<?php endif; ?>
 					<td>
-						<?php echo '<span class="kontakt '.$kontakt->kontakttyp.'" data-id="'. $kontakt->kontakt_id .'" data-value="' . $kontakt->kontakt .'">';?>
+						<?php echo '<span class="'.$kontakt->kontakttyp.'">';?>
 						<?php if ($kontakt->kontakttyp === 'email'): ?>
 							<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
 							<?php $lastMailAdress = $kontakt->kontakt;
@@ -143,30 +99,8 @@
 						<?php echo  ucfirst($this->p->t('person','adresse')) ?>
 					</td>
 					<td>
-						<?php if (isset($adresse)): ?>
-							<div class="row adresse col-sm-12" data-id="<?php echo $adresse->adresse_id ?>">
-								<div class="float-left" data-value="<?php echo $adresse->strasse ?>" data-type="strasse"><?php echo $adresse->strasse ?></div>
-								
-								<div class="float-left" data-value="<?php echo $adresse->plz ?>" data-type="plz"><?php echo $adresse->plz ?></div>
-								
-								<div class="float-left" data-value="<?php echo $adresse->ort ?>" data-type="ort"><?php echo $adresse->ort ?></div>
-
-							<?php if (isset($adresse->nationkurztext)): ?>
-								<select id="nation_<?php echo $adresse->adresse_id ?>" disabled>
-									<?php
-									foreach ($all_nations as $nation)
-									{
-										$selected = '';
-										if ($nation->nation_code === $adresse->nation)
-											$selected = 'selected';
-										echo "<option value='". $nation->nation_code ."' " . $selected . ">". $nation->langtext . "</option>";
-									}
-									?>
-								</select>
-							</div>
-							<br />
-							<?php endif; ?>
-						<?php endif; ?>
+						<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
+						<?php echo isset($adresse->nationkurztext) ? '<br />'.$adresse->nationkurztext : '' ?>
 					</td>
 					<td>
 						<?php echo ($adresse->heimatadresse === true ? 'Heimatadresse' : '').
@@ -192,16 +126,6 @@
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>
-			<div class="col-xs-6">
-				<a class="editStammdaten">
-					<i class="fa fa-edit"></i>&nbsp;<?php echo $this->p->t('ui','bearbeiten'); ?></a>
-				<div class="editActionStammdaten" style="display:none">
-					<a class="cancelStammdaten">
-						<i class="fa fa-trash"></i>&nbsp;<?php echo $this->p->t('ui','abbrechen');?></a>
-					<a class="saveStammdaten">
-						<i class="fa fa-save"></i>&nbsp;<?php echo $this->p->t('ui','speichern'); ?></a>
-				</div>
-			</div>
 		</div>
 	</div>
 </div>

application/views/system/infocenter/zgvpruefungen.php

@@ -2,7 +2,7 @@
 	<?php
 	$unique_studsemester = array();
 	$first = true;
-	$fit_programme_studiengaenge = $additional_stg;
+	$fit_programme_studiengaenge = array(10021, 10027);
 	foreach ($zgvpruefungen as $zgvpruefung):
 		$infoonly = $zgvpruefung->infoonly;
 		$studiengangkurzbz = $studiengangbezeichnung = $studiengangtyp = '';

application/views/system/issues/issuesData.php

@@ -56,7 +56,7 @@ $query .= "SELECT issue_id, fehlercode AS \"Fehlercode\", iss.fehlercode_extern
 				    WHERE person_id = pers.person_id
 				    ORDER BY prestudent_id DESC
 				) prestudents
-				WHERE last_status IN ('Abgewiesener','Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
+				WHERE last_status IN ('Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
 				GROUP BY person_id
 				LIMIT 1;
 			) AS \"Zugehörigkeit\",
@@ -89,9 +89,7 @@ $query .= "SELECT issue_id, fehlercode AS \"Fehlercode\", iss.fehlercode_extern
 				LEFT JOIN public.tbl_funktion fu USING (funktion_kurzbz)
 				WHERE fehlercode = fr.fehlercode
 				GROUP BY fehlercode
-			) AS \"Organisationseinheit Zuständigkeiten\",
-			pers.bpk AS \"BPK\",
-			pers.matr_nr AS \"Matrikelnummer\"
+			) AS \"Organisationseinheit Zuständigkeiten\"
 			FROM system.tbl_issue iss
 			JOIN system.tbl_fehler fr USING (fehlercode)
 			JOIN system.tbl_fehlertyp ftyp USING (fehlertyp_kurzbz)
@@ -132,15 +130,14 @@ if (!isEmptyArray($all_oe_kurzbz_berechtigt))
 				)";
 }
 
-$query .= " ORDER BY
-			CASE
-				WHEN fehlertyp_kurzbz = '".IssuesLib::ERRORTYPE_CODE."' THEN 0
-				WHEN fehlertyp_kurzbz = '".IssuesLib::WARNINGTYPE_CODE."' THEN 1
+$query .= " ORDER BY CASE
+				WHEN iss.status_kurzbz = '".IssuesLib::STATUS_NEU."' THEN 0
+				WHEN iss.status_kurzbz = '".IssuesLib::STATUS_IN_BEARBEITUNG."' THEN 1
 				ELSE 2
 			END,
 			CASE
-				WHEN iss.status_kurzbz = '".IssuesLib::STATUS_NEU."' THEN 0
-				WHEN iss.status_kurzbz = '".IssuesLib::STATUS_IN_BEARBEITUNG."' THEN 1
+				WHEN fehlertyp_kurzbz = '".IssuesLib::ERRORTYPE_CODE."' THEN 0
+				WHEN fehlertyp_kurzbz = '".IssuesLib::WARNINGTYPE_CODE."' THEN 1
 				ELSE 2
 			END,
 			datum DESC, fehlercode, issue_id DESC";
@@ -175,9 +172,7 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('fehlermonitoring', 'zugehoerigkeit')),
 		ucfirst($this->p->t('fehlermonitoring', 'hauptzustaendig')),
 		ucfirst($this->p->t('fehlermonitoring', 'zustaendigePersonen')),
-		ucfirst($this->p->t('fehlermonitoring', 'zustaendigeOrganisationseinheiten')),
-	    'BPK',
-	    'Matrikelnummer'
+		ucfirst($this->p->t('fehlermonitoring', 'zustaendigeOrganisationseinheiten'))
     ),
 	'formatRow' => function($datasetRaw) {
 
@@ -226,16 +221,6 @@ $filterWidgetArray = array(
 			$datasetRaw->{'Organisationseinheit Zuständigkeiten'} = '-';
 		}
 
-		if ($datasetRaw->{'BPK'} == null)
-		{
-			$datasetRaw->{'BPK'} = '-';
-		}
-
-		if ($datasetRaw->{'Matrikelnummer'} == null)
-		{
-			$datasetRaw->{'Matrikelnummer'} = '-';
-		}
-
 		return $datasetRaw;
 	},
 	'markRow' => function($datasetRaw) {

application/views/system/issues/plausichecks.php

@@ -1,101 +0,0 @@
-<?php
-$this->load->view(
-	'templates/FHC-Header',
-	array(
-		'title' => 'Plausichecks',
-		'jquery3' => true,
-		'jqueryui1' => true,
-		'jquerycheckboxes' => true,
-		'bootstrap3' => true,
-		'fontawesome4' => true,
-		'sbadmintemplate3' => true,
-		'ajaxlib' => true,
-		'navigationwidget' => true,
-		'dialoglib' => true,
-		'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css'),
-		'customJSs' => array('public/js/issues/plausichecks.js')
-	)
-);
-?>
-
-<div id="wrapper">
-
-	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
-
-	<div id="page-wrapper">
-		<div class="container-fluid">
-			<div class="row">
-				<div class="col-lg-12">
-					<h3 class="page-header">
-						Plausichecks
-					</h3>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-2 form-group">
-					<label>Studiensemester</label>
-					<select class="form-control" name="studiensemester" id="studiensemester">
-						<?php
-						foreach ($semester as $sem):
-							$selected = $sem->studiensemester_kurzbz === $currsemester[0]->studiensemester_kurzbz ? ' selected=""' : '';
-							?>
-							<option value="<?php echo $sem->studiensemester_kurzbz ?>"<?php echo $selected ?>>
-								<?php echo $sem->studiensemester_kurzbz ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-				</div>
-				<div class="col-xs-4 form-group">
-					<label>Studiengang</label>
-					<select class="form-control" name="studiengang_kz" id="studiengang_kz">
-						<option value="" selected="selected">Alle</option>';
-						<?php
-						$typ = '';
-						foreach ($studiengaenge as $studiengang):
-							if ($typ != $studiengang->typ || $typ == '')
-							{
-								if ($typ != '')
-									echo '</optgroup>';
-
-								echo '<optgroup label = "'.($studiengang->typbezeichnung !== '' ? $studiengang->typbezeichnung : $studiengang).'">';
-							}
-							$typ = $studiengang->typ;
-							?>
-							<option value="<?php echo $studiengang->studiengang_kz ?>">
-								<?php echo $studiengang->kuerzel . ' - ' . $studiengang->bezeichnung ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-				</div>
-				<div class="col-xs-3 col-lg-4 form-group">
-					<label>Fehler</label>
-					<select class="form-control" name="fehler_kurzbz" id="fehler_kurzbz">
-						<option value="" selected="selected">Alle</option>';
-						<?php foreach ($fehler as $fehler_kurzbz):?>
-							<option value="<?php echo $fehler_kurzbz ?>">
-								<?php echo $fehler_kurzbz ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-				</div>
-				<div class="col-xs-3 col-lg-2 form-group text-right">
-					<label>&nbsp;</label>
-					<br />
-					<button class="btn btn-default" id="plausistart">Checks starten</button>
-				</div>
-			</div>
-			<div class="row">
-				<div class="col-xs-12">
-					<div class="well well-sm wellminheight">
-						<h4 class="text-center">Output:</h4>
-						<div id="plausioutput" class="panel panel-body">
-							<div id="plausioutput-text">-</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/system/messages/htmlRead.php

@@ -44,7 +44,7 @@
 											</td>
 											<td>
 
-												<?php echo $sender; ?>
+												<?php echo $sender->vorname.' '.$sender->nachname; ?>
 
 											</td>
 										</tr>

cis/private/lehre/abgabe_lektor.php

@@ -61,10 +61,8 @@ $sql_query = "SELECT
 			FROM
 			(SELECT tbl_person.vorname, tbl_person.nachname, tbl_studiengang.typ, tbl_studiengang.kurzbz,
 			tbl_projektarbeit.projekttyp_kurzbz, tbl_projekttyp.bezeichnung, tbl_projektarbeit.titel, tbl_projektarbeit.projektarbeit_id,
-			tbl_projektbetreuer.betreuerart_kurzbz, tbl_betreuerart.beschreibung AS betreuerart_beschreibung, tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
-			FROM lehre.tbl_projektarbeit
-			LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
-			LEFT JOIN lehre.tbl_betreuerart using(betreuerart_kurzbz)
+			tbl_projektbetreuer.betreuerart_kurzbz, tbl_benutzer.uid, tbl_student.matrikelnr, tbl_lehreinheit.studiensemester_kurzbz
+			 FROM lehre.tbl_projektarbeit LEFT JOIN lehre.tbl_projektbetreuer using(projektarbeit_id)
 			LEFT JOIN public.tbl_benutzer on(uid=student_uid)
 			LEFT JOIN public.tbl_student on(public.tbl_benutzer.uid=public.tbl_student.student_uid)
 			LEFT JOIN public.tbl_person on(tbl_benutzer.person_id=tbl_person.person_id)
@@ -77,7 +75,8 @@ $sql_query = "SELECT
 				WHERE public.tbl_benutzer.person_id=lehre.tbl_projektbetreuer.person_id
 				AND public.tbl_benutzer.uid=".$db->db_add_param($getuid).")
 			".($showall?'':' AND public.tbl_benutzer.aktiv AND lehre.tbl_projektarbeit.note IS NULL ')."
-			AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Zweitbegutachter', 'Erstbetreuer', 'Senatsvorsitz', 'Senatsmitglied')
+			AND (betreuerart_kurzbz='Betreuer' OR betreuerart_kurzbz='Begutachter' OR betreuerart_kurzbz='Erstbegutachter'
+				OR betreuerart_kurzbz='Zweitbegutachter' OR betreuerart_kurzbz='Erstbetreuer')
 			ORDER BY tbl_projektarbeit.projektarbeit_id, betreuerart_kurzbz desc) as xy
 		ORDER BY nachname";
 
@@ -113,7 +112,7 @@ else
 		$htmlstr .= "       <td>".strtoupper($row->typ.$row->kurzbz)."</td>\n";
 		$htmlstr .= "       <td>".$db->convert_html_chars($row->studiensemester_kurzbz)."</td>\n";
 		$htmlstr .= "       <td>".$db->convert_html_chars($row->titel)."</td>\n";
-		$htmlstr .= "       <td>".($row->betreuerart_beschreibung == null ? $db->convert_html_chars($row->betreuerart_kurzbz) : $db->convert_html_chars($row->betreuerart_beschreibung))."</td>\n";
+		$htmlstr .= "       <td>".$db->convert_html_chars($row->betreuerart_kurzbz)."</td>\n";
 		$htmlstr .= "   </tr>\n";
 		$i++;
 	}
@@ -128,11 +127,11 @@ echo '
 		<title>'.$p->t('abgabetool/abgabetool').'</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
-		<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
+		<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 <script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
 		<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
 		<script language="JavaScript" type="text/javascript">

cis/private/lehre/abgabe_lektor_details.php

@@ -119,12 +119,11 @@ if(!$projektarbeit_obj->load($projektarbeit_id))
 	die('Fehler beim Laden der Projektarbeit');
 $titel = $projektarbeit_obj->titel;
 $student_uid = $projektarbeit_obj->student_uid;
-$projekttyp_kurzbz = $projektarbeit_obj->projekttyp_kurzbz;
 
 // paarbeit sollte nur ab bestimmten Zeitpunkt online bewertet werden
-$paIsCurrent = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
+$num_rows_sem = $projektarbeit_obj->projektarbeitIsCurrent($projektarbeit_id);
 
-if(!is_numeric($paIsCurrent) || $paIsCurrent < 0)
+if(!is_numeric($num_rows_sem) || $num_rows_sem < 0)
 {
 	echo "<font color=\"#FF0000\">".$p->t('abgabetool/fehlerAktualitaetProjektarbeit')."</font><br>&nbsp;";
 }
@@ -144,28 +143,27 @@ if($num_rows_endupload < 0)
 }
 
 // Zweitbegutachter holen
-if(in_array($betreuerart, array('Erstbegutachter', 'Senatsvorsitz')))
+if($betreuerart=="Erstbegutachter")
 {
-	$alleBegutachter = new projektbetreuer();
-	$alleBegutachterRes = $alleBegutachter->getProjektbetreuer($projektarbeit_id);
+	$projektbetreuer = new projektbetreuer();
+	$alleBegutachter = $projektbetreuer->getProjektbetreuer($projektarbeit_id);
 
-	if ($alleBegutachterRes)
+	if ($alleBegutachter)
 	{
-		$zweitbetreuerArr = array();
-		foreach ($alleBegutachter->result as $begutachter)
+		$alleBegutachterResults = $projektbetreuer->result;
+
+		foreach ($alleBegutachterResults as $begutachter)
 		{
-			if (in_array($begutachter->betreuerart_kurzbz, array('Erstbegutachter', 'Senatsvorsitz')))
+			if ($begutachter->betreuerart_kurzbz == "Erstbegutachter")
 			{
-				// dem Erstbetreuer zugewiesene Zweitbetreuer holen
 				$erstbetreuer_id = $begutachter->person_id;
-				$zweitbegutachter = new projektbetreuer();
-				$zweitbegutachterRes = $zweitbegutachter->getZweitbegutachterWithToken($erstbetreuer_id, $projektarbeit_id, $student_uid);
-				if ($zweitbegutachterRes) $zweitbetreuerArr = array_merge($zweitbetreuerArr, $zweitbegutachter->result);
+				$zweitbegutachter = $projektbetreuer->getZweitbegutachterWithToken($erstbetreuer_id, $projektarbeit_id, $student_uid);
+				break;
 			}
 		}
 
 		// Mail mit Token an Zweitbegutachter senden
-		if (count($zweitbetreuerArr) > 0 && $paIsCurrent >= 1 && isset($_GET['zweitbegutachtertoken']) && isset($_GET['zweitbetreuer_person_id']))
+		if ($zweitbegutachter && $num_rows_sem >= 1 && isset($_GET['zweitbegutachtertoken']))
 		{
 			$qry_std="SELECT * FROM campus.vw_benutzer where uid=".$db->db_add_param($uid);
 			if(!$result_std=$db->db_query($qry_std))
@@ -175,24 +173,15 @@ if(in_array($betreuerart, array('Erstbegutachter', 'Senatsvorsitz')))
 			else
 			{
 				$row_std=@$db->db_fetch_object($result_std);
-				foreach ($zweitbetreuerArr as $zbg)
-				{
-					// if Zweitbetreuer is the one for which token was requested, send mail
-					if ($zbg->person_id == $_GET['zweitbetreuer_person_id'])
-					{
-						$mailres = sendZweitbegutachterMail($zbg, $erstbetreuer_id, $row_std, $projekttyp_kurzbz);
+				$mailres = sendZweitbegutachterMail($zweitbegutachter, $erstbetreuer_id, $row_std);
 
-						if ($mailres)
-						{
-							echo "<br><span style='color: green; '>"
-								.$p->t('abgabetool/zweitbegutachterMailGesendet', array($zbg->voller_name, $zbg->email))
-								."</span><br>&nbsp;";
-						}
-						else
-						{
-							echo "<font color=\"#FF0000\">".$p->t('abgabetool/fehlerMailZweitBegutachter')." Mail: ".$zbg->email."</font><br>&nbsp;";
-						}
-					}
+				if ($mailres)
+				{
+					echo "<br><span style='color: green; '>".$p->t('abgabetool/zweitbegutachterMailGesendet', $zweitbegutachter->email)."</span><br>&nbsp;";
+				}
+				else
+				{
+					echo "<font color=\"#FF0000\">".$p->t('abgabetool/fehlerMailZweitBegutachter')." Mail: ".$zweitbegutachter->email."</font><br>&nbsp;";
 				}
 			}
 		}
@@ -225,14 +214,12 @@ echo '
 				cursor: pointer;
 				outline: inherit;
 			}
-
 			#zweitbetrmailicon {
 				top: 4px;
 				height: 18px;
 				width: 18px;
 				position: relative;
 			}
-
 			#tokenmailicon {
 				top: 2px;
 				height: 15px;
@@ -240,9 +227,6 @@ echo '
 				position: relative;
 			}
 
-			.warningtext {
-				color: #8a6d3b;
-			}
 		</style>
 
 		<script language="Javascript">
@@ -481,13 +465,12 @@ $htmlstr .= "<table id='beurteilungheadertable' width=100%>\n";
 $htmlstr .= "<tr><td style='font-size:16px'>".$p->t('abgabetool/student').": <b>".$db->convert_html_chars($studentenname)."</b></td>";
 $htmlstr .= "<td width=10% align=center>";
 
-$semester_benotbar = $paIsCurrent >= 1;
+$semester_benotbar = $num_rows_sem >= 1;
 $endupload_vorhanden = $num_rows_endupload >= 1;
 
 if ($semester_benotbar && $endupload_vorhanden)
 {
-	$beurtPfad = $betreuerart == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-	$htmlstr .= "<form action='../../../index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/".$beurtPfad."' title='Benotungsformular' target='_blank' method='GET'>";
+	$htmlstr .= "<form action='../../../index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/Projektarbeitsbeurteilung' title='Benotungsformular' target='_blank' method='GET'>";
 	$htmlstr .= "<input type='hidden' name='projektarbeit_id' value='".$projektarbeit_id."'>\n";
 	$htmlstr .= "<input type='hidden' name='uid' value='".$uid."'>\n";
 	$htmlstr .= "<input type='submit' name='note' value='".$p->t('abgabetool/benoten')."'></form>";
@@ -513,51 +496,32 @@ else
 {
 	$htmlstr .= "<td>&nbsp;</td></tr>";
 }
-$htmlstr .= "<tr>
-					<td style='font-size:16px'>" . $p->t('abgabetool/titel') . ": <b>".$db->convert_html_chars($titel)."<b></td>
-					<td align='center' class='warningtext'>".(isset($quick_info) ? $quick_info : '')."</td>
-					<td valign=\"right\"><a href='abgabe_student_frameset.php?uid=$uid' target='_blank'>".$p->t('abgabetool/studentenansicht')."</a></td>";
+$htmlstr .= "<tr><td style='font-size:16px'>" . $p->t('abgabetool/titel') . ": <b>".$db->convert_html_chars($titel)."<b></td><td></td><td valign=\"right\"><a href='abgabe_student_frameset.php?uid=$uid' target='_blank'>".$p->t('abgabetool/studentenansicht')."</a></td>";
 $htmlstr .= "</tr>\n";
-
-if (isset($zweitbetreuerArr) && is_array($zweitbetreuerArr)) // wenn es Zweitbetreuer gibt
+if (isset($zweitbegutachter) && $zweitbegutachter) // wenn es Zweitbegutachter gibt
 {
-	// Zweitbetreuer anzeigen
+	// Zweitbegutachter anzeigen
 	$htmlstr .= "<tr>\n";
-	$htmlstr .= "<td style='font-size:16px'>";
-	$bart = '';
-	foreach($zweitbetreuerArr as $zweitbetreuer)
+	$htmlstr .= "<td style='font-size:16px'>" . $p->t('abgabetool/zweitBegutachter') . ": <b>" . $zweitbegutachter->voller_name . "</b>";
+
+	// keine Mail -> Fehler anzeigen
+	if (!isset($zweitbegutachter->email))
+		$htmlstr .= "&nbsp;&nbsp;<img src='../../../skin/images/exclamation.png' title='" . $p->t('abgabetool/zweitBegutachterEmailFehlt') . "' alt='" . $p->t('abgabetool/zweitBegutachterEmailFehlt') . "'/>";
+
+	// Token senden button wenn Zweitbegutachter extern ist und Projektarbeit nicht für altes Semester ist
+	if (isset($zweitbegutachter->email) && !isset($zweitbegutachter->uid) && $num_rows_sem >= 1)
 	{
-		if ($bart !== $zweitbetreuer->betreuerart_kurzbz)
-		{
-			$htmlstr .= ($zweitbetreuer->betreuerart_kurzbz == 'Senatsmitglied' ? $p->t('abgabetool/senatsMitglied') : $p->t('abgabetool/zweitBegutachter'));
-			$htmlstr .= ": ";
-			$bart = $zweitbetreuer->betreuerart_kurzbz;
-		}
-		else
-			$htmlstr .= ", ";
-
-		$htmlstr .= "<b>" . $zweitbetreuer->voller_name . "</b>";
-
-		// keine Mail -> Fehler anzeigen
-		if (!isset($zweitbetreuer->email))
-			$htmlstr .= "&nbsp;&nbsp;<img src='../../../skin/images/exclamation.png' title='" . $p->t('abgabetool/zweitBegutachterEmailFehlt') . "' alt='" . $p->t('abgabetool/zweitBegutachterEmailFehlt') . "'/>";
-
-		// Token senden button wenn Zweitbegutachter extern ist und Projektarbeit nicht für altes Semester ist
-		if (isset($zweitbetreuer->email) && !isset($zweitbetreuer->uid) && $paIsCurrent >= 1)
-		{
-			$htmlstr .= "<form action='" . htmlspecialchars($_SERVER['PHP_SELF']) . "' method='GET' style='display: inline'>\n";
-			$htmlstr .= "<input type='hidden' name='uid' value='" . $student_uid . "'>";
-			$htmlstr .= "<input type='hidden' name='projektarbeit_id' value='" . $projektarbeit_id . "'>";
-			$htmlstr .= "<input type='hidden' name='betreuerart' value='" . $betreuerart . "'>";
-			$htmlstr .= "<input type='hidden' name='zweitbetreuer_person_id' value='" . $zweitbetreuer->person_id . "'>";
-			$htmlstr .= "&nbsp;<a href='mailto:".$zweitbetreuer->email."'><img id='zweitbetrmailicon' src='../../../skin/images/email.png'
-			title='" . $p->t('abgabetool/zweitbetreuerMailSenden', array($zweitbetreuer->voller_name, $zweitbetreuer->email)) . "'
-			alt='" . $p->t('abgabetool/zweitbetreuerMailSenden', array($zweitbetreuer->voller_name, $zweitbetreuer->email)) . "'/></a>\n";
-			$htmlstr .= "&nbsp;<button type='submit' name='zweitbegutachtertoken' title='" . $p->t('abgabetool/zweitbetreuerTokenMailSenden') . "'>
-			<img id='tokenmailicon' src='../../../skin/images/repeat.png' alt='" . $p->t('abgabetool/zweitbetreuerTokenMailSenden') . "'/></button>";
-			$htmlstr .= "</form>";
-		}
+		$htmlstr .= "<form action='" . htmlspecialchars($_SERVER['PHP_SELF']) . "' method='GET' style='display: inline'>\n";
+		$htmlstr .= "<input type='hidden' name='uid' value='" . $student_uid . "'>";
+		$htmlstr .= "<input type='hidden' name='projektarbeit_id' value='" . $projektarbeit_id . "'>";
+		$htmlstr .= "<input type='hidden' name='betreuerart' value='" . $betreuerart . "'>";
+		$htmlstr .= "&nbsp;<a href='mailto:".$zweitbegutachter->email."'><img id='zweitbetrmailicon' src='../../../skin/images/email.png'
+						title='" . $p->t('abgabetool/zweitbetreuerMailSenden', $zweitbegutachter->email) . "' alt='" . $p->t('abgabetool/zweitbetreuerMailSenden', $zweitbegutachter->email) . "'/></a>\n";
+		$htmlstr .= "&nbsp;<button type='submit' name='zweitbegutachtertoken' title='" . $p->t('abgabetool/zweitbetreuerTokenMailSenden') . "'>
+						<img id='tokenmailicon' src='../../../skin/images/repeat.png' alt='" . $p->t('abgabetool/zweitbetreuerTokenMailSenden') . "'/></button>\n";
+		$htmlstr .= "</form>";
 	}
+
 	$htmlstr .= "</td>\n";
 	$htmlstr .= "<td></td>\n";
 	$htmlstr .= "<td></td>\n";
@@ -581,122 +545,122 @@ $htmlstr .= "<tr>
 				<td></td>
 			</tr>\n";
 $result=@$db->db_query($qry);
-while ($row=@$db->db_fetch_object($result))
-{
-	$htmlstr .= "<form action='".$_SERVER['PHP_SELF']."' method='POST' name='".$row->projektarbeit_id."'>\n";
-	$htmlstr .= "<input type='hidden' name='projektarbeit_id' value='".$row->projektarbeit_id."'>\n";
-	$htmlstr .= "<input type='hidden' name='paabgabe_id' value='".$row->paabgabe_id."'>\n";
-	$htmlstr .= "<input type='hidden' name='uid' value='".$uid."'>\n";
-	$htmlstr .= "<input type='hidden' name='betreuerart' value='".$betreuerart."'>\n";
-	$htmlstr .= "<input type='hidden' name='command' value='update'>\n";
-	$htmlstr .= "<tr id='".$row->projektarbeit_id."'>\n";
-	if(!$row->abgabedatum)
+	while ($row=@$db->db_fetch_object($result))
 	{
-		if ($row->datum<date('Y-m-d'))
-		{
-			//Termin vorbei - weiß auf rot
-			$bgcol='#FF0000';
-			$fcol='#FFFFFF';
-		}
-		elseif (($row->datum>=date('Y-m-d')) && ($row->datum<date('Y-m-d',mktime(0, 0, 0, date("m")  , date("d")+11, date("Y")))))
-		{
-			//Termin nahe - schwarz auf gelb
-			$bgcol='#FFFF00';
-			$fcol='#000000';
-		}
-		else
-		{
-			//"normaler" Termin - schwarz auf weiß
-			$bgcol='#FFFFFF';
-			$fcol='#000000';
-		}
-	}
-	else
-	{
-		if($row->abgabedatum>$row->datum)
-		{
-			//Abgabe nach Termin - weiß auf hellrot
-			$bgcol='#EA7B7B';
-			$fcol='#FFFFFF';
-		}
-		else
-		{
-			//Abgabe vor Termin - schwarz auf grün
-			$bgcol='#00FF00';
-			$fcol='#000000';
-		}
-	}
-	//$htmlstr .= "<td><input type='checkbox' name='fixtermin' ".($row->fixtermin=='t'?'checked=\"checked\"':'')." >";
-	//$htmlstr .= "<td><input type='checkbox' name='fixtermin' ".($row->fixtermin=='t'?'checked="checked" style="background-color:#FF0000;"':'')." disabled>";
-	if($row->fixtermin=='t')
-	{
-		$htmlstr .= "<td><img src='../../../skin/images/bullet_red.png' alt='J' title='".$p->t('abgabetool/fixerAbgabetermin')."' border=0></td>";
-	}
-	else
-	{
-		$htmlstr .= "<td><img src='../../../skin/images/bullet_green.png' alt='N' title='".$p->t('abgabetool/variablerAbgabetermin')."' border=0></td>";
-	}
-	$htmlstr .= "		</td>\n";
-	$htmlstr .= "		<td><input  type='text' name='datum' style='background-color:".$bgcol.";font-weight:bold; color:".$fcol." ' value='".$datum_obj->formatDatum($row->datum,'d.m.Y')."' size='10' maxlegth='10'></td>\n";
-	$htmlstr .= "		<td><select name='paabgabetyp_kurzbz'>\n";
-	//$htmlstr .= "			<option value=''>&nbsp;</option>";
-	$qry_typ="SELECT * FROM campus.tbl_paabgabetyp";
-	$result_typ=@$db->db_query($qry_typ);
-	while ($row_typ=@$db->db_fetch_object($result_typ))
-	{
-		if($row->paabgabetyp_kurzbz==$row_typ->paabgabetyp_kurzbz)
-		{
-			$htmlstr .= "			<option value='".$row_typ->paabgabetyp_kurzbz."' selected>$row_typ->bezeichnung</option>";
-		}
-		else
-		{
-			if($row_typ->paabgabetyp_kurzbz!='end' && $row_typ->paabgabetyp_kurzbz!='note' && $row_typ->paabgabetyp_kurzbz!='enda')
-			{
-				$htmlstr .= "			<option value='".$row_typ->paabgabetyp_kurzbz."'>$row_typ->bezeichnung</option>";
-			}
-		}
-	}
-	$htmlstr .= "		</select></td>\n";
-	$htmlstr .= "		<td><input type='text' name='kurzbz' value='".htmlspecialchars($row->kurzbz,ENT_QUOTES)."' size='60' maxlegth='256'></td>\n";
-	$htmlstr .= "		<td>".($row->abgabedatum==''?'&nbsp;':$datum_obj->formatDatum($row->abgabedatum,'d.m.Y'))."</td>\n";
-	if($user==$row->insertvon && $betreuerart!="Zweitbegutachter")
-	{
-		$htmlstr .= "		<td><input type='submit' name='schick' value='".$p->t('global/speichern')."' title='".$p->t('abgabetool/terminaenderungSpeichern')."'></td>";
-
+		$htmlstr .= "<form action='".$_SERVER['PHP_SELF']."' method='POST' name='".$row->projektarbeit_id."'>\n";
+		$htmlstr .= "<input type='hidden' name='projektarbeit_id' value='".$row->projektarbeit_id."'>\n";
+		$htmlstr .= "<input type='hidden' name='paabgabe_id' value='".$row->paabgabe_id."'>\n";
+		$htmlstr .= "<input type='hidden' name='uid' value='".$uid."'>\n";
+		$htmlstr .= "<input type='hidden' name='betreuerart' value='".$betreuerart."'>\n";
+		$htmlstr .= "<input type='hidden' name='command' value='update'>\n";
+		$htmlstr .= "<tr id='".$row->projektarbeit_id."'>\n";
 		if(!$row->abgabedatum)
 		{
-			$htmlstr .= "		<td><input type='submit' name='del' value='".$p->t('global/loeschen')."' onclick='return confdel()' title='".$p->t('abgabetool/terminLoeschen')."'></td>";
+			if ($row->datum<date('Y-m-d'))
+			{
+				//Termin vorbei - weiß auf rot
+				$bgcol='#FF0000';
+				$fcol='#FFFFFF';
+			}
+			elseif (($row->datum>=date('Y-m-d')) && ($row->datum<date('Y-m-d',mktime(0, 0, 0, date("m")  , date("d")+11, date("Y")))))
+			{
+				//Termin nahe - schwarz auf gelb
+				$bgcol='#FFFF00';
+				$fcol='#000000';
+			}
+			else
+			{
+				//"normaler" Termin - schwarz auf weiß
+				$bgcol='#FFFFFF';
+				$fcol='#000000';
+			}
 		}
 		else
 		{
-			$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
+			if($row->abgabedatum>$row->datum)
+			{
+				//Abgabe nach Termin - weiß auf hellrot
+				$bgcol='#EA7B7B';
+				$fcol='#FFFFFF';
+			}
+			else
+			{
+				//Abgabe vor Termin - schwarz auf grün
+				$bgcol='#00FF00';
+				$fcol='#000000';
+			}
 		}
-	}
-	else
-	{
-		$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
-	}
-	if(file_exists(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf'))
-	{
-		$htmlstr .= "		<td><a href='".$_SERVER['PHP_SELF']."?id=".$row->paabgabe_id."&uid=$uid' target='_blank'><img src='../../../skin/images/pdf.ico' alt='PDF' title='".$p->t('abgabetool/abgegebeneDatei')."' border=0></a></td>";
-	}
-	else
-	{
-		$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>";
-	}
-	if($row->abgabedatum && $row->paabgabetyp_kurzbz=="end")
-	{
-		$htmlstr .= "		<td><a href='abgabe_lektor_zusatz.php?paabgabe_id=".$row->paabgabe_id."&uid=$uid&projektarbeit_id=$projektarbeit_id' target='_blank'><img src='../../../skin/images/folder.gif' alt='zusätzliche Daten' title='".$p->t('abgabetool/kontrolleZusatzdaten')."' border=0></a></td>";
-	}
-	else
-	{
-		$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>";
-	}
-	$htmlstr .= "	</tr>\n";
+		//$htmlstr .= "<td><input type='checkbox' name='fixtermin' ".($row->fixtermin=='t'?'checked=\"checked\"':'')." >";
+		//$htmlstr .= "<td><input type='checkbox' name='fixtermin' ".($row->fixtermin=='t'?'checked="checked" style="background-color:#FF0000;"':'')." disabled>";
+		if($row->fixtermin=='t')
+		{
+			$htmlstr .= "<td><img src='../../../skin/images/bullet_red.png' alt='J' title='".$p->t('abgabetool/fixerAbgabetermin')."' border=0></td>";
+		}
+		else
+		{
+			$htmlstr .= "<td><img src='../../../skin/images/bullet_green.png' alt='N' title='".$p->t('abgabetool/variablerAbgabetermin')."' border=0></td>";
+		}
+		$htmlstr .= "		</td>\n";
+		$htmlstr .= "		<td><input  type='text' name='datum' style='background-color:".$bgcol.";font-weight:bold; color:".$fcol." ' value='".$datum_obj->formatDatum($row->datum,'d.m.Y')."' size='10' maxlegth='10'></td>\n";
+		$htmlstr .= "		<td><select name='paabgabetyp_kurzbz'>\n";
+		//$htmlstr .= "			<option value=''>&nbsp;</option>";
+		$qry_typ="SELECT * FROM campus.tbl_paabgabetyp";
+		$result_typ=@$db->db_query($qry_typ);
+		while ($row_typ=@$db->db_fetch_object($result_typ))
+		{
+			if($row->paabgabetyp_kurzbz==$row_typ->paabgabetyp_kurzbz)
+			{
+				$htmlstr .= "			<option value='".$row_typ->paabgabetyp_kurzbz."' selected>$row_typ->bezeichnung</option>";
+			}
+			else
+			{
+				if($row_typ->paabgabetyp_kurzbz!='end' && $row_typ->paabgabetyp_kurzbz!='note' && $row_typ->paabgabetyp_kurzbz!='enda')
+				{
+					$htmlstr .= "			<option value='".$row_typ->paabgabetyp_kurzbz."'>$row_typ->bezeichnung</option>";
+				}
+			}
+		}
+		$htmlstr .= "		</select></td>\n";
+		$htmlstr .= "		<td><input type='text' name='kurzbz' value='".htmlspecialchars($row->kurzbz,ENT_QUOTES)."' size='60' maxlegth='256'></td>\n";
+		$htmlstr .= "		<td>".($row->abgabedatum==''?'&nbsp;':$datum_obj->formatDatum($row->abgabedatum,'d.m.Y'))."</td>\n";
+		if($user==$row->insertvon && $betreuerart!="Zweitbegutachter")
+		{
+			$htmlstr .= "		<td><input type='submit' name='schick' value='".$p->t('global/speichern')."' title='".$p->t('abgabetool/terminaenderungSpeichern')."'></td>";
+
+			if(!$row->abgabedatum)
+			{
+				$htmlstr .= "		<td><input type='submit' name='del' value='".$p->t('global/loeschen')."' onclick='return confdel()' title='".$p->t('abgabetool/terminLoeschen')."'></td>";
+			}
+			else
+			{
+				$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
+			}
+		}
+		else
+		{
+			$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>";
+		}
+		if(file_exists(PAABGABE_PATH.$row->paabgabe_id.'_'.$uid.'.pdf'))
+		{
+			$htmlstr .= "		<td><a href='".$_SERVER['PHP_SELF']."?id=".$row->paabgabe_id."&uid=$uid' target='_blank'><img src='../../../skin/images/pdf.ico' alt='PDF' title='".$p->t('abgabetool/abgegebeneDatei')."' border=0></a></td>";
+		}
+		else
+		{
+			$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>";
+		}
+		if($row->abgabedatum && $row->paabgabetyp_kurzbz=="end")
+		{
+			$htmlstr .= "		<td><a href='abgabe_lektor_zusatz.php?paabgabe_id=".$row->paabgabe_id."&uid=$uid&projektarbeit_id=$projektarbeit_id' target='_blank'><img src='../../../skin/images/folder.gif' alt='zusätzliche Daten' title='".$p->t('abgabetool/kontrolleZusatzdaten')."' border=0></a></td>";
+		}
+		else
+		{
+			$htmlstr .= "		<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>";
+		}
+		$htmlstr .= "	</tr>\n";
 
 
-	$htmlstr .= "</form>\n";
-}
+		$htmlstr .= "</form>\n";
+	}
 
 //Eingabezeile fuer neuen Termin
 $htmlstr .= '<form action="'.htmlspecialchars($_SERVER['PHP_SELF']).'" method="POST" name="'.$db->convert_html_chars($projektarbeit_id).'">'."\n";
@@ -744,7 +708,7 @@ echo $htmlstr;
  * @param object $student
  * @return bool|projektbetreuer|void|null
  */
-function sendZweitbegutachterMail($zweitbegutachter, $erstbegutachter_person_id, $student, $projekttyp_kurzbz)
+function sendZweitbegutachterMail($zweitbegutachter, $erstbegutachter_person_id, $student)
 {
 	if (!isset($zweitbegutachter->email) || $zweitbegutachter->email == '')
 		return false;
@@ -757,20 +721,12 @@ function sendZweitbegutachterMail($zweitbegutachter, $erstbegutachter_person_id,
 	if (!$projektbetreuer)
 		return $projektbetreuer;
 
-	$zweitbetrRes = $projektbetreuer->getZweitbegutachterWithToken(
-		$erstbegutachter_person_id,
-		$zweitbegutachter->projektarbeit_id,
-		$student->uid,
-		$zweitbegutachter->person_id
-	);
+	$zweitbetr = $projektbetreuer->getZweitbegutachterWithToken($erstbegutachter_person_id, $zweitbegutachter->projektarbeit_id, $student->uid);
 
-	if ($zweitbetrRes && isset($projektbetreuer->result[0]))
+	if ($zweitbetr)
 	{
-		$zweitbetr = $projektbetreuer->result[0];
 		$intern = isset($zweitbetr->uid);
-		$mail_link_path = $zweitbetr->betreuerart_kurzbz == 'Zweitbegutachter' ? 'ProjektarbeitsbeurteilungZweitbegutachter' : 'ProjektarbeitsbeurteilungErstbegutachter';
-		$mail_subject = $projekttyp_kurzbz == 'Diplom' ? 'Masterarbeitsbetreuung' : 'Bachelorarbeitsbetreuung';
-		$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/$mail_link_path";
+		$mail_baselink = APP_ROOT."index.ci.php/extensions/FHC-Core-Projektarbeitsbeurteilung/Projektarbeitsbeurteilung";
 		$mail_fulllink = "$mail_baselink?projektarbeit_id=".$zweitbegutachter->projektarbeit_id."&uid=".$student->uid;
 		$mail_link = $intern ? $mail_fulllink : $mail_baselink;
 
@@ -789,7 +745,7 @@ function sendZweitbegutachterMail($zweitbegutachter, $erstbegutachter_person_id,
 			'ParbeitsbeurteilungEndupload',
 			$maildata,
 			$zweitbetr->email,
-			$mail_subject,
+			"Masterarbeitsbetreuung",
 			'sancho_header_min_bw.jpg',
 			'sancho_footer_min_bw.jpg'
 		);

cis/private/lehre/abgabe_student.php

@@ -1,283 +1,248 @@
-<?php
-/* Copyright (C) 2009 Technikum-Wien
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authors: Christian Paminger 		< [email protected] >
- *          Andreas Oesterreicher 	< [email protected] >
- *          Rudolf Hangl 			< [email protected] >
- *          Gerald Simane-Sequens 	< [email protected] >
- */
-
-require_once('../../../config/cis.config.inc.php');
-require_once('../../../include/functions.inc.php');
-require_once('../../../include/datum.class.php');
-require_once('../../../include/person.class.php');
-require_once('../../../include/benutzer.class.php');
-require_once('../../../include/student.class.php');
-require_once('../../../include/studiengang.class.php');
-require_once('../../../include/projektbetreuer.class.php');
-require_once('../../../include/benutzerberechtigung.class.php');
-require_once('../../../include/phrasen.class.php');
-
-$sprache = getSprache();
-$p = new phrasen($sprache);
-
-if (!$db = new basis_db())
-	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
-
-$getuid=get_uid();
-$uid=$getuid;
-
-if(isset($_GET['uid']))
-{
-	//Studentenansicht
-	$uid = $_GET['uid'];
-	//Rechte Pruefen
-	$allowed=false;
-
-	$student = new student();
-	if(!$student->load($uid))
-		die($p->t('global/fehlerBeimErmittelnDerUID'));
-
-	$stg_obj = new studiengang();
-	if(!$stg_obj->load($student->studiengang_kz))
-		die($p->t('global/fehlerBeimLesenAusDatenbank'));
-
-	//Berechtigung ueber das Berechtigungssystem
-	$rechte = new benutzerberechtigung();
-	$rechte->getBerechtigungen($getuid);
-	if($rechte->isBerechtigt('lehre/abgabetool',$stg_obj->oe_kurzbz,'s'))
-		$allowed=true;
-
-	//oder Lektor mit Betreuung dieses Studenten
-	$qry = "SELECT 1
-			FROM
-				lehre.tbl_projektarbeit
-				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
-			WHERE
-				tbl_projektarbeit.student_uid=".$db->db_add_param($uid)." AND
-				vw_benutzer.uid=".$db->db_add_param($getuid).";";
-
-	if($result = $db->db_query($qry))
-	{
-		if($db->db_num_rows($result)>0)
-		{
-			$allowed=true;
-		}
-	}
-
-	if(!$allowed)
-	{
-		die($p->t('abgabetool/keineBerechtigungStudentenansicht'));
-	}
-}
-$htmlstr = '';
-$htmlstr1 = '';
-$vorname='';
-$nachname='';
-$zweitbetreuer = '';
-$senatsmitglied = '';
-
-$sql_query = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
-			(SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
-			(SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
-			(SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
-			tbl_betreuerart.beschreibung AS betreuerart_beschreibung,
-			(SELECT person_id FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
-			(SELECT betreuerart_kurzbz FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
-			(SELECT tbl_betreuerart.beschreibung FROM lehre.tbl_projektbetreuer JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz) WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
-			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter', 'Senatsmitglied') LIMIT 1) AS zweitbetreuer_betreuerart_beschreibung,
-			tbl_projektbetreuer.person_id AS betreuer_person_id,
-			tbl_projekttyp.bezeichnung AS prjbez, *,
-			lehre.tbl_projektbetreuer.note as note,
-			public.tbl_benutzer.aktiv as aktiv,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
-			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt,
-			(SELECT datum FROM campus.tbl_paabgabe WHERE paabgabetyp_kurzbz = 'end' AND abgabedatum IS NOT NULL AND projektarbeit_id = tbl_projektarbeit.projektarbeit_id LIMIT 1) AS abgegeben
-		FROM lehre.tbl_projektarbeit
-		LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
-		LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
-		LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
-		LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
-		LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
-		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
-		LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
-		LEFT JOIN lehre.tbl_betreuerart USING(betreuerart_kurzbz)
-		WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
-		AND betreuerart_kurzbz IN ('Betreuer', 'Begutachter', 'Erstbegutachter', 'Senatsvorsitz')
-		AND tbl_projektarbeit.student_uid=".$db->db_add_param($uid)."
-		ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
-
-//AND tbl_projektarbeit.student_uid='$getuid' 'ie07m102';
-if(!$erg=$db->db_query($sql_query))
-{
-	$errormsg=$p->t('global/fehlerBeimLesenAusDatenbank');
-}
-else
-{
-	$htmlstr .= "<form name='formular'><input type='hidden' name='check' value=''></form><table id='t1' class='tablesorter'>\n";
-	$htmlstr .= "<thead><tr>\n";
-	$htmlstr .= "
-				<th>".$p->t('abgabetool/details')."</th>
-				<th>".$p->t('lvplan/sem')."</th>
-				<th>".$p->t('lvplan/stg')."</th>
-				<th>".$p->t('global/mail')."</th>
-				<th>".$p->t('abgabetool/betreuer')."</th>
-				<th>".$p->t('abgabetool/typ')."</th>
-				<th>".$p->t('abgabetool/titel')."</th>
-				<!--<th>".$p->t('abgabetool/betreuerart')."</th>-->";
-	$htmlstr .= "</tr></thead><tbody>\n";
-	$i = 0;
-	while($row=$db->db_fetch_object($erg))
-	{
-		// get zweitbetreuer, if any
-		$htmlstr1 = '';
-		$zweitbetreuer_obj = new person();
-		if ($zweitbetreuer_obj->load($row->zweitbetreuer_person_id))
-		{
-			$zweitbetreuer = ', <b>'.$db->convert_html_chars($row->zweitbetreuer_betreuerart_kurzbz).'</b>: '.$zweitbetreuer_obj->titelpre.' '.$zweitbetreuer_obj->vorname.' '.$zweitbetreuer_obj->nachname.' '.$zweitbetreuer_obj->titelpost;
-		}
-
-		// get senatsmitglied, if any
-		if ($row->betreuerart_kurzbz == 'Senatsvorsitz')
-		{
-			// write beschreibung of Betreuerart for Senatsvorsitz
-			$htmlstr1 = '<b>'.$db->convert_html_chars($row->betreuerart_beschreibung).'</b>: ';
-
-			$senatsmitglied_obj = new projektbetreuer();
-			$senatsmitgliedRes = $senatsmitglied_obj->getZweitbegutachterWithToken($row->betreuer_person_id, $row->projektarbeit_id, $row->uid);
-			if ($senatsmitgliedRes)
-			{
-				$senatsmitglied .= ', <b>'.$db->convert_html_chars($row->zweitbetreuer_betreuerart_beschreibung).'</b>: ';
-				$first = true;
-				foreach($senatsmitglied_obj->result as $spr)
-				{
-					if (!$first)
-						$senatsmitglied .= ', ';
-					$senatsmitglied .= $spr->voller_name;
-					$first = false;
-				}
-			}
-		}
-		else
-			$htmlstr1 = '<b>'.$db->convert_html_chars($row->betreuerart_kurzbz).'</b>: ';
-
-		$vorname=$row->vorname;
-		$nachname=$row->nachname;
-		$uid=$row->uid;
-
-		($row->btitelpre!=''?$htmlstr1 .= $row->btitelpre.' ':$htmlstr1 .= '');
-		$htmlstr1 .= $row->bvorname.' '.$row->bnachname;
-		($row->btitelpost!=''?$htmlstr1 .= ' '.$row->btitelpost:$htmlstr1 .= '');
-		$htmlstr1 .= $zweitbetreuer;
-		$htmlstr1 .= $senatsmitglied;
-		$htmlstr .= "   <tr>\n"; //class='liste".($i%2)."'
-
-		if (is_null($row->note) && $row->aktiv === 't')
-			$htmlstr .= "       <td><a href='abgabe_student_details.php?uid=".$row->uid."&projektarbeit_id=".$row->projektarbeit_id."&bid=".$row->betreuer_person_id."' target='as_detail' title='Details anzeigen'>".$p->t('abgabetool/upload')."</a></td>\n";
-		elseif (!is_null($row->babgeschickt) || !is_null($row->zweitbetreuer_abgeschickt))
-		{
-			$htmlstr .= "<td>";
-
-			if (!is_null($row->babgeschickt))
-				$htmlstr .= "<a href='../pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz=" . $row->betreuerart_kurzbz . "&projektarbeit_id=" . $row->projektarbeit_id . "&person_id=" . $row->betreuer_person_id ."' title='".$p->t('abgabetool/projektbeurteilungDownload')."'>".$p->t('abgabetool/projektbeurteilungErstDownload')."</a>";
-
-			if (!is_null($row->babgeschickt) && !is_null($row->zweitbetreuer_abgeschickt))
-				$htmlstr .= "/";
-
-			if (!is_null($row->zweitbetreuer_abgeschickt))
-				$htmlstr .= "<a href='../pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz=" . $row->zweitbetreuer_betreuerart_kurzbz . "&projektarbeit_id=" . $row->projektarbeit_id . "&person_id=" . $row->zweitbetreuer_person_id."' title='".$p->t('abgabetool/projektbeurteilungDownload')."'>".$p->t('abgabetool/projektbeurteilungZweitDownload')."</a>";
-
-			$htmlstr .= "</td>";
-		}
-		elseif (!is_null($row->abgegeben))
-		{
-			$htmlstr  .= "<td>".$p->t('abgabetool/abgegeben')."</td>";
-		}
-		else
-		{
-			$htmlstr  .= "<td>-</td>";
-		}
-
-		$htmlstr .= "       <td>".$row->studiensemester_kurzbz."</td>\n";
-		$htmlstr .= "       <td>".strtoupper($row->typ.$row->kurzbz)."</td>\n";
-		$htmlstr .= "	   <td align= center>";
-
-		$qry_betr="SELECT mitarbeiter_uid FROM public.tbl_person
-			JOIN public.tbl_benutzer USING(person_id)
-			JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
-			WHERE person_id=".$db->db_add_param($row->betreuer_person_id, FHC_INTEGER).";";
-		if($result_betr=$db->db_query($qry_betr))
-		{
-			if($row_betr=$db->db_fetch_object($result_betr))
-			{
-				$htmlstr.="<a href='mailto:$row_betr->mitarbeiter_uid@".DOMAIN."?subject=Betreuung%20".$row->prjbez."%20von%20".$row->vorname."%20".$row->nachname."'><img src='../../../skin/images/email.png' alt='email' title='".$p->t('abgabetool/emailAnBetreuer')."'></a>";
-			}
-			else
-			{
-				$htmlstr.="UID unknown!";
-			}
-		}
-		$htmlstr .= "		</td>";
-		$htmlstr .= "       <td>".$htmlstr1."	    </td>\n";
-		$htmlstr .= "       <td>".$db->convert_html_chars($row->prjbez)."</td>\n";
-		$htmlstr .= "       <td>".$db->convert_html_chars($row->titel)."</td>\n";
-// 		$htmlstr .= "       <td>".$db->convert_html_chars($row->betreuerart_kurzbz)."</td>\n";
-		$htmlstr .= "   </tr>\n";
-		$i++;
-	}
-	$htmlstr .= "</tbody></table>\n";
-}
-echo '
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-	<title>Abgabesystem_Studentensicht</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
-	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
-<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
-	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
-	<script language="JavaScript" type="text/javascript">
-		$(document).ready(function()
-		{
-			$("#t1").tablesorter(
-			{
-				sortList: [[4,0]],
-				widgets: ["zebra"]
-			});
-
-		});
-	</script>
-</head>
-
-<body>';
-
-	echo '<h1><div style="float:left">'.$p->t('abgabetool/ueberschrift');
-	if(trim($uid)!='')
-		echo " ($uid $vorname $nachname)</div> <div style='text-align:right'><a href='".$p->t('dms_link/abgabetoolStudentHandbuch')."' target='_blank'><img src='../../../skin/images/information.png' alt='Anleitung' title='Anleitung Abgabetool' border=0>&nbsp;".$p->t('global/handbuch')."</a></div>";
-	echo '</h1>';
-    echo $htmlstr;
-    echo '</body>
-</html>';
-?>
+<?php
+/* Copyright (C) 2009 Technikum-Wien
+ *
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christian Paminger 		< [email protected] >
+ *          Andreas Oesterreicher 	< [email protected] >
+ *          Rudolf Hangl 			< [email protected] >
+ *          Gerald Simane-Sequens 	< [email protected] >
+ */
+
+require_once('../../../config/cis.config.inc.php');
+require_once('../../../include/functions.inc.php');
+require_once('../../../include/datum.class.php');
+require_once('../../../include/person.class.php');
+require_once('../../../include/benutzer.class.php');
+require_once('../../../include/student.class.php');
+require_once('../../../include/studiengang.class.php');
+require_once('../../../include/benutzerberechtigung.class.php');
+require_once('../../../include/phrasen.class.php');
+
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
+if (!$db = new basis_db())
+	die($p->t('global/fehlerBeimOeffnenDerDatenbankverbindung'));
+
+$getuid=get_uid();
+$uid=$getuid;
+
+if(isset($_GET['uid']))
+{
+	//Studentenansicht
+	$uid = $_GET['uid'];
+	//Rechte Pruefen
+	$allowed=false;
+
+	$student = new student();
+	if(!$student->load($uid))
+		die($p->t('global/fehlerBeimErmittelnDerUID'));
+
+	$stg_obj = new studiengang();
+	if(!$stg_obj->load($student->studiengang_kz))
+		die($p->t('global/fehlerBeimLesenAusDatenbank'));
+
+	//Berechtigung ueber das Berechtigungssystem
+	$rechte = new benutzerberechtigung();
+	$rechte->getBerechtigungen($getuid);
+	if($rechte->isBerechtigt('lehre/abgabetool',$stg_obj->oe_kurzbz,'s'))
+		$allowed=true;
+
+	//oder Lektor mit Betreuung dieses Studenten
+	$qry = "SELECT 1
+			FROM
+				lehre.tbl_projektarbeit
+				JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+				JOIN campus.vw_benutzer on(vw_benutzer.person_id=tbl_projektbetreuer.person_id)
+			WHERE
+				tbl_projektarbeit.student_uid=".$db->db_add_param($uid)." AND
+				vw_benutzer.uid=".$db->db_add_param($getuid).";";
+
+	if($result = $db->db_query($qry))
+	{
+		if($db->db_num_rows($result)>0)
+		{
+			$allowed=true;
+		}
+	}
+
+	if(!$allowed)
+	{
+		die($p->t('abgabetool/keineBerechtigungStudentenansicht'));
+	}
+}
+$htmlstr = '';
+$htmlstr1 = '';
+$vorname='';
+$nachname='';
+$zweitbetreuer = '';
+
+$sql_query = "SELECT (SELECT nachname FROM public.tbl_person  WHERE person_id=tbl_projektbetreuer.person_id) AS bnachname,
+			(SELECT vorname FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS bvorname,
+			(SELECT titelpre FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpre,
+			(SELECT titelpost FROM public.tbl_person WHERE person_id=tbl_projektbetreuer.person_id) AS btitelpost,
+			(SELECT person_id FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_person_id,
+			(SELECT betreuerart_kurzbz FROM lehre.tbl_projektbetreuer WHERE projektarbeit_id=tbl_projektarbeit.projektarbeit_id
+			AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_betreuerart_kurzbz,
+			tbl_projektbetreuer.person_id AS betreuer_person_id,
+			tbl_projekttyp.bezeichnung AS prjbez, *,
+			lehre.tbl_projektbetreuer.note as note,
+			public.tbl_benutzer.aktiv as aktiv,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuer_person_id = tbl_projektbetreuer.person_id) AS babgeschickt,
+			(SELECT abgeschicktvon FROM extension.tbl_projektarbeitsbeurteilung WHERE projektarbeit_id = tbl_projektarbeit.projektarbeit_id AND betreuerart_kurzbz IN ('Zweitbetreuer', 'Zweitbegutachter') LIMIT 1) AS zweitbetreuer_abgeschickt
+		FROM lehre.tbl_projektarbeit
+		LEFT JOIN lehre.tbl_projektbetreuer USING(projektarbeit_id)
+		LEFT JOIN public.tbl_benutzer ON(uid=student_uid)
+		LEFT JOIN public.tbl_person ON(tbl_benutzer.person_id=tbl_person.person_id)
+		LEFT JOIN lehre.tbl_lehreinheit USING(lehreinheit_id)
+		LEFT JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+		LEFT JOIN public.tbl_studiengang USING(studiengang_kz)
+		LEFT JOIN lehre.tbl_projekttyp USING (projekttyp_kurzbz)
+		WHERE (projekttyp_kurzbz='Bachelor' OR projekttyp_kurzbz='Diplom')
+		AND (tbl_projektbetreuer.betreuerart_kurzbz='Betreuer'
+			OR tbl_projektbetreuer.betreuerart_kurzbz='Begutachter'
+			OR tbl_projektbetreuer.betreuerart_kurzbz='Erstbetreuer'
+			OR tbl_projektbetreuer.betreuerart_kurzbz='Erstbegutachter')
+		AND tbl_projektarbeit.student_uid=".$db->db_add_param($uid)."
+		ORDER BY studiensemester_kurzbz desc, tbl_lehrveranstaltung.kurzbz";
+
+//AND tbl_projektarbeit.student_uid='$getuid' 'ie07m102';
+if(!$erg=$db->db_query($sql_query))
+{
+	$errormsg=$p->t('global/fehlerBeimLesenAusDatenbank');
+}
+else
+{
+	$htmlstr .= "<form name='formular'><input type='hidden' name='check' value=''></form><table id='t1' class='tablesorter'>\n";
+	$htmlstr .= "<thead><tr>\n";
+	$htmlstr .= "
+				<th>".$p->t('abgabetool/details')."</th>
+				<th>".$p->t('lvplan/sem')."</th>
+				<th>".$p->t('lvplan/stg')."</th>
+				<th>".$p->t('global/mail')."</th>
+				<th>".$p->t('abgabetool/betreuer')."</th>
+				<th>".$p->t('abgabetool/typ')."</th>
+				<th>".$p->t('abgabetool/titel')."</th>
+				<!--<th>".$p->t('abgabetool/betreuerart')."</th>-->";
+	$htmlstr .= "</tr></thead><tbody>\n";
+	$i = 0;
+	while($row=$db->db_fetch_object($erg))
+	{
+		$htmlstr1 = '';
+		$zweitbetreuer_obj = new person();
+		if ($zweitbetreuer_obj->load($row->zweitbetreuer_person_id))
+		{
+			$zweitbetreuer = ', <b>'.$db->convert_html_chars($row->zweitbetreuer_betreuerart_kurzbz).'</b>: '.$zweitbetreuer_obj->titelpre.' '.$zweitbetreuer_obj->vorname.' '.$zweitbetreuer_obj->nachname.' '.$zweitbetreuer_obj->titelpost;
+		}
+		$htmlstr1 = '<b>'.$db->convert_html_chars($row->betreuerart_kurzbz).'</b>: ';
+		$vorname=$row->vorname;
+		$nachname=$row->nachname;
+		$uid=$row->uid;
+		($row->btitelpre!=''?$htmlstr1 .= $row->btitelpre.' ':$htmlstr1 .= '');
+		$htmlstr1 .= $row->bvorname.' '.$row->bnachname;
+		($row->btitelpost!=''?$htmlstr1 .= ' '.$row->btitelpost:$htmlstr1 .= '');
+		$htmlstr1 .= $zweitbetreuer;
+		$htmlstr .= "   <tr>\n"; //class='liste".($i%2)."'
+
+		if (is_null($row->note) && $row->aktiv === 't')
+			$htmlstr .= "       <td><a href='abgabe_student_details.php?uid=".$row->uid."&projektarbeit_id=".$row->projektarbeit_id."&bid=".$row->betreuer_person_id."' target='as_detail' title='Details anzeigen'>".$p->t('abgabetool/upload')."</a></td>\n";
+		elseif (!is_null($row->babgeschickt) || !is_null($row->zweitbetreuer_abgeschickt))
+		{
+			$htmlstr .= "<td>";
+
+			if (!is_null($row->babgeschickt))
+				$htmlstr .= "<a href='../pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz=" . $row->betreuerart_kurzbz . "&projektarbeit_id=" . $row->projektarbeit_id . "&person_id=" . $row->betreuer_person_id ."' title='".$p->t('abgabetool/projektbeurteilungDownload')."'>".$p->t('abgabetool/projektbeurteilungErstDownload')."</a>";
+
+			if (!is_null($row->babgeschickt) && !is_null($row->zweitbetreuer_abgeschickt))
+				$htmlstr .= "/";
+
+			if (!is_null($row->zweitbetreuer_abgeschickt))
+				$htmlstr .= "<a href='../pdfExport.php?xml=projektarbeitsbeurteilung.xml.php&xsl=Projektbeurteilung&betreuerart_kurzbz=" . $row->zweitbetreuer_betreuerart_kurzbz . "&projektarbeit_id=" . $row->projektarbeit_id . "&person_id=" . $row->zweitbetreuer_person_id."' title='".$p->t('abgabetool/projektbeurteilungDownload')."'>".$p->t('abgabetool/projektbeurteilungZweitDownload')."</a>";
+
+			$htmlstr .= "</td>";
+		} else
+		{
+			$htmlstr  .= "<td></td>";
+		}
+
+
+		$htmlstr .= "       <td>".$row->studiensemester_kurzbz."</td>\n";
+		$htmlstr .= "       <td>".strtoupper($row->typ.$row->kurzbz)."</td>\n";
+		$htmlstr .= "	   <td align= center>";
+
+		$qry_betr="SELECT mitarbeiter_uid FROM public.tbl_person
+			JOIN public.tbl_benutzer USING(person_id)
+			JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid)
+			WHERE person_id=".$db->db_add_param($row->betreuer_person_id, FHC_INTEGER).";";
+		if($result_betr=$db->db_query($qry_betr))
+		{
+			if($row_betr=$db->db_fetch_object($result_betr))
+			{
+				$htmlstr.="<a href='mailto:$row_betr->mitarbeiter_uid@".DOMAIN."?subject=Betreuung%20".$row->prjbez."%20von%20".$row->vorname."%20".$row->nachname."'><img src='../../../skin/images/email.png' alt='email' title='".$p->t('abgabetool/emailAnBetreuer')."'></a>";
+			}
+			else
+			{
+				$htmlstr.="UID unknown!";
+			}
+		}
+		$htmlstr .= "		</td>";
+		$htmlstr .= "       <td>".$htmlstr1."	    </td>\n";
+		$htmlstr .= "       <td>".$db->convert_html_chars($row->prjbez)."</td>\n";
+		$htmlstr .= "       <td>".$db->convert_html_chars($row->titel)."</td>\n";
+// 		$htmlstr .= "       <td>".$db->convert_html_chars($row->betreuerart_kurzbz)."</td>\n";
+		$htmlstr .= "   </tr>\n";
+		$i++;
+	}
+	$htmlstr .= "</tbody></table>\n";
+}
+echo '
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+	<title>Abgabesystem_Studentensicht</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<link rel="stylesheet" href="../../../skin/style.css.php" type="text/css">
+	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
+<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
+<script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>
+	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
+	<script language="JavaScript" type="text/javascript">
+		$(document).ready(function()
+		{
+			$("#t1").tablesorter(
+			{
+				sortList: [[4,0]],
+				widgets: ["zebra"]
+			});
+
+		});
+	</script>
+</head>
+
+<body>';
+
+	echo '<h1><div style="float:left">'.$p->t('abgabetool/ueberschrift');
+	if(trim($uid)!='')
+		echo " ($uid $vorname $nachname)</div> <div style='text-align:right'><a href='".$p->t('dms_link/abgabetoolStudentHandbuch')."' target='_blank'><img src='../../../skin/images/information.png' alt='Anleitung' title='Anleitung Abgabetool' border=0>&nbsp;".$p->t('global/handbuch')."</a></div>";
+	echo '</h1>';
+    echo $htmlstr;
+    echo '</body>
+</html>';
+?>