Merge branch 'master' into feature-68684/PHPMailer

- application/libraries/MailLib.php now set the default encoding to UTF-8

application/config/mail.php

@@ -4,34 +4,31 @@ 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'] = 1; // Number of emails to sent before pause
+$config['email_number_per_time_range'] = 882; // 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'] = 5; // in seconds
+$config['smtp_timeout'] = 1; // in seconds
 $config['smtp_keepalive'] = false; // Enable persistent SMTP connections
+$config['smtp_auth'] = false;
 $config['smtp_user'] = '';
 $config['smtp_pass'] = '';
-$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
+$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.
 
-// If enabled will be logged info about emails in Codeigniter error logs
-$config['enable_debug'] = false;
+// 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;
 
 // default sender
 $config['sancho_mail_default_sender'] = defined('SANCHO_MAIL_DEFAULT_SENDER') ? SANCHO_MAIL_DEFAULT_SENDER : '';
@@ -47,3 +44,4 @@ $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/controllers/api/frontend/v1/betriebsmittel/BetriebsmittelP.php

@@ -259,7 +259,7 @@ class BetriebsmittelP extends FHCAPI_Controller
 		$kaution = $this->input->post('kaution');
 		if($kaution) $kaution = str_replace(',', '.', $kaution);
 		$ausgegebenam = $this->input->post('ausgegebenam');
-		$retouram = $this->input->post('retouram') == "" ? null : $this->input->post('retouram');
+		$retouram = $this->input->post('retouram');
 
 		// NOTE(chris): transform_kartennummer
 		if ($betriebsmitteltyp == 'Zutrittskarte' && $nummer)

application/controllers/api/frontend/v1/dashboard/Widget.php

@@ -101,9 +101,6 @@ class Widget extends FHCAPI_Controller
 			$tmpsetup = json_decode($widget->setup);
 			$tmpsetup->file = absoluteJsImportUrl($tmpsetup->file);
 			$widget->setup = $tmpsetup;
-			$widget->permitted = empty($widget->berechtigung_kurzbz) 
-				|| $this->permissionlib->isBerechtigt($widget->berechtigung_kurzbz);
-
 			return $widget;
 		}, $widgets);
 

application/controllers/api/frontend/v1/detailheader/Detailheader.php

@@ -9,9 +9,9 @@ class Detailheader extends FHCAPI_Controller
 	public function __construct()
 	{
 		parent::__construct([
-			'getHeader' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getPersonAbteilung' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
-			'getLeitungOrg' => ['vertrag/mitarbeiter:r', 'basis/mitarbeiter:r'],
+			'getHeader' => ['vertrag/mitarbeiter:r'],
+			'getPersonAbteilung' => ['vertrag/mitarbeiter:r'],
+			'getLeitungOrg' => ['vertrag/mitarbeiter:r'],
 		]);
 	}
 

application/controllers/api/frontend/v1/funktionen/Funktionen.php

@@ -294,10 +294,6 @@ class Funktionen extends FHCAPI_Controller
 		{
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
-		if($datum_von == '')
-			$datum_von = null;
-		if($datum_bis == '')
-			$datum_bis = null;
 
 		$result = $this->BenutzerfunktionModel->update(
 			[

application/controllers/api/frontend/v1/stv/Abschlusspruefung.php

@@ -371,9 +371,6 @@ class Abschlusspruefung extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$datum = $formData['datum'] == '' ? null : $formData['datum'];
-		$sponsion = $formData['sponsion'] == '' ? null : $formData['sponsion'];
-
 		$result = $this->AbschlusspruefungModel->update(
 			[
 				'abschlusspruefung_id' => $abschlusspruefung_id
@@ -385,8 +382,8 @@ class Abschlusspruefung extends FHCAPI_Controller
 				'vorsitz' => $vorsitz,
 				'pruefungsantritt_kurzbz' => $formData['pruefungsantritt_kurzbz'],
 				'abschlussbeurteilung_kurzbz' => $formData['abschlussbeurteilung_kurzbz'],
-				'datum' => $datum,
-				'sponsion' => $sponsion,
+				'datum' => $formData['datum'],
+				'sponsion' => $formData['sponsion'],
 				'pruefer1' => $pruefer1,
 				'pruefer2' => $pruefer2,
 				'pruefer3' => $pruefer3,

application/controllers/api/frontend/v1/stv/Dokumente.php

@@ -170,8 +170,6 @@ class Dokumente extends FHCAPI_Controller
 			$this->terminateWithValidationErrors($this->form_validation->error_array());
 		}
 
-		$nachgereicht_am =  $this->input->post('nachgereicht_am') == '' ? null : $this->input->post('nachgereicht_am');
-
 		$uid = getAuthUID();
 
 		$result = $this->AkteModel->update(
@@ -182,7 +180,7 @@ class Dokumente extends FHCAPI_Controller
 				'dokument_kurzbz' => $this->input->post('dokument_kurzbz'),
 				'anmerkung_intern' => $this->input->post('anmerkung_intern'),
 				'titel_intern' => $this->input->post('titel_intern'),
-				'nachgereicht_am' => $nachgereicht_am,
+				'nachgereicht_am' => $this->input->post('nachgereicht_am'),
 				'updateamum' => date('c'),
 				'updatevon' => $uid,
 			]

application/controllers/api/frontend/v1/stv/Konto.php

@@ -429,12 +429,9 @@ class Konto extends FHCAPI_Controller
 			'updateamum' => date('c'),
 			'updatevon' => getAuthUID()
 		];
-
 		foreach ($allowed as $field)
 			if ($this->input->post($field) !== null)
 				$data[$field] = $this->input->post($field);
-			if($data['buchungsdatum'] == '')
-				$data['buchungsdatum'] = null;
 
 		$result = $this->KontoModel->update($id, $data);
 

application/controllers/api/frontend/v1/stv/Mobility.php

@@ -237,8 +237,8 @@ class Mobility extends FHCAPI_Controller
 		}
 		$formData = $this->input->post('formData');
 
-		$von = ($formData['von'] ?? '') ?: null;
-		$bis = ($formData['bis'] ?? '') ?: null;
+		$von = $formData['von'] ?? null;
+		$bis = $formData['bis'] ?? null;
 		$nation_code = $formData['nation_code'] ?? null;
 		$mobilitaetsprogramm_code = $formData['mobilitaetsprogramm_code'] ?? null;
 		$herkunftsland_code = $formData['herkunftsland_code'] ?? null;

application/controllers/api/frontend/v1/stv/Prestudent.php

@@ -193,7 +193,7 @@ class Prestudent extends FHCAPI_Controller
 				}
 				elseif (
 					$val === ''
-					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode', 'zgvdatum', 'zgvmadatum'])
+					&& in_array($prop, ['zgvnation', 'zgvmanation', 'zgvdoktornation', 'berufstaetigkeit_code', 'ausbildungcode'])
 				)
 				{
 					$val = null;

application/controllers/api/frontend/v1/stv/Pruefung.php

@@ -448,10 +448,8 @@ class Pruefung extends FHCAPI_Controller
 			}
 		}
 
-		$datum = $this->input->post('datum') == '' ? null : $this->input->post('datum');
 		if(intval($pruefung_id) > 0)
 		{
-
 			$result = $this->PruefungModel->update(
 				[
 					'pruefung_id' => $pruefung_id
@@ -461,7 +459,7 @@ class Pruefung extends FHCAPI_Controller
 					'mitarbeiter_uid' =>  $this->input->post('mitarbeiter_uid'),
 					'note' => $this->input->post('note'),
 					'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
-					'datum' => $datum,
+					'datum' => $this->input->post('datum'),
 					'anmerkung' => $this->input->post('anmerkung'),
 					'updatevon' => $authUID,
 					'updateamum' => date('c'),
@@ -474,7 +472,7 @@ class Pruefung extends FHCAPI_Controller
 				'lehreinheit_id' => $this->input->post('lehreinheit_id'),
 				'student_uid' => $this->input->post('student_uid'),
 				'mitarbeiter_uid' => $this->input->post('mitarbeiter_uid'),
-				'datum' => $datum,
+				'datum' => $this->input->post('datum'),
 				'pruefungstyp_kurzbz' => $this->input->post('pruefungstyp_kurzbz'),
 				'note' => $this->input->post('note'),
 				'anmerkung' => $this->input->post('anmerkung'),
@@ -522,7 +520,7 @@ class Pruefung extends FHCAPI_Controller
 				'studiensemester_kurzbz' => $studiensemester_kurzbz,
 				'note' => $this->input->post('note'),
 				'uebernahmedatum' => date('c'),
-				'benotungsdatum' => $datum,
+				'benotungsdatum' => $this->input->post('datum'),
 				'insertamum' => date('c'),
 				'insertvon' =>  $authUID,
 				'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null
@@ -557,7 +555,7 @@ class Pruefung extends FHCAPI_Controller
 		], [
 			'note' => $this->input->post('note'),
 			'uebernahmedatum' => date('c'),
-			'benotungsdatum' => $datum,
+			'benotungsdatum' => $this->input->post('datum'),
 			'updateamum' => date('c'),
 			'updatevon' =>  $authUID,
 			'punkte' => $this->input->post('punkte') ? str_replace(',', '.', $this->input->post('punkte')) : null

application/controllers/api/frontend/v1/stv/Student.php

@@ -296,10 +296,6 @@ class Student extends FHCAPI_Controller
 				$fotoval = ($val == '') ? null : str_replace('data:image/jpeg;base64,', '', $val);
 				$update_person[$prop] = $fotoval;
 			}
-			else if ($prop == 'gebdatum')
-			{
-				$update_person[$prop] = ($val == '') ? null : $val;
-			}
 			else
 			{
 				$update_person[$prop] = $val;

application/helpers/hlp_sancho_helper.php

@@ -35,41 +35,20 @@ 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 == '')
+	if ($from == null && isset($sancho_mail_config['sancho_mail_default_sender']) && $sancho_mail_config['sancho_mail_default_sender'])
 	{
-		$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;
+		$_from = $sancho_mail_config['sancho_mail_default_sender'] . '@' . 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 = '';
@@ -111,29 +90,27 @@ function sendSanchoMail(
 			}
 		}
 
-		// 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
+		// Attach header and footer
+		$embeddedImages[] = array('file_name' => $sanchoHeader_img, 'cid' => 'sancho_header');
+		$embeddedImages[] = array('file_name' => $sanchoFooter_img, 'cid' => 'sancho_footer');
 	}
 
 	// Set specific mail content into specific content template
 	$content = _parseMailContent($vorlage_kurzbz, $vorlage_data);
 
-	// 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);
+	$body = _parseMailContent(
+		'Sancho_Mail_Template',
+		array(
+			'CID_header' => 'sancho_header',
+			'CID_footer' => 'sancho_footer',
+			'content' => $content
+		)
+	);
 
 	// Send mail
 	return $ci->maillib->send(
-		$from,
+		$_from,
 		$to,
 		$subject,
 		$body,
@@ -142,7 +119,8 @@ function sendSanchoMail(
 		$bcc,
 		'', // altMessage
 		true, // bulk
-		true // autogenerated
+		true, // autogenerated
+		$embeddedImages
 	);
 }
 
@@ -171,3 +149,4 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data)
 		}
 	}
 }
+

application/libraries/MailLib.php

@@ -2,6 +2,10 @@
 
 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
  */
@@ -9,7 +13,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;
@@ -18,6 +22,7 @@ class MailLib
 	private $email_from_system;
 
 	private $_ci; // Codeigniter instance
+	private $_mail; // PHPMailer instance
 
 	/**
 	 * Class constructor
@@ -25,7 +30,7 @@ class MailLib
 	public function __construct()
 	{
 		// Set the counter to 0
-		$this->sended = 0;
+		$this->_sended = 0;
 
 		// Get CI instance
 		$this->_ci =& get_instance();
@@ -33,97 +38,135 @@ class MailLib
 		// The second parameter is used to avoiding name collisions in the config array
 		$this->_ci->config->load('mail', true);
 
-		// CI Email library
-		$this->_ci->load->library('email');
+		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';
 
-		// 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');
+			// 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());
+		}
 	}
 
 	/**
 	 * Sends a single email
 	 */
-	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false)
+	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false, $embeddedImages = array())
 	{
-		// 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
+		$result = false;
 
-			// 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 == '')
+		try
 		{
-			$from = $this->email_from_system;
-			// If alias is not specified then use the standard one
-			if (is_null($alias) || $alias == '')
+			// If it is configured then log mail info into the CI error logs
+			if ($this->_getEmailCfgItem(self::ENABLE_DEBUG) === true)
 			{
-				$alias = $this->alias_from_system;
+				$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 (defined('MAIL_FROM') && MAIL_FROM != '')
-		{
-			$from = MAIL_FROM;
-			if (is_null($alias) || $alias == '')
+
+			// If from is not specified then use the standard one
+			if (is_null($from) || $from == '')
 			{
-				$alias = $this->alias_from_system;
+				$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();
 		}
-
-		$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 != '')
+		catch (Exception $e)
 		{
-			// 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();
+			error_log($e->errorMessage());
 		}
 
 		return $result;
@@ -176,13 +219,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!!!
 		}
 	}
@@ -190,7 +233,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,47 +122,6 @@ 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,6 +260,7 @@ class Benutzerfunktion_model extends DB_Model
         return $this->execQuery($query, $parameters_array);
     }
 
+
 	/**
 	 * Get active Kompetenzfeldleitung bei UID.
 	 *
@@ -295,6 +296,7 @@ class Benutzerfunktion_model extends DB_Model
 		return $this->execQuery($query, $parameters_array);
 	}
 
+
 	public function insertBenutzerfunktion($Json)
 	{
 		unset($Json['benutzerfunktion_id']);

composer.json

@@ -519,7 +519,8 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1"
+		"vuejs/vuedatepicker_css11": "11.0.1",
+		"phpmailer/phpmailer": "^7.0"
 
 	},
 	"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": "869cbc35bd1ba90ab90934fcb41b0f51",
+    "content-hash": "3ec44005c1f5f810f304ad049a2c5c6b",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -897,12 +897,12 @@
             "version": "v6.0.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/firebase/php-jwt.git",
+                "url": "https://github.com/googleapis/php-jwt.git",
                 "reference": "0541cba75ab108ef901985e68055a92646c73534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
+                "url": "https://api.github.com/repos/googleapis/php-jwt/zipball/0541cba75ab108ef901985e68055a92646c73534",
                 "reference": "0541cba75ab108ef901985e68055a92646c73534",
                 "shasum": ""
             },
@@ -944,8 +944,8 @@
                 "php"
             ],
             "support": {
-                "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.0.0"
+                "issues": "https://github.com/googleapis/php-jwt/issues",
+                "source": "https://github.com/googleapis/php-jwt/tree/v6.0.0"
             },
             "time": "2022-01-24T15:18:34+00:00"
         },
@@ -1615,17 +1615,99 @@
             "type": "library"
         },
         {
-            "name": "phpseclib/phpseclib",
-            "version": "2.0.48",
+            "name": "phpmailer/phpmailer",
+            "version": "v7.1.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61"
+                "url": "https://github.com/PHPMailer/PHPMailer.git",
+                "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/eaa7be704b8b93a6913b69eb7f645a59d7731b61",
-                "reference": "eaa7be704b8b93a6913b69eb7f645a59d7731b61",
+                "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",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpseclib/phpseclib.git",
+                "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/d73c9e019a895be83b18a2ccccfa7e2b0a648743",
+                "reference": "d73c9e019a895be83b18a2ccccfa7e2b0a648743",
                 "shasum": ""
             },
             "require": {
@@ -1633,7 +1715,7 @@
             },
             "require-dev": {
                 "phing/phing": "~2.7",
-                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^9.4",
+                "phpunit/phpunit": "^4.8.35|^5.7|^6.0|^8.5|^9.4",
                 "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
@@ -1706,7 +1788,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.48"
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.55"
             },
             "funding": [
                 {
@@ -1722,7 +1804,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-14T21:03:54+00:00"
+            "time": "2026-06-14T19:53:12+00:00"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1931,8 +2013,18 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/1.x"
+                "source": "https://github.com/twigphp/Twig/tree/v1.42.5"
             },
+            "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"
         },
         {
@@ -2726,33 +2818,29 @@
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.8.2",
+            "version": "v2.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
+                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
-                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
+                "reference": "e2e68ddd1543bc3f44402c383f7bccb62de1ece3",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-tokenizer": "*",
-                "nikic/php-parser": "^3|^4",
-                "php": ">=5.5"
+                "nikic/php-parser": "^3|^4|^5"
             },
             "replace": {
                 "halleck45/php-metrics": "*",
                 "halleck45/phpmetrics": "*"
             },
             "require-dev": {
-                "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"
+                "phpunit/phpunit": "*"
             },
             "bin": [
                 "bin/phpmetrics"
@@ -2788,9 +2876,15 @@
             ],
             "support": {
                 "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
-                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.9.1"
             },
-            "time": "2023-03-08T15:03:36+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/Halleck45",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-09-25T05:21:02+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -3127,7 +3221,6 @@
                 "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"
         },
         {
@@ -3963,16 +4056,16 @@
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c"
+                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c",
-                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/8fe7e75986a9d24b4cceae847314035df7703a5a",
+                "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a",
                 "shasum": ""
             },
             "require": {
@@ -4014,15 +4107,27 @@
             "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.2"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.3"
             },
             "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": "2024-03-01T14:07:30+00:00"
+            "time": "2025-08-10T05:25:53+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,6 +28,12 @@
  * 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;
@@ -41,6 +47,8 @@ class mail
 	public $attachments;
 	public $errormsg;
 
+	private $_mail; // PHPMailer instance
+
 	/**
 	 * MAIL - Konstruktor
 	 * $to Empfaenger
@@ -65,6 +73,30 @@ 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!='')
 		{
@@ -82,68 +114,38 @@ class mail
 			$this->sender = MAIL_FROM;
 
 		// Header
-		$header = '';
-  		$header .= "From: {$this->sender}".$eol;
+		$this->_mail->setFrom($this->sender);
 
   		if (!empty($this->CC_recievers))
-			$header .= "CC: {$this->CC_recievers}".$eol;
+			$this->_mail->addCC($this->CC_recievers);
 		if (!empty($this->BCC_recievers))
-			$header .= "BCC: {$this->BCC_recievers}".$eol;
+			$this->_mail->addBCC($this->BCC_recievers);
 		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]))
 		{
-			$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->addReplyTo($this->replyTo);
+			$this->_mail->addCustomHeader('Return-Path', $this->replyTo);
 		}
-		$mailbody .= "--{$mime_boundary_alternative}--".$eol;
-		$mailbody .= $eol;
-		$mailbody .= "--$mime_boundary_mixed";
+
+		$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];
 
 		// Attachments Plain
 		if (is_array($this->attachmentsplain) && (count($this->attachmentsplain) > 0))
 		{
 			foreach ($this->attachmentsplain as $attachment)
 			{
-				$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";
+				$this->_mail->addStringAttachment(
+					$attachment[0], // File content
+					$attachment[2], // Name
+					$attachment[3], // Encoding
+					$attachment[1], // Type
+					'attachment'	// Disposition
+				);
 			}
 		}
 
@@ -152,31 +154,23 @@ class mail
 		{
 			foreach ($this->attachments as $attachment)
 			{
-				$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";
+				$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
+				);
 			}
 		}
-		$mailbody .= "--".$eol;
 
 		// Subject Encoding setzen
-		$subject = "=?UTF-8?B?".base64_encode($this->subject)."?=";
+		$this->_mail->Subject = $this->subject;
+		$this->_mail->addAddress($this->to);
 
 		// Senden
-		if(mail($this->to, $subject, $mailbody, $header))
-			return true;
-		else
-			return false;
+		return $this->_mail->send();
 	}
 
 	/**

public/js/components/Betriebsmittel/Betriebsmittel.js

@@ -433,7 +433,6 @@ export default {
 						:label="$p.t('wawi/ausgegebenam')"
 						name="ausgegebenam"
 						v-model="formData.ausgegebenam"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -450,7 +449,6 @@ export default {
 						:label="$p.t('wawi/retouram')"
 						name="retouram"
 						v-model="formData.retouram"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

public/js/components/Dashboard/Item.js

@@ -1,6 +1,5 @@
 import BsModal from "../Bootstrap/Modal.js";
 import HeightTransition from "../Tranistion/HeightTransition.js";
-import MissingPermissionWidget from "../DashboardWidget/MissingPermission.js";
 
 import { enableDragDropTouch } from "../../../../vendor/drag-drop-touch-js/dragdroptouch/dist/drag-drop-touch.esm.min.js";
 
@@ -114,12 +113,6 @@ export default {
 		isPinned() {
 			return this.place?.pinned ? true : false;
 		},
-		permitted() {
-			// widgets without a linked permission (or before the template loaded)
-			// are considered permitted; the backend sets permitted === false only
-			// when the user is missing the widget's required permission
-			return this.widgetTemplate?.permitted !== false;
-		},
 		ready() {
 			return this.component && this.arguments !== null;
 		},
@@ -185,11 +178,7 @@ export default {
 				&& this.widgetTemplate.widget_id
 				&& this.widgetTemplate.arguments
 			) {
-				// render the "missing permission" screen instead of the actual
-				// widget when the user does not hold the widget's linked permission
-				let component = this.permitted
-					? (await import(this.widgetTemplate.setup.file)).default
-					: MissingPermissionWidget;
+				let component = (await import(this.widgetTemplate.setup.file)).default;
 				this.$options.components["widget" + this.widgetTemplate.widget_id] = component;
 				this.component = "widget" + this.widgetTemplate.widget_id;
 				this.arguments = { ...this.widgetTemplate.arguments, ...this.config };
@@ -291,7 +280,7 @@ export default {
 				</template>
 				<!-- widget link -->
 				<a
-					v-if="widgetTemplate.setup.cis4link && permitted"
+					v-if="widgetTemplate.setup.cis4link"
 					:href="getWidgetC4Link(widgetTemplate)"
 					class="col-auto ms-auto"
 					:aria-label="$p.t('dashboard/widget_link')"

public/js/components/Dashboard/Widget/Picker.js

@@ -12,12 +12,6 @@ export default {
 	data: () => ({
 		callbacks: {}
 	}),
-	computed: {
-		// filter widgets away the user has no permissions for
-		availableWidgets() {
-			return (this.widgets || []).filter(widget => widget.permitted !== false);
-		}
-	},
 	methods: {
 		getWidget() {
 			return new Promise((resolve,reject) => {
@@ -43,17 +37,17 @@ export default {
 		<bs-modal
 			ref="modal"
 			class="fade"
-			:dialog-class="{ 'modal-fullscreen-sm-down': 1, 'modal-xl': availableWidgets.length > 0 }"
+			:dialog-class="{ 'modal-fullscreen-sm-down': 1, 'modal-xl': widgets && widgets.length > 0 }"
 			@hiddenBsModal="close"
 		>
 			<template v-slot:title>{{ $p.t('dashboard/createWidget') }}</template>
 			<template v-slot:default>
 				<div v-if="widgets" class="row g-2">
-					<div v-if="!availableWidgets.length">
+					<div v-if="!widgets.length">
 						{{ $p.t('dashboard/noWidgetsAvailable') }}
 					</div>
 					<div
-						v-for="widget in availableWidgets"
+						v-for="widget in widgets"
 						:key="widget.widget_id"
 						class="widget-icon-container col-sm-6 col-md-4 col-lg-3 col-xl-2"
 					>

public/js/components/DashboardWidget/MissingPermission.js

@@ -1,21 +0,0 @@
-import AbstractWidget from './Abstract.js';
-
-/**
- * Fallback screen rendered in place of a widget when the current user is missing
- * the permission (berechtigung_kurzbz) linked to that widget. Used for widgets
- * that are already on a user's dashboard but whose required permission the user
- * no longer holds.
- */
-export default {
-	mixins: [
-		AbstractWidget
-	],
-	created() {
-		this.$emit('setConfig', false);
-	},
-	template: /*html*/`
-	<div class="dashboard-widget-missing-permission d-flex flex-column justify-content-center align-items-center text-center h-100 p-3 text-body-secondary">
-		<i class="fa-solid fa-lock fa-2x mb-2" aria-hidden="true"></i>
-		<p class="mb-0">{{ $p.t('dashboard/widget_missing_permission') }}</p>
-	</div>`
-}

public/js/components/Funktionen/Funktionen.js

@@ -551,7 +551,6 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_von"
-							model-type="yyyy-MM-dd"
 							name="datum_von"
 							:label="$p.t('ui/from') + ' *'"
 							auto-apply
@@ -567,7 +566,6 @@ export default {
 							container-class="mb-3 col-3"
 							type="DatePicker"
 							v-model="formData.datum_bis"
-							model-type="yyyy-MM-dd"
 							name="datum_bis"
 							:label="$p.t('global/bis')"
 							auto-apply

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

@@ -470,7 +470,6 @@ export default {
 							:label="$p.t('admission', 'anmeldundRtAm')"
 							type="DatePicker"
 							v-model="formData.anmeldedatum"
-							model-type="yyyy-MM-dd"
 							auto-apply
 							:enable-time-picker="false"
 							text-input

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

@@ -293,7 +293,6 @@ export default {
 						:label="$p.t('person', 'geburtsdatum')"
 						type="DatePicker"
 						v-model="data.gebdatum"
-						model-type="yyyy-MM-dd"
 						name="gebdatum"
 						:clearable="false"
 						no-today

public/js/components/Stv/Studentenverwaltung/Details/Dokumente/Modal/Edit.js

@@ -103,7 +103,6 @@ export default {
 						<form-input
 							type="DatePicker"
 							v-model="formData.nachgereicht_am"
-							model-type="yyyy-MM-dd"
 							name="nachgereicht_am"
 							:label="$p.t('dokumente/nachreichungAm')"
 							auto-apply

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

@@ -27,7 +27,7 @@ export default {
 		return {
 			filter: false,
 			studiengang_kz: false,
-			counterdate: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate()
+			counterdate: new Date()
 		};
 	},
 	computed: {
@@ -259,7 +259,6 @@ 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,7 +79,6 @@ 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: luxon.DateTime.now().setZone(FHC_JS_DATA_STORAGE_OBJECT.timezone).toISODate(),
+				buchungsdatum: new Date(),
 				buchungstext: '',
 				mahnspanne: 30,
 				studiensemester_kurzbz: this.currentSemester,
@@ -154,7 +154,6 @@ 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/Mobility/Mobility.js

@@ -467,7 +467,6 @@ export default {
 						:label="$p.t('ui', 'von')"
 						type="DatePicker"
 						v-model="formData.von"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input
@@ -502,7 +501,6 @@ export default {
 						:label="$p.t('global', 'bis')"
 						type="DatePicker"
 						v-model="formData.bis"
-						model-type="yyyy-MM-dd"
 						auto-apply
 						:enable-time-picker="false"
 						text-input

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

@@ -325,7 +325,6 @@ export default {
 						:label="$p.t('infocenter', 'zgvDatum')"
 						type="DatePicker"
 						v-model="data.zgvdatum"
-						model-type="yyyy-MM-dd"
 						name="zgvdatum"
 						no-today
 						auto-apply
@@ -390,7 +389,6 @@ export default {
 						:label="$p.t('lehre', 'zgvMasterDatum')"
 						type="DatePicker"
 						v-model="data.zgvmadatum"
-						model-type="yyyy-MM-dd"
 						name="zgvmadatum"
 						no-today
 						auto-apply
@@ -456,7 +454,6 @@ 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/Stv/Studentenverwaltung/Details/Status/Modal.js

@@ -276,7 +276,6 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.datum"
-				model-type="yyyy-MM-dd"
 				name="datum"
 				:label="$p.t('global/datum')"
 				auto-apply
@@ -292,7 +291,6 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bestaetigtam"
-				model-type="yyyy-MM-dd"
 				name="bestaetigtam"
 				:label="$p.t('lehre/bestaetigt_am')"
 				auto-apply
@@ -308,14 +306,13 @@ export default{
 				container-class="mb-3"
 				type="DatePicker"
 				v-model="formData.bewerbung_abgeschicktamum"
-				model-type="yyyy-MM-dd HH:mm:ss"
 				name="bewerbung_abgeschicktamum"
 				:label="$p.t('lehre/bewerbung_abgeschickt_am')"
 				auto-apply
-				:enable-time-picker="true"
-				format="dd.MM.yyyy HH:mm:ss"
+				:enable-time-picker="false"
+				format="dd.MM.yyyy"
 				text-input
-				preview-format="dd.MM.yyyy HH:mm:ss"
+				preview-format="dd.MM.yyyy"
 				:teleport="true"
 				:disabled="bisLocked || !hasPrestudentstatusPermission"
 				>

public/js/components/Stv/Studentenverwaltung/List/New.js

@@ -285,7 +285,6 @@ export default {
 								uid="stv-list-new-gebdatum"
 								name="gebdatum"
 								v-model="formDataPerson['gebdatum']"
-								model-type="yyyy-MM-dd"
 								:disabled="!!person"
 								@update:model-value="loadSuggestions"
 								text-input

public/js/components/filter/Filter.js

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

system/dbupdate_3.4.php

@@ -98,7 +98,6 @@ require_once('dbupdate_3.4/75888_reihungstest_mehrfachdurchfuehrung.php');
 require_once('dbupdate_3.4/76150_perm_other_lv_plan.php');
 require_once('dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php');
 require_once('dbupdate_3.4/68530_Dashboard_Cleanup.php');
-require_once('dbupdate_3.4/77757_widgets_berechtigungen.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';

system/dbupdate_3.4/77757_widgets_berechtigungen.php

@@ -1,57 +0,0 @@
-<?php
-/* Copyright (C) 2026 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 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.
- *
- * Beschreibung:
- * Dashboard Widgets: Verknüpfung einer (einzelnen) Berechtigung pro Widget.
- * Neue Spalte dashboard.tbl_widget.berechtigung_kurzbz mit FK auf
- * system.tbl_berechtigung. Ist die Spalte NULL, erfordert das Widget keine
- * gesonderte Berechtigung. Benutzer denen die verknüpfte Berechtigung fehlt,
- * bekommen das Widget nicht mehr zur Auswahl angezeigt bzw. sehen (falls bereits
- * am Dashboard) einen "Fehlende Berechtigung"-Screen.
- */
-if (! defined('DB_NAME')) exit('No direct script access allowed');
-
-// Add column dashboard.tbl_widget.berechtigung_kurzbz (FK => system.tbl_berechtigung)
-if ($result = @$db->db_query("
-	SELECT 1
-	FROM information_schema.columns
-	WHERE table_schema = 'dashboard'
-		AND table_name = 'tbl_widget'
-		AND column_name = 'berechtigung_kurzbz';"))
-{
-	if ($db->db_num_rows($result) == 0)
-	{
-		$qry = "
-			ALTER TABLE dashboard.tbl_widget
-				ADD COLUMN berechtigung_kurzbz VARCHAR(32) NULL;
-
-			ALTER TABLE dashboard.tbl_widget
-				ADD CONSTRAINT tbl_widget_berechtigung_fk
-				FOREIGN KEY (berechtigung_kurzbz)
-				REFERENCES system.tbl_berechtigung (berechtigung_kurzbz)
-				ON UPDATE CASCADE ON DELETE SET NULL;";
-
-		if (!$db->db_query($qry))
-		{
-			echo '<strong>dashboard.tbl_widget: '.$db->db_last_error().'</strong><br>';
-		}
-		else
-		{
-			echo 'dashboard.tbl_widget: Spalte berechtigung_kurzbz (FK system.tbl_berechtigung) hinzugefuegt<br>';
-		}
-	}
-}

system/phrasesupdate.php

@@ -32514,86 +32514,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'anwKontrolle',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Anwesenheitskontrolle',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Attendance check',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'anwKontrolleOeffnen',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Anwesenheitskontrolle öffnen',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Open attendance check',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'anwKeinUnterricht',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Kein Unterricht in diesem Zeitraum',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'No lessons in this period',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'anwesenheiten',
-		'category' => 'global',
-		'phrase' => 'anwJetzt',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Jetzt',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Now',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'anwesenheiten',
 		'category' => 'global',
@@ -48761,26 +48681,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'dashboard',
-		'phrase' => 'widget_missing_permission',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Ihnen fehlt die erforderliche Berechtigung, um dieses Widget anzuzeigen.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'You do not have the permission required to display this widget.',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 // CIS4 phrases from legacy code end
 // FHC4 Phrases Abschlusspruefung
 	array(