Merge branch 'master' into feature-68684/PHPMailer

# Conflicts:
#	cis/testtool/menu.php
#	system/dbupdate_3.4.php

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'] = '[email protected]';
 $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/Cis/Compat.php

@@ -0,0 +1,44 @@
+<?php
+
+if (!defined('BASEPATH'))
+	exit('No direct script access allowed');
+
+class Compat extends Auth_Controller
+{
+
+	/**
+	 * Constructor
+	 */
+
+	public function __construct()
+	{
+		parent::__construct([
+			'ci' => ['basis/cis:r'],
+			'legacy' => ['basis/cis:r'],
+			
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+
+	/**
+	 * @access public
+	 * @return void 
+	 */
+	public function ci()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+	/**
+	 * @access public
+	 * @return void
+	 */
+	public function legacy()
+	{
+		$this->load->view('CisRouterView/CisRouterView.php',['route' => 'Compat']);
+	}
+
+}

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

@@ -67,8 +67,11 @@ class CisMenu extends FHCAPI_Controller
 
 	private function generateUrlForMenuItem($menuItem)
 	{
-		$menuItem->url = $this->menuItemUrlHelper($menuItem);
-		unset($menuItem->content);
+		if(!isset($menuItem->url))
+		{
+			$menuItem->url = $this->menuItemUrlHelper($menuItem);
+			unset($menuItem->content);
+		}
 
 		if ($menuItem->childs && count($menuItem->childs)) {
 			$menuItem->childs = $this->generateUrlsForMenuItems($menuItem->childs);
@@ -83,7 +86,7 @@ class CisMenu extends FHCAPI_Controller
 			return site_url("/CisVue/Cms/content/" . $menuItem->content_id);
 		}
 
-		if (!$menuItem->content || !mb_strlen($menuItem->content)) {
+		if (!isset($menuItem->content) || !$menuItem->content || !mb_strlen($menuItem->content)) {
 			return '';
 		}
 

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);
 	}

cis/testtool/login.php

@@ -632,6 +632,7 @@ elseif (isset($prestudent_id))
 
 				$ps_obj->lastStatus = $ps_tmp->status_kurzbz; // letzten Status dem result array hinzufügen
 				$ps_obj->status_mehrsprachig = $ps_tmp->status_mehrsprachig;
+				$ps_obj->ausbildungssemester = $ps_tmp->ausbildungssemester;
 			}
 
 			// Falls Status 'Abgewiesene' vorhanden, nach hinten reihen

cis/testtool/menu.php

@@ -29,6 +29,7 @@ require_once('../../include/sprache.class.php');
 require_once '../../include/phrasen.class.php';
 require_once '../../include/studiengang.class.php';
 require_once('../../include/gebiet.class.php');
+require_once('../../include/gebiet_pruefling.class.php');
 
 if (!$db = new basis_db())
 	die('Fehler beim Oeffnen der Datenbankverbindung');
@@ -198,8 +199,8 @@ else if (isset($_SESSION['pruefling_id']))
 		)
 
 
-		SELECT DISTINCT ON
-			(gebiet_id, semester, reihung)
+		SELECT * FROM (SELECT DISTINCT ON
+			(gebiet_id)
 			semester,
 			gebiet_id,
 			STRING_AGG(studiengang_kz::TEXT, ', ' ORDER BY studiengang_kz) AS studiengang_kz_list,
@@ -226,13 +227,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(
-						(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-						OR
-						(prestudent_data.semester= 2 AND tbl_ablauf.semester = 2)
-						OR
-						(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
-					)
+					tbl_ablauf.semester <= prestudent_data.semester
 				AND (   
 						prestudent_data.studienplan_id = tbl_ablauf.studienplan_id
 						OR
@@ -259,9 +254,7 @@ else if (isset($_SESSION['pruefling_id']))
 				JOIN
 					testtool.tbl_gebiet USING (gebiet_id)
 				WHERE
-					(prestudent_data.semester= 1 AND tbl_ablauf.semester = 1)
-				OR
-					(prestudent_data.semester= 3 AND tbl_ablauf.semester IN (1,3))
+					tbl_ablauf.semester <= prestudent_data.semester
 				)
 			) temp
 		) temp2
@@ -270,7 +263,7 @@ else if (isset($_SESSION['pruefling_id']))
 			semester,
 			 gebiet_id,
 			 bezeichnung,
-			". $bezeichnung_mehrsprachig_sel ." 
+			". $bezeichnung_mehrsprachig_sel ." ) temp3
 
 		ORDER BY
 			semester,
@@ -283,6 +276,8 @@ else if (isset($_SESSION['pruefling_id']))
 	$lastsemester = '';
 	$quereinsteiger_stg = '';
 	$_SESSION['alleGebiete']= [];
+	$gebiet_pruefling = new gebiet_pruefling();
+	$quereinsteiger_menu = false;
 	while($row = $db->db_fetch_object($result))
 	{
 		//Jedes Semester in einer eigenen Tabelle anzeigen
@@ -294,8 +289,25 @@ else if (isset($_SESSION['pruefling_id']))
 			}
 			$lastsemester = $row->semester;
 
-			echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
-			echo '<tr><td class="HeaderTesttool">'. ($row->semester == '1' ? $p->t('testtool/basisgebiete') : $p->t('testtool/quereinstiegsgebiete')).'</td></tr>';
+			if ($row->semester == '1')
+			{
+				// Basisgebiete anzeigen
+				echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/basisgebiete') . '</td></tr>';
+			}
+			else
+			{
+				if (!$quereinsteiger_menu)
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+					echo '<tr><td class="HeaderTesttool">' . $p->t('testtool/quereinstiegsgebiete') . '</td></tr>';
+					$quereinsteiger_menu = true;
+				}
+				else
+				{
+					echo '<table border="0" cellspacing="0" cellpadding="0" id="Gebiet" style="display: visible; border-collapse: separate; border-spacing: 0 3px; margin-top: 5px;">';
+				}
+			}
 		}
 
 		// Bei Quereinstiegsgebieten nach STG clustern und die STG anzeigen
@@ -394,6 +406,12 @@ else if (isset($_SESSION['pruefling_id']))
 						</td>
 					<!--<td width="10" class="ItemTesttoolRight" nowrap>&nbsp;</td>-->
 					</tr>';
+			if (!$gebiet_pruefling->checkIfExists($_SESSION['pruefling_id'], $row->gebiet_id))
+			{
+				$gebiet_pruefling->pruefling_id = $_SESSION['pruefling_id'];
+				$gebiet_pruefling->gebiet_id = $row->gebiet_id;
+				$gebiet_pruefling->saveGebietForPruefling();
+			}
 			$_SESSION['alleGebiete'][] = $row->gebiet_id;
 		}
 		else

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": "bc21de2a48b960781c1ed028c4b8d7b9",
+    "content-hash": "3fe105bed2633fb937e6cc4146ce3508",
     "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": "[email protected]"
+                },
+                {
+                    "name": "Jim Jagielski",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Andy Prevost",
+                    "email": "[email protected]"
+                },
+                {
+                    "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.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
+                "reference": "55c5e23b34afb8fa9b6c6ea95cbd59b710160235"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
-                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/55c5e23b34afb8fa9b6c6ea95cbd59b710160235",
+                "reference": "55c5e23b34afb8fa9b6c6ea95cbd59b710160235",
                 "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.11.0"
             },
-            "time": "2023-03-08T15:03:36+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/Halleck45",
+                    "type": "github"
+                }
+            ],
+            "time": "2026-08-09T06:58:42+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.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c"
+                "reference": "4d3432ab12baebb4da6b7ad65d92847287f593b8"
             },
             "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/4d3432ab12baebb4da6b7ad65d92847287f593b8",
+                "reference": "4d3432ab12baebb4da6b7ad65d92847287f593b8",
                 "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.4"
             },
             "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": "2026-08-11T05:21:46+00:00"
         },
         {
             "name": "sebastian/resource-operations",

include/gebiet_pruefling.class.php

@@ -0,0 +1,97 @@
+<?php
+/* Copyright (C) 2024 Technikum-Wien
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class gebiet_pruefling extends basis_db
+{
+	//Tabellenspalten
+	public $prueflinggebiet_id;
+	public $pruefling_id;
+	public $gebiet_id;
+	public $insertamum;
+
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function loadByPruefling($pruefling_id)
+	{
+		$qry = "SELECT *
+     			FROM testtool.tbl_pruefling_gebiet
+     			WHERE pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->prueflinggebiet_id = $row->prueflinggebiet_id;
+				$this->pruefling_id = $row->pruefling_id;
+				$this->gebiet_id = $row->gebiet_id;
+				return true;
+			}
+			else
+			{
+				$this->errormsg = "Pruefling nicht gefunden";
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = "Fehler beim Laden der Gebiete für den Pruefling";
+			return false;
+		}
+	}
+
+	public function checkIfExists($pruefling_id, $gebiet_id)
+	{
+		$qry = "SELECT 1 
+				FROM testtool.tbl_pruefling_gebiet 
+				WHERE pruefling_id =".$this->db_add_param($pruefling_id, FHC_INTEGER) ." AND gebiet_id =".$this->db_add_param($gebiet_id, FHC_INTEGER);
+
+		if ($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) > 0)
+				return true;
+			else
+				return false;
+		}
+	}
+
+	public function saveGebietForPruefling()
+	{
+		$qry = "INSERT INTO testtool.tbl_pruefling_gebiet 
+    					(pruefling_id, gebiet_id)
+				VALUES(".
+			$this->db_add_param($this->pruefling_id, FHC_INTEGER).','.
+			$this->db_add_param($this->gebiet_id, FHC_INTEGER).');';
+
+		if ($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return true;
+		}
+	}
+
+}
+?>

include/mail.class.php

@@ -16,9 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: Christian Paminger <[email protected]>,
- *          Andreas Oesterreicher <[email protected]>,
- *          Rudolf Hangl <[email protected]> and
- *			Gerald Simane-Sequens <[email protected]>
+ *	  Andreas Oesterreicher <[email protected]>,
+ *	  Rudolf Hangl <[email protected]> and
+ *	  Gerald Simane-Sequens <[email protected]>
  */
 /**
  * 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/apps/Cis/Cis.js

@@ -19,6 +19,7 @@ import DeadlineOverview from "../../components/Cis/Abgabetool/DeadlineOverview.j
 import Studium from "../../components/Cis/Studium/Studium.js";
 import StgOrgLvPlan from "../../components/Cis/LvPlan/StgOrg.js";
 import OtherLvPlan from "../../components/Cis/LvPlan/OtherLvPlan.js";
+import Compat from "../../components/Cis/Compat.js";
 
 import ApiRouteInfo from '../../api/factory/routeinfo.js';
 import {capitalize} from "../../helpers/StringHelpers.js";
@@ -29,6 +30,18 @@ const isMobile = window.matchMedia("(max-width: 767px)").matches;
 const router = VueRouter.createRouter({
 	history: VueRouter.createWebHistory(`/${ciPath}`),
 	routes: [
+		{
+			path: `/Cis/Compat/:mode(ci|legacy)/:path(.*)`,
+			name: 'Compat',
+			component: Compat,
+			props: (route) => {
+				return {
+					mode: route.params.mode,
+					path: route.params.path,
+					query_string: VueRouter.stringifyQuery(route.query)
+				};
+			}
+		},
 		{
 			path: `/Cis/Studium`,
 			name: 'Studium',
@@ -277,7 +290,7 @@ const app = Vue.createApp({
 			if (target && this.isInternalRoute(target.href)) {
 				const url = new URL(target.href)
 				
-				const path = url.pathname
+				const path = url.pathname + url.search;
 				const base = this.$router.options.history.base
 				const route = path.replace(base, '') || '/'
 

public/js/components/Cis/Compat.js

@@ -0,0 +1,93 @@
+export default {
+	name: "Compat",
+	props: {
+		mode: { type: String, required: true },
+		path: { type: String, required: true },
+		query_string: { type: String, required: true, default: ''}
+	},
+	data: function() {
+		return {
+			lastLoadediFrameURL: '',
+			srcUrl: ''
+		};
+	},
+	computed: {
+		propsWatchHelper: function() {
+			return this.mode + '#' + this.path + '#' + this.query_string;
+		}
+	},
+	mounted: function() {
+		this.srcUrl = this.buildSrcUrl();
+	},
+	watch: {
+		propsWatchHelper: function() {
+			if(this.lastLoadediFrameURL === '') {
+				return;
+			}
+
+			let currentiFrameURL = this.$refs.compatiframe ? this.$refs.compatiframe.src : '';
+
+			let url = this.buildSrcUrl();
+			if(this.lastLoadediFrameURL !== url) {
+				this.srcUrl = url;
+				if(this.srcUrl === url) {
+					this.$refs.compatiframe.contentWindow.location.href = url;
+				}
+			}
+		}
+	},
+	methods: {
+		buildSrcUrl: function() {
+			let url = false;
+			switch(this.mode) {
+				case 'ci':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/' + this.path;
+					break;
+				case 'legacy':
+					url = FHC_JS_DATA_STORAGE_OBJECT.app_root + this.path;
+					break;
+				default:
+					url = false;
+			}
+			if(this.query_string !== '' && url) {
+				url += '?' + this.query_string;
+			}
+
+			return url;
+		},
+		loadHandler: function() {
+			let iframe_href = this.$refs.compatiframe.contentWindow.location.href;
+			let ci_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root + 'index.ci.php/';
+			let legacy_urlstart = FHC_JS_DATA_STORAGE_OBJECT.app_root;
+			let routerpath = null;
+
+			this.lastLoadediFrameURL = iframe_href;
+
+			if(iframe_href.startsWith(ci_urlstart)) {
+				routerpath = iframe_href.replace(
+					ci_urlstart, '/Cis/Compat/ci/');
+			} else if(iframe_href.startsWith(legacy_urlstart)) {
+				routerpath = iframe_href.replace(
+					legacy_urlstart, '/Cis/Compat/legacy/');
+			} else {
+				return;
+			}
+
+			if(this.$route.fullPath !== routerpath) {
+				this.$router.push(routerpath);
+			}
+		}
+	},
+	template: `
+		<div class="w-100">
+			<iframe
+				ref="compatiframe"
+				v-if="srcUrl"
+				:src="srcUrl"
+				@load="loadHandler"
+				style="width:100%; height:90vh; border:0; display:block;"
+			></iframe>
+		<div v-else class="alert alert-warning">Keine URL gefunden.</div>
+		</div>
+	`
+};

public/js/components/Cis/Profil/ProfilComponents/FhAusweisStatus.js

@@ -2,15 +2,16 @@ export default {
 	props: {
 		data: {
 			type: String,
-		}
+		},
 	},
 	data() {
-		return {}
+		return {};
 	},
-	template: /*html*/`
+	template: /*html*/ `
     <div class="card">
         <div class="card-body">
-            <span  >{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+            <span v-if="data">{{$p.t('profil','fhAusweisStatus',[data])}}</span>
+			<span v-else>{{$p.t('profil','fhAusweisStatusNichtAusgegeben')}}</span>
         </div>
     </div>`,
-}
+};

public/js/components/DetailHeader/DetailHeader.js

@@ -542,10 +542,10 @@ export default {
 
 		<template v-if="typeHeader==='mitarbeiter'">
 
-				<div class="foto-container col-md-2 d-flex justify-content-start align-items-center w-30 pb-3 gap-3 mt-3 position-relative" style="max-height: 8rem; max-width: 6rem; overflow: hidden;">
+				<div class="foto-container d-flex flex-column align-items-center h-100 position-relative d-inline-block">
 					<img
-					  class="d-block w-100 h-100 rounded"
-					  style="height: 84px; object-fit: contain;"
+					  class="d-block rounded"
+					  style="height: 96px;"
 					  alt="Profilbild"
 					  :src="getFotoSrc(headerDataMa.foto)"
 					/>
@@ -558,15 +558,13 @@ export default {
 					<template v-if="fotoEditable">
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonleft btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute start-0"
 							@click="showDeleteModal(person_id)">
 							<i class="fa fa-xmark"></i>
 						</button>
 						<button
 							type="button"
-							class="fotoedit btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
-							style="z-index: 104; font-size: 1rem; width: 2.5rem; height: 2.5rem; opacity:0; transition: opacity 0.2s; top:13%;"
+							class="fotoedit buttonright btn btn-outline-dark btn-sm d-flex justify-content-center align-items-center position-absolute end-0"
 							@click="showModal(person_id)">
 							<i class="fa fa-pen"></i>
 						</button>

system/dbupdate_3.4.php

@@ -102,6 +102,8 @@ require_once('dbupdate_3.4/75959_StudVw_Automatische_Tags.php');
 require_once('dbupdate_3.4/76160_lvv_favorites.php');
 require_once('dbupdate_3.4/77080_tabulator_presets_table.php');
 require_once('dbupdate_3.4/78292_gehaltsanpassungtyp.php');
+require_once('dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php');
+
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -253,7 +255,7 @@ $tabellen=array(
 	"hr.tbl_lohnguide_modellfunktion" => array("modellfunktion_kurzbz", "bezeichnung", "jobfamilie_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_modellstelle" => array("modellstelle_kurzbz", "bezeichnung", "grade", "modellfunktion_kurzbz", "aktiv", "sort", "insertvon", "insertamum", "updatevon", "updateamum"),
 	"hr.tbl_lohnguide_fachrichtung" => array("fachrichtung_kurzbz", "bezeichnung", "aktiv", "insertvon", "insertamum", "updatevon", "updateamum"),
-	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),	
+	"hr.tbl_vertragsbestandteil_lohnguide" => array("vertragsbestandteil_id", "stellenbezeichnung", "vordienstzeit", "fachrichtung_kurzbz", "modellstelle_kurzbz", "kommentar_person", "kommentar_modellstelle"),
 	"lehre.tbl_abschlussbeurteilung"  => array("abschlussbeurteilung_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
@@ -421,6 +423,7 @@ $tabellen=array(
 	"testtool.tbl_pruefling_frage"  => array("prueflingfrage_id","pruefling_id","frage_id","nummer","begintime","endtime"),
 	"testtool.tbl_frage_sprache"  => array("frage_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
 	"testtool.tbl_vorschlag_sprache"  => array("vorschlag_id","sprache","text","bild","audio","insertamum","insertvon","updateamum","updatevon"),
+	"testtool.tbl_pruefling_gebiet"  => array("prueflinggebiet_id","pruefling_id","gebiet_id","insertamum"),
 	"system.tbl_app" => array("app"),
 	"system.tbl_appdaten" => array("appdaten_id","uid","app","appversion","version","bezeichnung","daten","freigabe","insertamum","insertvon","updateamum","updatevon"),
 	"system.tbl_cronjob"  => array("cronjob_id","server_kurzbz","titel","beschreibung","file","last_execute","aktiv","running","jahr","monat","tag","wochentag","stunde","minute","standalone","reihenfolge","updateamum", "updatevon","insertamum","insertvon","variablen"),

system/dbupdate_3.4/54225_reihungstest_ablauf_fuer_quereinsteiger.php

@@ -0,0 +1,41 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Creates table public.tbl_notiz_typ if it doesn't exist and grants privileges
+if (!$result = @$db->db_query('SELECT 1 FROM testtool.tbl_pruefling_gebiet LIMIT 1'))
+{
+	$qry = 'CREATE TABLE testtool.tbl_pruefling_gebiet
+			(
+				prueflinggebiet_id integer NOT NULL,
+				pruefling_id integer NOT NULL,
+				gebiet_id integer NOT NULL,
+				insertamum timestamp DEFAULT now()
+			);
+			
+			ALTER TABLE testtool.tbl_pruefling_gebiet OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT pk_tbl_pruefling_gebiet PRIMARY KEY (prueflinggebiet_id);
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_pruefling_id FOREIGN KEY (pruefling_id) REFERENCES testtool.tbl_pruefling(pruefling_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ADD CONSTRAINT fk_tbl_pruefling_gebiet_gebiet_id FOREIGN KEY (gebiet_id) REFERENCES testtool.tbl_gebiet(gebiet_id) ON UPDATE CASCADE ON DELETE RESTRICT;
+
+			CREATE SEQUENCE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq
+				START WITH 1
+				INCREMENT BY 1
+				NO MINVALUE
+				NO MAXVALUE
+				CACHE 1;
+
+			ALTER TABLE testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq OWNER TO fhcomplete;
+			ALTER TABLE testtool.tbl_pruefling_gebiet ALTER COLUMN prueflinggebiet_id SET DEFAULT nextval(\'testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq\');
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON testtool.tbl_pruefling_gebiet TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON testtool.tbl_pruefling_gebiet_prueflinggebiet_id_seq TO web;
+			';
+
+	if (!$db->db_query($qry))
+		echo '<strong>public.tbl_pruefling_gebiet: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.tbl_pruefling_gebiet table created';
+}
+

system/phrasesupdate.php

@@ -19829,6 +19829,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'massnahmeneinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme ist nur einmalig planbar.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure may only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20609,6 +20629,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'personenMassnahmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'alle Maßnahmen der Personen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => ' all measures of the people',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'international',
 		'category' => 'international',
@@ -20689,6 +20729,46 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'einmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nur einmal planbar',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'One-time only',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'international',
+		'category' => 'international',
+		'phrase' => 'erroreinmalig',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Diese Maßnahme kann nur einmal geplant werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This measure can only be planned once.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'gruppenmanagement',
@@ -29363,6 +29443,26 @@ array(
 				)
 			)
 		),
+		array(
+			'app' => 'core',
+			'category' => 'profil',
+			'phrase' => 'fhAusweisStatusNichtAusgegeben',
+			'insertvon' => 'system',
+			'phrases' => array(
+				array(
+					'sprache' => 'German',
+					'text' => 'Der FH Ausweis wurde noch nicht ausgegeben.',
+					'description' => '',
+					'insertvon' => 'system'
+				),
+				array(
+					'sprache' => 'English',
+					'text' => 'The FH ID card has not been issued yet.',
+					'description' => '',
+					'insertvon' => 'system'
+				)
+			)
+		),
 		array(
 			'app' => 'core',
 			'category' => 'profil',

vilesci/stammdaten/auswertung_fhtw.php

@@ -251,6 +251,31 @@ if ($deleteSingleResult)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id, insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND
 				frage_id IN (SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ");
@@ -258,7 +283,9 @@ if ($deleteSingleResult)
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id) . " AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . "));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet where pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . " AND gebiet_id=" . $db->db_add_param($_POST['gebiet_id']) . ";";
 
 		if ($result = $db->db_query($qry))
 		{
@@ -388,9 +415,35 @@ if ($deleteAllResults)
 			exit();
 		}
 
+		$qry = "SELECT * FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=" . $db->db_add_param($pruefling->pruefling_id, FHC_INTEGER) . ";
+				";
+
+		if ($db->db_query($qry))
+		{
+			while ($row = $db->db_fetch_object())
+			{
+				$undo .= " INSERT INTO testtool.tbl_pruefling_gebiet(prueflinggebiet_id,pruefling_id,gebiet_id,insertamum) VALUES (" .
+					$db->db_add_param($row->prueflinggebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->pruefling_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->gebiet_id, FHC_INTEGER) . ', ' .
+					$db->db_add_param($row->insertamum) . ');';
+			}
+		}
+		else
+		{
+			$db->db_query('ROLLBACK');
+			echo json_encode(array(
+				'status' => 'fehler',
+				'msg' => 'Fehler beim Erstellen des UNDO Befehls fuer testtool.tbl_pruefling_gebiet'
+			));
+			exit();
+		}
+
+
 		//Antworten loeschen
 		$qry = "	DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-					DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+					DELETE FROM testtool.tbl_antwort where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+					DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if ($result = $db->db_query($qry))
 		{

vilesci/stammdaten/reihungstest_administration.php

@@ -402,7 +402,10 @@ if(isset($_POST['deleteteilgebiet']))
 				DELETE FROM testtool.tbl_antwort
 				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND
 				vorschlag_id IN (SELECT vorschlag_id FROM testtool.tbl_vorschlag WHERE frage_id IN
-				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));";
+				(SELECT frage_id FROM testtool.tbl_frage WHERE gebiet_id=".$db->db_add_param($_POST['gebiet'])."));
+				
+				DELETE FROM testtool.tbl_pruefling_gebiet
+				WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id)." AND gebiet_id=".$db->db_add_param($_POST['gebiet']).";";
 
 		if($result = $db->db_query($qry))
 		{
@@ -497,7 +500,8 @@ if(isset($_POST['delete_all']))
 		}
 		//Gebiet loeschen
 		$qry = "DELETE FROM testtool.tbl_pruefling_frage where pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
-				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
+				DELETE FROM testtool.tbl_antwort WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";
+				DELETE FROM testtool.tbl_pruefling_gebiet WHERE pruefling_id=".$db->db_add_param($pruefling->pruefling_id).";";
 
 		if($result = $db->db_query($qry))
 		{