Merge branch 'master' into feature-76146/SucheTelefonnummer

Method returns the current study semester and the previous semesters of the same type (SS/WS).

application/config/mail.php

@@ -4,31 +4,34 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 // Define configuration parameters
 $config['email_number_to_sent'] = 1000; // Number of emails to sent each time sendAll is called
-$config['email_number_per_time_range'] = 882; // Number of emails to sent before pause
+$config['email_number_per_time_range'] = 1; // Number of emails to sent before pause
 $config['email_time_range'] = 1; // Length of the pause in seconds
 $config['email_from_system'] = 'no-reply@technikum-wien.at';
 $config['alias_from_system'] = 'No Reply';
 
+// Smtp: if the CI email library has to connect to a smtp server
+// Mail: if the system is setup to send emails with the standard php mail function
+// Sendmail: if the system is setup to send email via Sendmail (or similar)
+$config['protocol'] = ''; // mail, sendmail, or smtp
+
+// If protocol is set to sendmail
+$config['mailpath'] = ''; // SThe server path to Sendmail (or similar)
+
 // If protocol is set to smtp
 $config['smtp_host'] = 'localhost'; // SMTP Server Address
 $config['smtp_port'] = 25;
-$config['smtp_timeout'] = 1; // in seconds
+$config['smtp_timeout'] = 5; // in seconds
 $config['smtp_keepalive'] = false; // Enable persistent SMTP connections
-$config['smtp_auth'] = false;
 $config['smtp_user'] = '';
 $config['smtp_pass'] = '';
-$config['smtp_encryption'] = ''; // '', 'tls' or 'ssl'
-$config['wordwrap'] = 76;
-$config['is_html'] = true; // html or text
-$config['priority'] = 3; // 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
+$config['wordwrap'] = true; // {unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
+$config['wrapchars'] = 76; // Character count to wrap at.
+$config['mailtype'] = 'html'; // html or text
+$config['priority'] = 3; // Email Priority. 1 = highest. 5 = lowest. 3 = normal
+$config['validate'] = false; // If true then the email address will be validated
 
-// If enabled will be logged info about emails
-// 0: Disable debugging (you can also leave this out completely, 0 is the default).
-// 1: Output messages sent by the client.
-// 2: as 1, plus responses received from the server (this is the most useful setting).
-// 3: as 2, plus more information about the initial connection - this level can help diagnose STARTTLS failures.
-// 4: as 3, plus even lower-level information, very verbose, don't use for debugging SMTP, only low-level problems.
-$config['enable_debug'] = 0;
+// If enabled will be logged info about emails in Codeigniter error logs
+$config['enable_debug'] = false;
 
 // default sender
 $config['sancho_mail_default_sender'] = defined('SANCHO_MAIL_DEFAULT_SENDER') ? SANCHO_MAIL_DEFAULT_SENDER : '';
@@ -44,4 +47,3 @@ $config['sancho_mail_header_img'] = defined('SANCHO_MAIL_HEADER_IMG') ? SANCHO_M
 
 // footer image for custom mails
 $config['sancho_mail_footer_img'] = defined('SANCHO_MAIL_FOOTER_IMG') ? SANCHO_MAIL_FOOTER_IMG : '';
-

application/config/search.php

@@ -45,7 +45,7 @@ $config['person'] = [
 			'field' => 'kontakt',
 			'join' => [
 				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil') AND tbl_kontakt.person_id = tbl_person.person_id"
+				'on' => "kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy') AND tbl_kontakt.person_id = tbl_person.person_id"
 			],
 			"1-n" => true
 		],
@@ -360,6 +360,10 @@ $config['employee'] = [
 			'comparison' => 'equals',
 			'field' => "mitarbeiter_uid"
 		],
+		'personalnummer' => [
+			'comparison' => 'equal-int',
+			'field' => "personalnummer"
+		],
 		'vorname' => [
 			'alias' => ['firstname'],
 			'comparison' => 'similar',
@@ -415,12 +419,27 @@ $config['employee'] = [
 		'tel' => [
 			'alias' => ['phone', 'telefon'],
 			'comparison' => 'similar',
-			'field' => "TRIM(COALESCE(kontakt, '') || ' ' || COALESCE(telefonklappe, ''))",
+			'field' => 'kontakt',
+			'prepare' => "employee_tel (mitarbeiter_uid, kontakt) AS (
+				SELECT m.mitarbeiter_uid,
+					   TRIM(COALESCE(k.kontakt, '') || ' ' || COALESCE(m.telefonklappe, ''))
+				FROM public.tbl_mitarbeiter m
+				LEFT JOIN public.tbl_kontakt k
+					ON k.standort_id = m.standort_id
+					AND k.kontakttyp = 'telefon'
+				UNION
+				SELECT m.mitarbeiter_uid, k.kontakt
+				FROM public.tbl_mitarbeiter m
+				JOIN public.tbl_benutzer b ON b.uid = m.mitarbeiter_uid
+				JOIN public.tbl_kontakt k
+					ON k.person_id = b.person_id
+					AND k.kontakttyp IN ('telefon', 'so.tel', 'mobil', 'firmenhandy')
+			)",
 			'join' => [
-				'table' => "public.tbl_kontakt",
-				'on' => "kontakttyp = 'telefon' AND tbl_kontakt.standort_id = tbl_mitarbeiter.standort_id"
+				'table' => "employee_tel",
+				'using' => "mitarbeiter_uid"
 			],
-			"1-n" => true
+			'1-n' => true
 		],
 		'pid' => [
 			'alias' => ['person_id'],
@@ -471,6 +490,7 @@ $config['employee'] = [
 	],
 	'resultfields' => [
 		"b.uid",
+		"m.personalnummer",
 		"p.person_id",
 		"(p.vorname || ' ' || p.nachname) AS name",
 		"ARRAY(
@@ -512,7 +532,6 @@ $config['employee'] = [
 		) k ON (k.standort_id = m.standort_id)"
 ];
 
-// TODO(chris): move to searchpv21.php
 $config['unassigned_employee'] = $config['employee'];
 $config['unassigned_employee']['alias'] = ['mitarbeiter_ohne_zuordnung'];
 $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
@@ -524,7 +543,7 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 	UNION
 	SELECT tbl_mitarbeiter.*
 	FROM public.tbl_mitarbeiter
@@ -534,10 +553,10 @@ $config['unassigned_employee']['prepare'] = "unassigned_employee AS (
 		AND (datum_von IS NULL OR datum_von <= NOW())
 		AND (datum_bis IS NULL OR datum_bis >= NOW())
 	)
-	WHERE tbl_benutzerfunktion.bezeichnung IS NULL
+	WHERE tbl_benutzerfunktion.uid IS NULL
 )";
 $config['unassigned_employee']['table'] = "unassigned_employee";
-$config['unassigned_employee']['searchfields']['tel']['join']['on'] = "
+$config['unassigned_employee']['searchfields']['tel'] = "
 	kontakttyp = 'telefon' 
 	AND tbl_kontakt.standort_id = unassigned_employee.standort_id
 ";

application/config/searchPV.php

@@ -0,0 +1,34 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+
+$CI =& get_instance();
+
+$config['person'] = $CI->config->item('person', 'search');
+
+$config['employee'] = $CI->config->item('employee', 'search');
+$config['employee']['resultjoin'] = "
+		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+		JOIN public.tbl_person p USING(person_id)
+		LEFT JOIN (
+			SELECT kontakt, standort_id
+			FROM public.tbl_kontakt
+			WHERE kontakttyp = 'telefon'
+		) k ON (k.standort_id = m.standort_id)";
+
+$config['unassigned_employee'] = $CI->config->item('unassigned_employee', 'search');
+$config['unassigned_employee']['resultjoin'] = "
+    JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
+    JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)
+    JOIN public.tbl_person p USING(person_id)
+    LEFT JOIN (
+        SELECT kontakt, standort_id
+        FROM public.tbl_kontakt
+        WHERE kontakttyp = 'telefon'
+    ) k ON (k.standort_id = m.standort_id)";
+
+$config['room'] = $CI->config->item('room', 'search');
+
+$config['organisationunit'] = $CI->config->item('organisationunit', 'search');

application/config/searchcis.php

@@ -7,6 +7,7 @@ $CI =& get_instance();
 
 
 $config['employee'] = $CI->config->item('employee', 'search');
+unset($config['employee']['searchfields']['tel']);
 $config['employee']['resultjoin'] = "
 		JOIN public.tbl_mitarbeiter m USING (mitarbeiter_uid)
 		JOIN public.tbl_benutzer b ON (b.uid = m.mitarbeiter_uid AND b.aktiv = true)

application/controllers/api/frontend/v1/Searchbar.php

@@ -37,7 +37,8 @@ class Searchbar extends FHCAPI_Controller
 		parent::__construct([
 			'search' => self::PERM_LOGGED,
 			'searchCis' => self::PERM_LOGGED,
-			'searchStv' => self::PERM_LOGGED
+			'searchStv' => self::PERM_LOGGED,
+			'searchPV' => self::PERM_LOGGED
 		]);
 
 		$this->load->model('system/Webservicelog_model', 'WebservicelogModel');
@@ -87,6 +88,15 @@ class Searchbar extends FHCAPI_Controller
 		return $this->searchAdvanced([ 'config' => 'searchstv' ]);
 	}
 
+	/**
+	 * Gets a JSON body via HTTP POST and provides the parameters
+	 */
+	public function searchPV()
+	{
+		return $this->searchAdvanced([ 'config' => 'searchPV' ]);
+	}
+
+
 	/**
 	 * Gets a JSON body via HTTP POST and provides the parameters
 	 */

application/helpers/hlp_sancho_helper.php

@@ -35,20 +35,41 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
  * @param string $bcc Sets BCC of mail.
  * @return void
  */
-function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = '', $footerImg = '', $from = null, $cc = null, $bcc = null)
+function sendSanchoMail(
+	$vorlage_kurzbz,
+	$vorlage_data,
+	$to,
+	$subject,
+	$headerImg = '',
+	$footerImg = '',
+	$from = null,
+	$cc = null,
+	$bcc = null
+)
 {
 	$ci =& get_instance();
+	$ci->load->library('email');
 	$ci->load->library('MailLib');
 
-	$embeddedImages = array();
-	$_from = 'noreply@' . DOMAIN;
 	$sancho_mail_config = $ci->config->item('mail');
 
-	if ($from == null && isset($sancho_mail_config['sancho_mail_default_sender']) && $sancho_mail_config['sancho_mail_default_sender'])
+
+	if ($from == '')
 	{
-		$_from = $sancho_mail_config['sancho_mail_default_sender'] . '@' . DOMAIN;
+		$from = ((isset($sancho_mail_config['sancho_mail_default_sender'])
+				&& $sancho_mail_config['sancho_mail_default_sender']) 
+			  ? $sancho_mail_config['sancho_mail_default_sender']
+			  : 'noreply')
+			  . '@' . DOMAIN;
 	}
 
+	// Embed sancho header and footer image
+	// reset important to ensure embedding of images when called in a loop
+	$ci->email->clear(true);  // clear vars and attachments
+
+	$cid_header = '';
+	$cid_footer = '';
+
 	if (isset($sancho_mail_config['sancho_mail_use_images']) && $sancho_mail_config['sancho_mail_use_images'])
 	{
 		$sanchoHeader_img = '';
@@ -90,27 +111,29 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 			}
 		}
 
-		// Attach header and footer
-		$embeddedImages[] = array('file_name' => $sanchoHeader_img, 'cid' => 'sancho_header');
-		$embeddedImages[] = array('file_name' => $sanchoFooter_img, 'cid' => 'sancho_footer');
+		// attach header and footer
+		$ci->email->attach($sanchoHeader_img, 'inline');
+		$ci->email->attach($sanchoFooter_img, 'inline');
+		$cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
+		$cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
 	}
 
 	// Set specific mail content into specific content template
 	$content = _parseMailContent($vorlage_kurzbz, $vorlage_data);
 
-	// Set overall main content into the sancho mail template
-	$body = _parseMailContent(
-		'Sancho_Mail_Template',
-		array(
-			'CID_header' => 'sancho_header',
-			'CID_footer' => 'sancho_footer',
-			'content' => $content
-		)
+	// overall main content data array
+	$layout = array(
+		'CID_header' => $cid_header,
+		'CID_footer' => $cid_footer,
+		'content' => $content
 	);
 
+	// Set overall main content into the sancho mail template
+	$body = _parseMailContent('Sancho_Mail_Template', $layout);
+
 	// Send mail
 	return $ci->maillib->send(
-		$_from,
+		$from,
 		$to,
 		$subject,
 		$body,
@@ -119,8 +142,7 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 		$bcc,
 		'', // altMessage
 		true, // bulk
-		true, // autogenerated
-		$embeddedImages
+		true // autogenerated
 	);
 }
 
@@ -149,4 +171,3 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data)
 		}
 	}
 }
-

application/libraries/MailLib.php

@@ -2,10 +2,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
 /**
  * Library to manage the sending of the email
  */
@@ -13,7 +9,7 @@ class MailLib
 {
 	const ENABLE_DEBUG = 'enable_debug';
 
-	private $_sended; // Sended email counter
+	private $sended; // Sended email counter
 
 	// Properties for storing the configuration
 	private $email_number_to_sent;
@@ -22,7 +18,6 @@ class MailLib
 	private $email_from_system;
 
 	private $_ci; // Codeigniter instance
-	private $_mail; // PHPMailer instance
 
 	/**
 	 * Class constructor
@@ -30,7 +25,7 @@ class MailLib
 	public function __construct()
 	{
 		// Set the counter to 0
-		$this->_sended = 0;
+		$this->sended = 0;
 
 		// Get CI instance
 		$this->_ci =& get_instance();
@@ -38,135 +33,97 @@ class MailLib
 		// The second parameter is used to avoiding name collisions in the config array
 		$this->_ci->config->load('mail', true);
 
-		try
-		{
-			// PHPMailer configuration
-			$this->_mail = new PHPMailer(true);
-			$this->_mail->isSMTP();								// Send using SMTP
-			$this->_mail->Host = $this->_getEmailCfgItem('smtp_host');			// Set the SMTP server to send through
-			$this->_mail->Port = $this->_getEmailCfgItem('smtp_port');			// TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-			$this->_mail->SMTPAuth = $this->_getEmailCfgItem('smtp_auth');			// Enable SMTP authentication
-			$this->_mail->Username = $this->_getEmailCfgItem('smtp_user');			// SMTP username
-			$this->_mail->Password = $this->_getEmailCfgItem('smtp_pass');			// SMTP password
-			$this->_mail->SMTPSecure = $this->_getEmailCfgItem('smtp_encryption');		// Enable implicit TLS encryption
-			$this->_mail->Timeout = $this->_getEmailCfgItem('smtp_timeout');		// set the timeout (seconds)
-			$this->_mail->SMTPKeepAlive = $this->_getEmailCfgItem('smtp_keepalive');	// Persistent SMTP connection
-			$this->_mail->Priority = $this->_getEmailCfgItem('priority');			// 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
-			$this->_mail->WordWrap = $this->_getEmailCfgItem('wordwrap');
-			$this->_mail->isHTML($this->_getEmailCfgItem('is_html'));			// html or text
-			$this->_mail->SMTPDebug = $this->_getEmailCfgItem('enable_debug');
-			$this->_mail->CharSet = 'UTF-8';
+		// CI Email library
+		$this->_ci->load->library('email');
 
-			// Set the configuration properties with the standard configuration values
-			$this->email_number_to_sent = $this->_getEmailCfgItem('email_number_to_sent');
-			$this->email_number_per_time_range = $this->_getEmailCfgItem('email_number_per_time_range');
-			$this->email_time_range = $this->_getEmailCfgItem('email_time_range');
-			$this->email_from_system = $this->_getEmailCfgItem('email_from_system');
-			$this->alias_from_system = $this->_getEmailCfgItem('alias_from_system');
-		}
-		catch(Exception $e)
-		{
-			error_log($e->errorMessage());
-		}
+		// Initializing email library with the loaded configurations
+		$this->_ci->email->initialize($this->_ci->config->config['mail']);
+
+		// Set the configuration properties with the standard configuration values
+		$this->email_number_to_sent = $this->getEmailCfgItem('email_number_to_sent');
+		$this->email_number_per_time_range = $this->getEmailCfgItem('email_number_per_time_range');
+		$this->email_time_range = $this->getEmailCfgItem('email_time_range');
+		$this->email_from_system = $this->getEmailCfgItem('email_from_system');
+		$this->alias_from_system = $this->getEmailCfgItem('alias_from_system');
 	}
 
 	/**
 	 * Sends a single email
 	 */
-	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false, $embeddedImages = array())
+	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false)
 	{
-		$result = false;
-
-		try
+		// If it is configured then log mail info into the CI error logs
+		if ($this->getEmailCfgItem(self::ENABLE_DEBUG) === true)
 		{
-			// If it is configured then log mail info into the CI error logs
-			if ($this->_getEmailCfgItem(self::ENABLE_DEBUG) === true)
-			{
-				$this->_ci->load->library('LogLib'); // Loads logging library
+			$this->_ci->load->library('LogLib'); // Loads logging library
 
-				// Log them all!
-				$this->_ci->loglib->logError('From: '.$from);
-				$this->_ci->loglib->logError('To: '.$to);
-				$this->_ci->loglib->logError('Subject: '.$subject);
-				$this->_ci->loglib->logError('Message: '.$message);
-				$this->_ci->loglib->logError('Alias: '.$alias);
-				$this->_ci->loglib->logError('CC: '.$cc);
-				$this->_ci->loglib->logError('BCC: '.$bcc);
-				$this->_ci->loglib->logError('Alternative message: '.$altMessage);
-			}
-
-			// If from is not specified then use the standard one
-			if (is_null($from) || $from == '')
-			{
-				$from = $this->email_from_system;
-				// If alias is not specified then use the standard one
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-			if (defined('MAIL_FROM') && MAIL_FROM != '')
-			{
-				$from = MAIL_FROM;
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-
-			$this->_mail->setFrom($from, $alias);
-
-			// Check if the email address of the debug recipient is a valid one
-			$recipient = $to;
-			$recipientCC = $cc;
-			$recipientBCC = $bcc;
-
-			// If we the an email for debugging has been set
-			if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
-			{
-				// if is it valid use it!!!
-				$recipient = MAIL_DEBUG;
-				if ($recipientCC != '') $recipientCC = MAIL_DEBUG;
-				if ($recipientBCC != '') $recipientBCC = MAIL_DEBUG;
-			}
-
-			// Recipients
-			$this->_mail->addAddress($recipient);
-			if (!is_null($recipientCC)) $this->_mail->addCC($recipientCC);
-			if (!is_null($recipientBCC)) $this->_mail->addBCC($recipientBCC);
-
-			// Subject & body & alternative body
-			$this->_mail->Subject = $subject;
-			$this->_mail->Body = $message;
-			if (!isEmptyString($altMessage)) $this->_mail->AltBody = $altMessage;
-
-			// Custom headers
-			if ($bulk) $this->_mail->addCustomHeader('Precedence', 'bulk');
-			if ($autogenerated) $this->_mail->addCustomHeader('Auto-Submitted', 'auto-generated');
-
-			// Embedded images
-			foreach ($embeddedImages as $embeddedImage)
-			{
-				if (!$this->_mail->addEmbeddedImage($embeddedImage['file_name'], $embeddedImage['cid'])) return false;
-			}
-
-			$result = $this->_mail->send();
-
-			// If the email was succesfully sended then increment the counter and checks if it has to _wait until the sending of the next
-			if ($result != false)
-			{
-				$this->_sended++;
-				$this->_wait();
-			}
-
-			// Clear the properties for the next message
-			$this->_mail->clearAddresses();
-			$this->_mail->clearAllRecipients();
-			$this->_mail->clearAttachments();
+			// Log them all!
+			$this->_ci->loglib->logError('From: '.$from);
+			$this->_ci->loglib->logError('To: '.$to);
+			$this->_ci->loglib->logError('Subject: '.$subject);
+			$this->_ci->loglib->logError('Message: '.$message);
+			$this->_ci->loglib->logError('Alias: '.$alias);
+			$this->_ci->loglib->logError('CC: '.$cc);
+			$this->_ci->loglib->logError('BCC: '.$bcc);
+			$this->_ci->loglib->logError('Alternative message: '.$altMessage);
 		}
-		catch (Exception $e)
+
+		// If from is not specified then use the standard one
+		if (is_null($from) || $from == '')
 		{
-			error_log($e->errorMessage());
+			$from = $this->email_from_system;
+			// If alias is not specified then use the standard one
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+		if (defined('MAIL_FROM') && MAIL_FROM != '')
+		{
+			$from = MAIL_FROM;
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+
+		$this->_ci->email->from($from, $alias);
+
+		// Check if the email address of the debug recipient is a valid one
+		$recipient = $to;
+		$recipientCC = $cc;
+		$recipientBCC = $bcc;
+		if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
+		{
+			// if is it valid use it!!!
+			$recipient = MAIL_DEBUG;
+			if ($recipientCC != '')
+				$recipientCC = MAIL_DEBUG;
+			if ($recipientBCC != '')
+				$recipientBCC = MAIL_DEBUG;
+		}
+
+		$this->_ci->email->to($recipient);
+		if (!is_null($recipientCC)) $this->_ci->email->cc($recipientCC);
+		if (!is_null($recipientBCC)) $this->_ci->email->bcc($recipientBCC);
+		$this->_ci->email->subject($subject);
+		$this->_ci->email->message($message);
+		if (!isEmptyString($altMessage)) $this->_ci->email->set_alt_message($altMessage);
+
+		if($bulk)
+			$this->_ci->email->set_header('Precedence', 'bulk');
+		if($autogenerated)
+			$this->_ci->email->set_header('Auto-Submitted', 'auto-generated');
+
+		// Avoid printing on standard output ugly error messages
+		$result = @$this->_ci->email->send();
+
+		// If the email was succesfully sended then increment the counter
+		// and checks if it has to wait until the sending of the next
+		if ($result)
+		{
+			$this->sended++;
+			$this->wait();
 		}
 
 		return $result;
@@ -219,13 +176,13 @@ class MailLib
 	}
 
 	/**
-	 * Checks if it has to _wait until the sending of the next
+	 * Checks if it has to wait until the sending of the next
 	 */
-	private function _wait()
+	private function wait()
 	{
-		if ($this->_sended == $this->email_number_per_time_range)
+		if ($this->sended == $this->email_number_per_time_range)
 		{
-			$this->_sended = 0;
+			$this->sended = 0;
 			sleep($this->email_time_range); // Wait!!!
 		}
 	}
@@ -233,7 +190,7 @@ class MailLib
 	/**
 	 * Gets an item from the email configuration array
 	 */
-	private function _getEmailCfgItem($itemName)
+	private function getEmailCfgItem($itemName)
 	{
 		return $this->_ci->config->item($itemName, EMAIL_CONFIG_INDEX);
 	}

application/models/organisation/Studiensemester_model.php

@@ -122,6 +122,47 @@ class Studiensemester_model extends DB_Model
 		return $this->execQuery($query, array($studiensemester_kurzbz, $limit));
 	}
 
+
+	/**
+	 * Returns the current study semester and the previous semesters of the same type (SS/WS).
+	 *
+	 * Example:
+	 * - SS2026, limit 3:  SS2026, SS2025, SS2024
+	 * - WS2025, limit 2: WS2025, WS2024
+	 *
+	 * @param $studiensemester_kurzbz
+	 * @param $limit
+	 */
+	public function getPreviousSameSemesterFrom($studiensemester_kurzbz, $limit = 1)
+	{
+		$qry = '
+			SELECT 
+			    studiensemester_kurzbz,
+				start,
+				ende
+			FROM 
+			    public.tbl_studiensemester
+			WHERE 
+				SUBSTRING(studiensemester_kurzbz FROM 1 FOR 2) = SUBSTRING(? FROM 1 FOR 2)
+			AND start <= (
+				SELECT start
+				FROM public.tbl_studiensemester
+				WHERE studiensemester_kurzbz = ?
+			)
+			ORDER BY 
+				start DESC
+			LIMIT ?
+		';
+
+		return $this->execQuery($qry,
+			[
+				$studiensemester_kurzbz,
+				$studiensemester_kurzbz,
+				$limit
+			]
+		);
+	}
+
 	/**
 	 * getNearest
 	 */

application/models/person/Benutzerfunktion_model.php

@@ -260,7 +260,6 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
-
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -296,7 +295,6 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
-
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

composer.json

@@ -519,8 +519,7 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1",
-		"phpmailer/phpmailer": "^7.0"
+		"vuejs/vuedatepicker_css11": "11.0.1"
 
 	},
 	"config": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3ec44005c1f5f810f304ad049a2c5c6b",
+    "content-hash": "869cbc35bd1ba90ab90934fcb41b0f51",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -897,12 +897,12 @@
             "version": "v6.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/googleapis/php-jwt.git",
+                "url": "https://github.com/firebase/php-jwt.git",
                 "reference": "0541cba75ab108ef901985e68055a92646c73534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/googleapis/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
                 "reference": "0541cba75ab108ef901985e68055a92646c73534",
                 "shasum": ""
             },
@@ -944,8 +944,8 @@
                 "php"
             ],
             "support": {
-                "issues": "https://github.com/googleapis/php-jwt/issues",
-                "source": "https://github.com/googleapis/php-jwt/tree/v6.0.0"
+                "issues": "https://github.com/firebase/php-jwt/issues",
+                "source": "https://github.com/firebase/php-jwt/tree/v6.0.0"
             },
             "time": "2022-01-24T15:18:34+00:00"
         },
@@ -1614,100 +1614,18 @@
             },
             "type": "library"
         },
-        {
-            "name": "phpmailer/phpmailer",
-            "version": "v7.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1bc1716a507a65e039d4ac9d9adebbbd0d346e15",
-                "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-filter": "*",
-                "ext-hash": "*",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "doctrine/annotations": "^1.2.6 || ^1.13.3",
-                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcompatibility/php-compatibility": "^10.0.0@dev",
-                "squizlabs/php_codesniffer": "^3.13.5",
-                "yoast/phpunit-polyfills": "^1.0.4"
-            },
-            "suggest": {
-                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-                "directorytree/imapengine": "For uploading sent messages via IMAP, see gmail example",
-                "ext-imap": "Needed to support advanced email address parsing according to RFC822",
-                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-                "psr/log": "For optional PSR-3 debug logging",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPMailer\\PHPMailer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-only"
-            ],
-            "authors": [
-                {
-                    "name": "Marcus Bointon",
-                    "email": "phpmailer@synchromedia.co.uk"
-                },
-                {
-                    "name": "Jim Jagielski",
-                    "email": "jimjag@gmail.com"
-                },
-                {
-                    "name": "Andy Prevost",
-                    "email": "codeworxtech@users.sourceforge.net"
-                },
-                {
-                    "name": "Brent R. Matzelle"
-                }
-            ],
-            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "support": {
-                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v7.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Synchro",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-05-18T08:06:14+00:00"
-        },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.55",
+            "version": "2.0.48",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743"
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d73c9e019a895be83b18a2ccccfa7e2b0a648743",
-                "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/eaa7be704b8b93a6913b69eb7f645a59d7731b61",
+                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61",
                 "shasum": ""
             },
             "require": {
@@ -1715,7 +1633,7 @@
             },
             "require-dev": {
                 "phing/phing": "~2.7",
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^8.5|^9.4",
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4",
                 "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
@@ -1788,7 +1706,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.55"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.48"
             },
             "funding": [
                 {
@@ -1804,7 +1722,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-06-14T19:53:12+00:00"
+            "time": "2024-12-14T21:03:54+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -2013,18 +1931,8 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v1.42.5"
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/twig/twig",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-02-11T05:59:23+00:00"
         },
         {
@@ -2818,29 +2726,33 @@
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.9.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3"
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
-                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
-                "nikic/php-parser": "^3|^4|^5"
+                "nikic/php-parser": "^3|^4",
+                "php": ">=5.5"
             },
             "replace": {
                 "halleck45/php-metrics": "*",
                 "halleck45/phpmetrics": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14",
+                "sebastian/comparator": ">=1.2.3",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/dom-crawler": "^3.0 || ^4.0 || ^5.0"
             },
             "bin": [
                 "bin/phpmetrics"
@@ -2876,15 +2788,9 @@
             ],
             "support": {
                 "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
-                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.9.1"
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/Halleck45",
-                    "type": "github"
-                }
-            ],
-            "time": "2025-09-25T05:21:02+00:00"
+            "time": "2023-03-08T15:03:36+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -3221,6 +3127,7 @@
                 "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
                 "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master"
             },
+            "abandoned": true,
             "time": "2017-11-27T05:48:46+00:00"
         },
         {
@@ -4056,16 +3963,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.3",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a"
+                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/8fe7e75986a9d24b4cceae847314035df7703a5a",
-                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c",
+                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c",
                 "shasum": ""
             },
             "require": {
@@ -4107,27 +4014,15 @@
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2"
             },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
                     "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/sebastianbergmann",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
-                    "type": "thanks_dev"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
-                    "type": "tidelift"
                 }
             ],
-            "time": "2025-08-10T05:25:53+00:00"
+            "time": "2024-03-01T14:07:30+00:00"
         },
         {
             "name": "sebastian/resource-operations",

include/mail.class.php

@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
- *	  Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
- *	  Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
- *	  Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *			Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
  */
 /**
  * Klasse Mail
@@ -28,12 +28,6 @@
  * Replyto und Attachments
  */
 
-include_once DOC_ROOT . 'vendor/autoload.php';
-
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
 class mail
 {
 	public $to;
@@ -47,8 +41,6 @@ class mail
 	public $attachments;
 	public $errormsg;
 
-	private $_mail; // PHPMailer instance
-
 	/**
 	 * MAIL - Konstruktor
 	 * $to Empfaenger
@@ -73,30 +65,6 @@ class mail
 	 */
 	public function send()
 	{
-		// PHPMailer configuration
-		try
-		{
-			$this->_mail = new PHPMailer(true);
-			$this->_mail->isSMTP();		 // Send using SMTP
-			$this->_mail->Host = 'localhost';       // Set the SMTP server to send through
-			$this->_mail->Port = 25;		// TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-			$this->_mail->SMTPAuth = false;	 // Enable SMTP authentication
-			$this->_mail->Username = '';	    // SMTP username
-			$this->_mail->Password = '';	    // SMTP password
-			$this->_mail->SMTPSecure = '';	  // Enable implicit TLS encryption
-			$this->_mail->Timeout = 1;	      // set the timeout (seconds)
-			$this->_mail->SMTPKeepAlive = false;    // Persistent SMTP connection
-			$this->_mail->Priority = 3;	     // 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
-			$this->_mail->WordWrap = 76;
-			$this->_mail->isHTML(true);	     // html or text
-			$this->_mail->SMTPDebug = 0;	    // Disable debugging      
-			$this->_mail->CharSet = 'UTF-8';
-		}
-		catch(Exception $e)
-		{
-			return false;
-		}
-
 		//wenn MAIL_DEBUG gesetzt ist dann alles an diese Adresse schicken
 		if(MAIL_DEBUG!='')
 		{
@@ -114,38 +82,68 @@ class mail
 			$this->sender = MAIL_FROM;
 
 		// Header
-		$this->_mail->setFrom($this->sender);
+		$header = '';
+  		$header .= "From: {$this->sender}".$eol;
 
   		if (!empty($this->CC_recievers))
-			$this->_mail->addCC($this->CC_recievers);
+			$header .= "CC: {$this->CC_recievers}".$eol;
 		if (!empty($this->BCC_recievers))
-			$this->_mail->addBCC($this->BCC_recievers);
+			$header .= "BCC: {$this->BCC_recievers}".$eol;
 		if (!empty($this->replyTo))
+			$header .= "Reply-To: {$this->replyTo}".$eol;
+		if (!empty($this->replyTo))
+			$header .= "Return-Path: {$this->replyTo}".$eol;
+
+		$header .= 'X-Mailer: FHComplete V1'.$eol;
+	  	$header .= 'Mime-Version: 1.0'.$eol;
+		$header .= 'Precedence: bulk'.$eol;
+		$header .= 'Auto-Submitted: auto-generated'.$eol;
+		$header .= "Content-Type: multipart/related; boundary=\"$mime_boundary_mixed\"".$eol;
+		$header .= "Content-Transfer-Encoding: 8bit".$eol;
+
+		// Body
+		$mailbody = "";
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_mixed".$eol;
+		$mailbody .= "Content-Type: multipart/alternative; boundary=\"$mime_boundary_alternative\"".$eol;
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_alternative".$eol;
+		$mailbody .= "Content-Type: text/plain; charset={$this->textContent[1]}".$eol;
+		$mailbody .= "Content-Transfer-Encoding: {$this->textContent[2]}".$eol;
+		$mailbody .= $eol;
+		$mailbody .= $this->textContent[0];
+		$mailbody .= $eol;
+		$mailbody .= $eol;
+
+		if (!empty($this->htmlContent[0]))
 		{
-			$this->_mail->addReplyTo($this->replyTo);
-			$this->_mail->addCustomHeader('Return-Path', $this->replyTo);
+			$mailbody .= "--$mime_boundary_alternative".$eol;
+			$mailbody .= "Content-Type: text/html; charset={$this->htmlContent[1]}".$eol;
+			$mailbody .= "Content-Transfer-Encoding: {$this->htmlContent[2]}".$eol;
+			$mailbody .= $eol;
+			$mailbody .= $this->htmlContent[0];
+			$mailbody .= $eol;
+			$mailbody .= $eol;
 		}
-
-		$this->_mail->addCustomHeader('X-Mailer', 'FHComplete V1');
-		$this->_mail->addCustomHeader('Mime-Version', '1.0');
-		$this->_mail->addCustomHeader('Precedence', 'bulk');
-		$this->_mail->addCustomHeader('Auto-Submitted', 'auto-generated');
-
-		$this->_mail->Body = $this->htmlContent[0];
-		$this->_mail->AltBody = $this->textContent[0];
+		$mailbody .= "--{$mime_boundary_alternative}--".$eol;
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_mixed";
 
 		// Attachments Plain
 		if (is_array($this->attachmentsplain) && (count($this->attachmentsplain) > 0))
 		{
 			foreach ($this->attachmentsplain as $attachment)
 			{
-				$this->_mail->addStringAttachment(
-					$attachment[0], // File content
-					$attachment[2], // Name
-					$attachment[3], // Encoding
-					$attachment[1], // Type
-					'attachment'	// Disposition
-				);
+				$dispo = 'attachment';
+				$mailbody .= $eol;
+				$mailbody .= "Content-Disposition: $dispo; filename={$attachment[2]}".$eol;
+				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;
+
+				$mailbody .= 'Content-Transfer-Encoding: '.$attachment[3].$eol;
+				$mailbody .= $eol;
+				$mailbody .= $attachment[0];
+				$mailbody .= $eol;
+				$mailbody .= "--$mime_boundary_mixed";
 			}
 		}
 
@@ -154,23 +152,31 @@ class mail
 		{
 			foreach ($this->attachments as $attachment)
 			{
-				$this->_mail->addStringEmbeddedImage(
-					$attachment[0], // File content
-					$attachment[3], // Content ID
-					$attachment[2], // Content name
-					PHPMailer::ENCODING_BASE64, // Encoding
-					$attachment[1], // Type
-					empty($attachment[3]) ? 'attachment' : 'inline'	// Disposition
-				);
+				$dispo = empty($attachment[3]) ? 'attachment' : 'inline';
+				$mailbody .= $eol;
+				$mailbody .= "Content-Disposition: $dispo; filename={$attachment[2]}".$eol;
+				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;
+				if (!empty($attachment[3]))
+				{
+					$mailbody .= "Content-ID: <{$attachment[3]}>".$eol;
+				}
+				$mailbody .= 'Content-Transfer-Encoding: base64'.$eol;
+				$mailbody .= $eol;
+				$mailbody .= $attachment[0];
+				$mailbody .= $eol;
+				$mailbody .= "--$mime_boundary_mixed";
 			}
 		}
+		$mailbody .= "--".$eol;
 
 		// Subject Encoding setzen
-		$this->_mail->Subject = $this->subject;
-		$this->_mail->addAddress($this->to);
+		$subject = "=?UTF-8?B?".base64_encode($this->subject)."?=";
 
 		// Senden
-		return $this->_mail->send();
+		if(mail($this->to, $subject, $mailbody, $header))
+			return true;
+		else
+			return false;
 	}
 
 	/**

public/js/api/factory/searchbar.js

@@ -36,5 +36,12 @@ export default {
 			url: '/api/frontend/v1/searchbar/searchStv',
 			params
 		};
+	},
+	searchPV(params) {
+		return {
+			method: 'post',
+			url: '/api/frontend/v1/searchbar/searchPV',
+			params
+		};
 	}
 };

public/js/components/Stv/Studentenverwaltung/Details/Konto.js

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: new Date()
+			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
 		};
 	},
 	computed: {
@@ -259,6 +259,7 @@ export default {
 					<form-input
 						type="DatePicker"
 						v-model="counterdate"
+						model-type="yyyy-MM-dd"
 						input-group
 						:enable-time-picker="false"
 						text-input

public/js/components/Stv/Studentenverwaltung/Details/Konto/Edit.js

@@ -79,6 +79,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Konto/New.js

@@ -88,7 +88,7 @@ export default {
 			this.data = {
 				buchungstyp_kurzbz: '',
 				betrag: '-0.00',
-				buchungsdatum: new Date(),
+				buchungsdatum: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,6 +154,7 @@ export default {
 				<form-input
 					type="DatePicker"
 					v-model="data.buchungsdatum"
+					model-type="yyyy-MM-dd"
 					name="buchungsdatum"
 					:label="$p.t('konto/buchungsdatum')"
 					:enable-time-picker="false"

public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js

@@ -325,6 +325,7 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -389,6 +390,7 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
+						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -454,6 +456,7 @@ export default {
 						:label="$p.t('lehre', 'zgvDoktorDatum')"
 						type="DatePicker"
 						v-model="data.zgvdoktordatum"
+						model-type="yyyy-MM-dd"
 						name="zgvdoktordatum"
 						no-today
 						auto-apply

public/js/components/filter/Filter.js

@@ -218,15 +218,23 @@ export const CoreFilterCmpt = {
 		},
 		columnsForFilter() {
 			if (!this.filteredColumns || !this.datasetMetadata) return [];
-			const localizedColumnTitles = this.tabulator.getLang().columns;
+
 			const isTabulatorLocalized = !!this.$props.tabulatorOptions.locale;
-			const filterTitles = this.filteredColumns.reduce((a, c) => {
-				a[c.field] =
-					isTabulatorLocalized && localizedColumnTitles[c.field]
-						? localizedColumnTitles[c.field]
-						: c.title;
-				return a;
-			}, {});
+
+			let filterTitles;
+			if (isTabulatorLocalized) {
+				const localizedColumnTitles = this.tabulator.getLang().columns;
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = localizedColumnTitles[c.field];
+					return a;
+				}, {});
+			} else {
+				filterTitles = this.filteredColumns.reduce((a, c) => {
+					a[c.field] = c.title;
+					return a;
+				}, {});
+			}
+
 			return this.datasetMetadata.map((el) => ({
 				...el,
 				...{ title: filterTitles[el.name] },

system/phrasesupdate.php

@@ -55257,6 +55257,26 @@ and represent the current state of research on the topic. The prescribed citatio
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'search',
+		'phrase' => 'type_unassigned_employee',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mitarbeiter ohne Zuordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'unassigned employee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'search',