Merge branch 'master' into feature-26336/Composer_Twig_Dependency_Security_Issue

2026-07-20 16:32:20 +00:00 · 2026-07-09 10:47:01 +02:00 · 2026-06-10 14:24:24 +02:00 · 2023-05-15 16:43:04 +02:00 · 2022-11-30 17:27:28 +01:00
16 changed files with 298 additions and 879 deletions
@@ -4,31 +4,34 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');

 // Define configuration parameters
 $config['email_number_to_sent'] = 1000; // Number of emails to sent each time sendAll is called
-$config['email_number_per_time_range'] = 882; // Number of emails to sent before pause
+$config['email_number_per_time_range'] = 1; // Number of emails to sent before pause
 $config['email_time_range'] = 1; // Length of the pause in seconds
 $config['email_from_system'] = 'no-reply@technikum-wien.at';
 $config['alias_from_system'] = 'No Reply';

+// Smtp: if the CI email library has to connect to a smtp server
+// Mail: if the system is setup to send emails with the standard php mail function
+// Sendmail: if the system is setup to send email via Sendmail (or similar)
+$config['protocol'] = ''; // mail, sendmail, or smtp
+
+// If protocol is set to sendmail
+$config['mailpath'] = ''; // SThe server path to Sendmail (or similar)
+
 // If protocol is set to smtp
 $config['smtp_host'] = 'localhost'; // SMTP Server Address
 $config['smtp_port'] = 25;
-$config['smtp_timeout'] = 1; // in seconds
+$config['smtp_timeout'] = 5; // in seconds
 $config['smtp_keepalive'] = false; // Enable persistent SMTP connections
-$config['smtp_auth'] = false;
 $config['smtp_user'] = '';
 $config['smtp_pass'] = '';
-$config['smtp_encryption'] = ''; // '', 'tls' or 'ssl'
-$config['wordwrap'] = 76;
-$config['is_html'] = true; // html or text
-$config['priority'] = 3; // 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
+$config['wordwrap'] = true; // {unwrap}http://example.com/a_long_link_that_should_not_be_wrapped.html{/unwrap}
+$config['wrapchars'] = 76; // Character count to wrap at.
+$config['mailtype'] = 'html'; // html or text
+$config['priority'] = 3; // Email Priority. 1 = highest. 5 = lowest. 3 = normal
+$config['validate'] = false; // If true then the email address will be validated

-// If enabled will be logged info about emails
-// 0: Disable debugging (you can also leave this out completely, 0 is the default).
-// 1: Output messages sent by the client.
-// 2: as 1, plus responses received from the server (this is the most useful setting).
-// 3: as 2, plus more information about the initial connection - this level can help diagnose STARTTLS failures.
-// 4: as 3, plus even lower-level information, very verbose, don't use for debugging SMTP, only low-level problems.
-$config['enable_debug'] = 0;
+// If enabled will be logged info about emails in Codeigniter error logs
+$config['enable_debug'] = false;

 // default sender
 $config['sancho_mail_default_sender'] = defined('SANCHO_MAIL_DEFAULT_SENDER') ? SANCHO_MAIL_DEFAULT_SENDER : '';
@@ -44,4 +47,3 @@ $config['sancho_mail_header_img'] = defined('SANCHO_MAIL_HEADER_IMG') ? SANCHO_M

 // footer image for custom mails
 $config['sancho_mail_footer_img'] = defined('SANCHO_MAIL_FOOTER_IMG') ? SANCHO_MAIL_FOOTER_IMG : '';
-
@@ -35,20 +35,41 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 * @param string $bcc Sets BCC of mail.
 * @return void
 */
-function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerImg = '', $footerImg = '', $from = null, $cc = null, $bcc = null)
+function sendSanchoMail(
+	$vorlage_kurzbz,
+	$vorlage_data,
+	$to,
+	$subject,
+	$headerImg = '',
+	$footerImg = '',
+	$from = null,
+	$cc = null,
+	$bcc = null
+)
 {
 	$ci =& get_instance();
+	$ci->load->library('email');
 	$ci->load->library('MailLib');

-	$embeddedImages = array();
-	$_from = 'noreply@' . DOMAIN;
 	$sancho_mail_config = $ci->config->item('mail');

-	if ($from == null && isset($sancho_mail_config['sancho_mail_default_sender']) && $sancho_mail_config['sancho_mail_default_sender'])
+
+	if ($from == '')
 	{
-		$_from = $sancho_mail_config['sancho_mail_default_sender'] . '@' . DOMAIN;
+		$from = ((isset($sancho_mail_config['sancho_mail_default_sender'])
+				&& $sancho_mail_config['sancho_mail_default_sender']) 
+			  ? $sancho_mail_config['sancho_mail_default_sender']
+			  : 'noreply')
+			  . '@' . DOMAIN;
 	}

+	// Embed sancho header and footer image
+	// reset important to ensure embedding of images when called in a loop
+	$ci->email->clear(true);  // clear vars and attachments
+
+	$cid_header = '';
+	$cid_footer = '';
+
 	if (isset($sancho_mail_config['sancho_mail_use_images']) && $sancho_mail_config['sancho_mail_use_images'])
 	{
 		$sanchoHeader_img = '';
@@ -90,27 +111,29 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 			}
 		}

-		// Attach header and footer
-		$embeddedImages[] = array('file_name' => $sanchoHeader_img, 'cid' => 'sancho_header');
-		$embeddedImages[] = array('file_name' => $sanchoFooter_img, 'cid' => 'sancho_footer');
+		// attach header and footer
+		$ci->email->attach($sanchoHeader_img, 'inline');
+		$ci->email->attach($sanchoFooter_img, 'inline');
+		$cid_header = $ci->email->attachment_cid($sanchoHeader_img); // sets unique content id for embedding
+		$cid_footer = $ci->email->attachment_cid($sanchoFooter_img); // sets unique content id for embedding
 	}

 	// Set specific mail content into specific content template
 	$content = _parseMailContent($vorlage_kurzbz, $vorlage_data);

-	// Set overall main content into the sancho mail template
-	$body = _parseMailContent(
-		'Sancho_Mail_Template',
-		array(
-			'CID_header' => 'sancho_header',
-			'CID_footer' => 'sancho_footer',
-			'content' => $content
-		)
+	// overall main content data array
+	$layout = array(
+		'CID_header' => $cid_header,
+		'CID_footer' => $cid_footer,
+		'content' => $content
 	);

+	// Set overall main content into the sancho mail template
+	$body = _parseMailContent('Sancho_Mail_Template', $layout);
+
 	// Send mail
 	return $ci->maillib->send(
-		$_from,
+		$from,
 		$to,
 		$subject,
 		$body,
@@ -119,8 +142,7 @@ function sendSanchoMail($vorlage_kurzbz, $vorlage_data, $to, $subject, $headerIm
 		$bcc,
 		'', // altMessage
 		true, // bulk
-		true, // autogenerated
-		$embeddedImages
+		true // autogenerated
 	);
 }

@@ -149,4 +171,3 @@ function _parseMailContent($vorlage_kurzbz, $vorlage_data)
 		}
 	}
 }
-
@@ -2,10 +2,6 @@

 if (! defined('BASEPATH')) exit('No direct script access allowed');

-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
 /**
 * Library to manage the sending of the email
 */
@@ -13,7 +9,7 @@ class MailLib
 {
 	const ENABLE_DEBUG = 'enable_debug';

-	private $_sended; // Sended email counter
+	private $sended; // Sended email counter

 	// Properties for storing the configuration
 	private $email_number_to_sent;
@@ -22,7 +18,6 @@ class MailLib
 	private $email_from_system;

 	private $_ci; // Codeigniter instance
-	private $_mail; // PHPMailer instance

 	/**
 	 * Class constructor
@@ -30,7 +25,7 @@ class MailLib
 	public function __construct()
 	{
 		// Set the counter to 0
-		$this->_sended = 0;
+		$this->sended = 0;

 		// Get CI instance
 		$this->_ci =& get_instance();
@@ -38,135 +33,97 @@ class MailLib
 		// The second parameter is used to avoiding name collisions in the config array
 		$this->_ci->config->load('mail', true);

-		try
-		{
-			// PHPMailer configuration
-			$this->_mail = new PHPMailer(true);
-			$this->_mail->isSMTP();								// Send using SMTP
-			$this->_mail->Host = $this->_getEmailCfgItem('smtp_host');			// Set the SMTP server to send through
-			$this->_mail->Port = $this->_getEmailCfgItem('smtp_port');			// TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-			$this->_mail->SMTPAuth = $this->_getEmailCfgItem('smtp_auth');			// Enable SMTP authentication
-			$this->_mail->Username = $this->_getEmailCfgItem('smtp_user');			// SMTP username
-			$this->_mail->Password = $this->_getEmailCfgItem('smtp_pass');			// SMTP password
-			$this->_mail->SMTPSecure = $this->_getEmailCfgItem('smtp_encryption');		// Enable implicit TLS encryption
-			$this->_mail->Timeout = $this->_getEmailCfgItem('smtp_timeout');		// set the timeout (seconds)
-			$this->_mail->SMTPKeepAlive = $this->_getEmailCfgItem('smtp_keepalive');	// Persistent SMTP connection
-			$this->_mail->Priority = $this->_getEmailCfgItem('priority');			// 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
-			$this->_mail->WordWrap = $this->_getEmailCfgItem('wordwrap');
-			$this->_mail->isHTML($this->_getEmailCfgItem('is_html'));			// html or text
-			$this->_mail->SMTPDebug = $this->_getEmailCfgItem('enable_debug');
-			$this->_mail->CharSet = 'UTF-8';
+		// CI Email library
+		$this->_ci->load->library('email');

-			// Set the configuration properties with the standard configuration values
-			$this->email_number_to_sent = $this->_getEmailCfgItem('email_number_to_sent');
-			$this->email_number_per_time_range = $this->_getEmailCfgItem('email_number_per_time_range');
-			$this->email_time_range = $this->_getEmailCfgItem('email_time_range');
-			$this->email_from_system = $this->_getEmailCfgItem('email_from_system');
-			$this->alias_from_system = $this->_getEmailCfgItem('alias_from_system');
-		}
-		catch(Exception $e)
-		{
-			error_log($e->errorMessage());
-		}
+		// Initializing email library with the loaded configurations
+		$this->_ci->email->initialize($this->_ci->config->config['mail']);
+
+		// Set the configuration properties with the standard configuration values
+		$this->email_number_to_sent = $this->getEmailCfgItem('email_number_to_sent');
+		$this->email_number_per_time_range = $this->getEmailCfgItem('email_number_per_time_range');
+		$this->email_time_range = $this->getEmailCfgItem('email_time_range');
+		$this->email_from_system = $this->getEmailCfgItem('email_from_system');
+		$this->alias_from_system = $this->getEmailCfgItem('alias_from_system');
 	}

 	/**
 	 * Sends a single email
 	 */
-	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false, $embeddedImages = array())
+	public function send($from, $to, $subject, $message, $alias = '', $cc = null, $bcc = null, $altMessage = '', $bulk = false, $autogenerated = false)
 	{
-		$result = false;
-
-		try
+		// If it is configured then log mail info into the CI error logs
+		if ($this->getEmailCfgItem(self::ENABLE_DEBUG) === true)
 		{
-			// If it is configured then log mail info into the CI error logs
-			if ($this->_getEmailCfgItem(self::ENABLE_DEBUG) === true)
-			{
-				$this->_ci->load->library('LogLib'); // Loads logging library
+			$this->_ci->load->library('LogLib'); // Loads logging library

-				// Log them all!
-				$this->_ci->loglib->logError('From: '.$from);
-				$this->_ci->loglib->logError('To: '.$to);
-				$this->_ci->loglib->logError('Subject: '.$subject);
-				$this->_ci->loglib->logError('Message: '.$message);
-				$this->_ci->loglib->logError('Alias: '.$alias);
-				$this->_ci->loglib->logError('CC: '.$cc);
-				$this->_ci->loglib->logError('BCC: '.$bcc);
-				$this->_ci->loglib->logError('Alternative message: '.$altMessage);
-			}
-
-			// If from is not specified then use the standard one
-			if (is_null($from) || $from == '')
-			{
-				$from = $this->email_from_system;
-				// If alias is not specified then use the standard one
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-			if (defined('MAIL_FROM') && MAIL_FROM != '')
-			{
-				$from = MAIL_FROM;
-				if (is_null($alias) || $alias == '')
-				{
-					$alias = $this->alias_from_system;
-				}
-			}
-
-			$this->_mail->setFrom($from, $alias);
-
-			// Check if the email address of the debug recipient is a valid one
-			$recipient = $to;
-			$recipientCC = $cc;
-			$recipientBCC = $bcc;
-
-			// If we the an email for debugging has been set
-			if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
-			{
-				// if is it valid use it!!!
-				$recipient = MAIL_DEBUG;
-				if ($recipientCC != '') $recipientCC = MAIL_DEBUG;
-				if ($recipientBCC != '') $recipientBCC = MAIL_DEBUG;
-			}
-
-			// Recipients
-			$this->_mail->addAddress($recipient);
-			if (!is_null($recipientCC)) $this->_mail->addCC($recipientCC);
-			if (!is_null($recipientBCC)) $this->_mail->addBCC($recipientBCC);
-
-			// Subject & body & alternative body
-			$this->_mail->Subject = $subject;
-			$this->_mail->Body = $message;
-			if (!isEmptyString($altMessage)) $this->_mail->AltBody = $altMessage;
-
-			// Custom headers
-			if ($bulk) $this->_mail->addCustomHeader('Precedence', 'bulk');
-			if ($autogenerated) $this->_mail->addCustomHeader('Auto-Submitted', 'auto-generated');
-
-			// Embedded images
-			foreach ($embeddedImages as $embeddedImage)
-			{
-				if (!$this->_mail->addEmbeddedImage($embeddedImage['file_name'], $embeddedImage['cid'])) return false;
-			}
-
-			$result = $this->_mail->send();
-
-			// If the email was succesfully sended then increment the counter and checks if it has to _wait until the sending of the next
-			if ($result != false)
-			{
-				$this->_sended++;
-				$this->_wait();
-			}
-
-			// Clear the properties for the next message
-			$this->_mail->clearAddresses();
-			$this->_mail->clearAllRecipients();
-			$this->_mail->clearAttachments();
+			// Log them all!
+			$this->_ci->loglib->logError('From: '.$from);
+			$this->_ci->loglib->logError('To: '.$to);
+			$this->_ci->loglib->logError('Subject: '.$subject);
+			$this->_ci->loglib->logError('Message: '.$message);
+			$this->_ci->loglib->logError('Alias: '.$alias);
+			$this->_ci->loglib->logError('CC: '.$cc);
+			$this->_ci->loglib->logError('BCC: '.$bcc);
+			$this->_ci->loglib->logError('Alternative message: '.$altMessage);
 		}
-		catch (Exception $e)
+
+		// If from is not specified then use the standard one
+		if (is_null($from) || $from == '')
 		{
-			error_log($e->errorMessage());
+			$from = $this->email_from_system;
+			// If alias is not specified then use the standard one
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+		if (defined('MAIL_FROM') && MAIL_FROM != '')
+		{
+			$from = MAIL_FROM;
+			if (is_null($alias) || $alias == '')
+			{
+				$alias = $this->alias_from_system;
+			}
+		}
+
+		$this->_ci->email->from($from, $alias);
+
+		// Check if the email address of the debug recipient is a valid one
+		$recipient = $to;
+		$recipientCC = $cc;
+		$recipientBCC = $bcc;
+		if (defined('MAIL_DEBUG') && MAIL_DEBUG != '')
+		{
+			// if is it valid use it!!!
+			$recipient = MAIL_DEBUG;
+			if ($recipientCC != '')
+				$recipientCC = MAIL_DEBUG;
+			if ($recipientBCC != '')
+				$recipientBCC = MAIL_DEBUG;
+		}
+
+		$this->_ci->email->to($recipient);
+		if (!is_null($recipientCC)) $this->_ci->email->cc($recipientCC);
+		if (!is_null($recipientBCC)) $this->_ci->email->bcc($recipientBCC);
+		$this->_ci->email->subject($subject);
+		$this->_ci->email->message($message);
+		if (!isEmptyString($altMessage)) $this->_ci->email->set_alt_message($altMessage);
+
+		if($bulk)
+			$this->_ci->email->set_header('Precedence', 'bulk');
+		if($autogenerated)
+			$this->_ci->email->set_header('Auto-Submitted', 'auto-generated');
+
+		// Avoid printing on standard output ugly error messages
+		$result = @$this->_ci->email->send();
+
+		// If the email was succesfully sended then increment the counter
+		// and checks if it has to wait until the sending of the next
+		if ($result)
+		{
+			$this->sended++;
+			$this->wait();
 		}

 		return $result;
@@ -219,13 +176,13 @@ class MailLib
 	}

 	/**
-	 * Checks if it has to _wait until the sending of the next
+	 * Checks if it has to wait until the sending of the next
 	 */
-	private function _wait()
+	private function wait()
 	{
-		if ($this->_sended == $this->email_number_per_time_range)
+		if ($this->sended == $this->email_number_per_time_range)
 		{
-			$this->_sended = 0;
+			$this->sended = 0;
 			sleep($this->email_time_range); // Wait!!!
 		}
 	}
@@ -233,7 +190,7 @@ class MailLib
 	/**
 	 * Gets an item from the email configuration array
 	 */
-	private function _getEmailCfgItem($itemName)
+	private function getEmailCfgItem($itemName)
 	{
 		return $this->_ci->config->item($itemName, EMAIL_CONFIG_INDEX);
 	}
@@ -1,67 +0,0 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'TemplateLinkDocuments', 'tablesort' => true, 'tableid' => 't1', 'sortList' => '2,1', 'headers' => '3:{sorter:false},4:{sorter:false}'));
-?>
-
-
-
-	<script>
-		function addDocument(dokument_kurzbz)
-		{
-			var addDocumentDefault = document.getElementById("addDocumentDefault");
-			addDocumentDefault.selected = true;
-
-
-			$.post("../saveDocuments/"+<?=$vorlagestudiengang_id?>+"/"+dokument_kurzbz+"/0", function(answer)
-			{
-				window.location.href=window.location.href;
-			});
-		}
-		function delDocument(vorlagedokument_id)
-		{
-			$.post("../deleteDocumentLink/"+vorlagedokument_id, function(answer)
-			{
-				window.location.href=window.location.href;
-			});
-		}
-		function changeSort(vorlagedokument_id, sortnum)
-		{
-			$.post("../changeSort/"+vorlagedokument_id+"/"+sortnum, function(answer)
-			{
-				window.location.href=window.location.href;
-			});
-		}
-	</script>
-	<h2><?=$vorlagestudiengang_id?></h2>
-	<table id="t1" class="tablesorter">
-		<thead>
-			<tr>
-				<th>ID</th>
-				<th>Bezeichnung</th>
-				<th>Sortierung</th>
-				<th></th>
-				<th></th>
-			</tr>
-		</thead>
-		<tbody>
-		<?php foreach ($documents as $d): ?>
-			<tr>
-				<td><?=$d->vorlagedokument_id?></td>
-				<td><?=$d->bezeichnung?></td>
-				<td> <?=$d->sort?></td>
-				<td><a onclick="changeSort('<?=$d->vorlagedokument_id?>', <?=$d->sort?>+1)"><img src="<?php echo APP_ROOT?>/skin/images/up.png"/></a> <a onclick="changeSort('<?=$d->vorlagedokument_id?>', <?=$d->sort?>-1)"><img src="<?php echo APP_ROOT?>/skin/images/down.png"/></a></td>
-				<td><a onclick="delDocument('<?=$d->vorlagedokument_id?>')">löschen</a></td>
-			</tr>
-		<?php endforeach; ?>
-		</tbody>
-	</table>
-
-	<select>
-		<option selected="true" id="addDocumentDefault" disabled>Dokument hinzufuegen</option>
-		<?php foreach($allDocuments as $d): ?>
-			<option onclick="addDocument('<?=$d->dokument_kurzbz?>');"><?=$d->bezeichnung?></option>
-		<?php endforeach ;?>
-	</select>
-
-
-</body>
-</html>
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN">
-<html lang="de_AT">
-
-<head>
-	<title>VileSci - Vorlage</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-</head>
-
-<frameset rows="30%,*">
-  	<frame src="Vorlage/table" id="VorlageTop" name="VorlageTop" frameborder="0" />
-  	<frame src="Vorlage/edit" id="VorlageBottom" name="VorlageBottom" frameborder="0" />
-	<noframes>
-		<body bgcolor="#FFFFFF">
-			This application works only with a frames-enabled browser.<br />
-			<a href="VorlageList">Use without frames</a>
-		</body>
-	</noframes>
-</frameset>
-
-</html>
@@ -1,32 +0,0 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'jsoneditor' => true));
-?>
-<div class="row">
-	<div class="span4">
-	  <h2>Vorlage: <?php echo $vorlage->vorlage_kurzbz; ?></h2>
-<form method="post" action="../save">
-	Bezeichnung: <input type="text" name="bezeichnung" value="<?php echo $vorlage->bezeichnung; ?>" />
-	Anmerkung: <input type="text" name="anmerkung" value="<?php echo $vorlage->anmerkung; ?>" /><br/>
-
-	MimeType:<?php echo $this->widgetlib->widget("mimetype_widget", array('mimetype' => $vorlage->mimetype)); ?>
-
-	Attribute: <?php echo $this->widgetlib->widget("jsoneditor_widget", array('json' => $vorlage->attribute)); ?>
-
-	<input type="hidden" name="attribute" id="attribute" value="<?=$vorlage->attribute?>" />
-	<input type="hidden" name="vorlage_kurzbz" value="<?php echo $vorlage->vorlage_kurzbz; ?>" />
-	<button type="submit" onclick="getJSON(this.form);">Save</button> 
-</form>
-
-</div>
-</div>
-
-<script type="text/javascript" >
-	// get json
-    function getJSON(form)
-	{
-        form.elements["attribute"].value = JSON.stringify(jsoneditor.get(), null, 2);
-		//alert(form.elements["attribute"].value);
-    }
-</script>
-</body>
-</html>
@@ -1,38 +0,0 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'VorlageList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '4:{sorter:false}'));
-?>
-<div class="row">
-	<div class="span4">
-	  <h2>Vorlagen</h2>
-<form method="post" action="">
-MimeType 
-<?php 
-    // This is an example to show that you can load stuff from inside the template file
-    echo $this->widgetlib->widget("mimetype_widget", array('mimetype' => $mimetype));
-?>
- <button type="submit">Filter</button> 
-</form> 
-
-<table id="t1" class="tablesorter">
-	<thead>
-		<tr><th class='table-sortable:default'>Vorlage</th>
-			<th class='table-sortable:default'>Bezeichnung</th>
-			<th>Anmerkung</th><th>MimeType</th>
-			<th></th>
-		</tr>
-	</thead>
-	<tbody>
-	<?php foreach ($vorlage as $v): ?>
-		<tr><td><a href="edit/<?php echo $v->vorlage_kurzbz; ?>" target="VorlageBottom"><?php echo $v->vorlage_kurzbz; ?></a></td>
-			<td><?php echo $v->bezeichnung; ?></td>
-			<td><?php echo $v->anmerkung; ?></td>
-			<td><?php echo $v->mimetype; ?></td>
-			<td><a href="view/<?php echo $v->vorlage_kurzbz; ?>">Vorlagenexte bearbeiten</a></td>
-		</tr>
-	<?php endforeach ?>
-	</tbody>
-</table>
-</div>
-</div>
-</body>
-</html>
@@ -1,50 +0,0 @@
-<?php
-	$this->load->view('templates/header', array('title' => 'VorlagetextList', 'tablesort' => true, 'tableid' => 't1', 'headers' => '7:{sorter:false},8:{sorter:false},9:{sorter:false}'));
-?>
-
-<div class="row">
-  <div class="span4">
-	<h2>Vorlagentext - <?php echo $vorlage_kurzbz; ?></h2>
-	<form method="post" action="../newText" target="VorlageBottom">
-	  <input type="hidden" name="vorlage_kurzbz" value="<?php echo $vorlage_kurzbz; ?>"/>
-	  <button type="submit">Neu</button>
-	</form>
-
-	<table id="t1" class="tablesorter">
-		<thead>
-			<tr>
-				<th>ID</th>
-				<th>Vorlage</th>
-				<th>Version</th>
-				<th>OrgEinheit</th>
-				<th>OrgForm</th>
-				<th>Berechtigung</th>
-				<th>Anmerkung</th>
-				<th>Aktiv</th>
-				<th></th>
-				<th></th>
-			</tr>
-		</thead>
-	  <tbody>
-		<?php foreach ($vorlagentext as $v): ?>
-			<tr>
-				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlagestudiengang_id; ?></a></td>
-				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlage_kurzbz; ?></a></td>
-				<td><?php echo $v->version; ?></td>
-				<td><?php echo $v->oe_kurzbz; ?></td>
-				<td></td>
-				<td><?php echo implode(',', $v->berechtigung); ?></td>
-				<td><?php echo $v->anmerkung_vorlagestudiengang; ?></td>
-				<td><?php echo $v->aktiv; ?></td>
-				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom">Edit Text</a></td>
-				<td><a href="../linkDocuments/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom">Edit Documents</a></td>
-			</tr>
-		<?php endforeach ?>
-	  </tbody>
-	</table>
-  </div>
-</div>
-
-<?php
-	$this->load->view('templates/footer');
-?>
@@ -1,3 +0,0 @@
-<?php
-	echo $text;
-?>
@@ -13,7 +13,6 @@ isset($title) ? $title = 'VileSci - '.$title : $title = 'VileSci';
 !isset($headers) ? $headers = '' : $headers = $headers;
 !isset($tinymce) ? $tinymce = false : $tinymce = $tinymce;
 !isset($jsoneditor) ? $jsoneditor = false : $jsoneditor = $jsoneditor;
-!isset($jsonforms) ? $jsonforms = false : $jsonforms = $jsonforms;
 !isset($textile) ? $textile = false : $textile = $textile;
 !isset($widgetsCSS) ? $widgetsCSS = false : $widgetsCSS = $widgetsCSS;
 !isset($datepicker) ? $datepicker = false : $datepicker = $datepicker;
@@ -107,11 +106,6 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
 	<script type="text/javascript" src="<?php echo base_url('vendor/josdejong/jsoneditor/dist/jsoneditor.js');?>"></script>
 <?php endif ?>

-<?php if($jsonforms) : ?>
-	<link rel="stylesheet" type="text/css" href="<?php echo base_url('vendor/brutusin/json-forms/dist/css/brutusin-json-forms.min.css'); ?>" />
-	<script type="text/javascript" src="<?php echo base_url('vendor/brutusin/json-forms/dist/js/brutusin-json-forms.min.js'); ?>"></script>
-<?php endif ?>
-
 <?php if($widgetsCSS) : ?>
 	<link rel="stylesheet" type="text/css" href="<?php echo base_url('skin/widgets.css'); ?>" />
 <?php endif ?>
@@ -1,10 +0,0 @@
-<div id="<?=$id?>" style="<?=$style?>"></div>
-<script language="Javascript" type="text/javascript">
-	var container = document.getElementById('<?=$id?>');
-	var schema = <?=$schema?>;
-	var BrutusinForms = brutusin["json-forms"];
-	var <?=$objectname?> = BrutusinForms.create(schema);
-	<?=$objectname?>.render(container);
-</script>
-
-
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * JSON-Forms widget
- */
-class jsonforms_widget extends Widget 
-{
-    public function display($data) 
-	{
-		// set default values if needed
-		if (! isset($data['objectname']))
-			$data['objectname'] = 'bf';
-		if (! isset($data['id']))
-			$data['id'] = 'jsonforms';
-		if (! isset($data['style']))
-			$data['style'] = 'width: 50%; ';
-		if (! isset($data['schema']))
-			$data['schema'] = '{
-			  "$schema": "http://json-schema.org/draft-03/schema#",
-			  "title": "Person",
-			  "type": "object",
-			  "properties": {
-				"anrede": {
-				  "type": "string",
-				  "enum": [
-					"Herr",
-					"Frau"
-				  ],
-				  "default": "Herr"
-				},
-				"vorname": {
-				  "type": "string",
-				  "description": "Firstname",
-				  "minLength": 2,
-				  "default": "Vorname"
-				},
-				"nachname": {
-				  "type": "string",
-				  "description": "Surename",
-				  "minLength": 2,
-				  "default": "Nachname"
-				}
-			  }
-			}';
-        $this->view('widgets/jsonforms', $data);
-    }
-}
@@ -172,17 +172,6 @@
 				}
 			}
 		},
-		{
-			"type": "package",
-			"package": {
-				"name": "brutusin/json-forms",
-				"version": "1.4.0",
-				"dist": {
-					"url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip",
-					"type": "zip"
-				}
-			}
-		},
 		{
 			"type": "package",
 			"package": {
@@ -479,11 +468,8 @@
 		"jquery/jquery2": "2.*",
 		"jquery/sizzle": "1.0.*",
 		"jquery-archive/jquery-metadata": "1.0.*",
-		"brutusin/json-forms": "1.4.0",
 		"josdejong/jsoneditor": "5.5.6",

-		"kingsquare/json-schema-form": "*",
-
 		"ludo/jquery-treetable": "3.2.0",

 		"michelf/php-markdown": "1.5.0",
@@ -519,8 +505,7 @@
 		"vuejs/vuedatepicker_js": "7.2.0",
 		"vuejs/vuedatepicker_css": "7.2.0",
 		"vuejs/vuedatepicker_js11": "11.0.1",
-		"vuejs/vuedatepicker_css11": "11.0.1",
-		"phpmailer/phpmailer": "^7.0"
+		"vuejs/vuedatepicker_css11": "11.0.1"

 	},
 	"config": {
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "3ec44005c1f5f810f304ad049a2c5c6b",
+    "content-hash": "146d2d3708e44cf5966be727e54c0a48",
    "packages": [
        {
            "name": "afarkas/html5shiv",
@@ -77,15 +77,6 @@
            },
            "type": "library"
        },
-        {
-            "name": "brutusin/json-forms",
-            "version": "1.4.0",
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/brutusin/json-forms/archive/v1.4.0.zip"
-            },
-            "type": "library"
-        },
        {
            "name": "chillerlan/php-qrcode",
            "version": "2.0.8",
@@ -1086,115 +1077,6 @@
            },
            "type": "library"
        },
-        {
-            "name": "justinrainbow/json-schema",
-            "version": "1.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jsonrainbow/json-schema.git",
-                "reference": "87b54b460febed69726c781ab67462084e97a105"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105",
-                "reference": "87b54b460febed69726c781ab67462084e97a105",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "require-dev": {
-                "json-schema/json-schema-test-suite": "1.1.0",
-                "phpdocumentor/phpdocumentor": "~2",
-                "phpunit/phpunit": "~3.7"
-            },
-            "bin": [
-                "bin/validate-json"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "JsonSchema": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Bruno Prieto Reis",
-                    "email": "bruno.p.reis@gmail.com"
-                },
-                {
-                    "name": "Justin Rainbow",
-                    "email": "justin.rainbow@gmail.com"
-                },
-                {
-                    "name": "Igor Wiedler",
-                    "email": "igor@wiedler.ch"
-                },
-                {
-                    "name": "Robert Schönthal",
-                    "email": "seroscho@googlemail.com"
-                }
-            ],
-            "description": "A library to validate a json schema.",
-            "homepage": "https://github.com/justinrainbow/json-schema",
-            "keywords": [
-                "json",
-                "schema"
-            ],
-            "support": {
-                "issues": "https://github.com/jsonrainbow/json-schema/issues",
-                "source": "https://github.com/jsonrainbow/json-schema/tree/1.3.7"
-            },
-            "time": "2014-08-25T02:48:14+00:00"
-        },
-        {
-            "name": "kingsquare/json-schema-form",
-            "version": "0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kingsquare/json-schema-form.git",
-                "reference": "609049fab463e0b7d6d2a2b315e0f58172333b89"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kingsquare/json-schema-form/zipball/609049fab463e0b7d6d2a2b315e0f58172333b89",
-                "reference": "609049fab463e0b7d6d2a2b315e0f58172333b89",
-                "shasum": ""
-            },
-            "require": {
-                "justinrainbow/json-schema": "1.3.*",
-                "twig/twig": "1.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "JsonSchemaForm": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Kingsquare",
-                    "email": "json-schema-form@kingsquare.nl"
-                }
-            ],
-            "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
-            "support": {
-                "issues": "https://github.com/kingsquare/json-schema-form/issues",
-                "source": "https://github.com/kingsquare/json-schema-form/tree/master"
-            },
-            "abandoned": true,
-            "time": "2014-07-10T12:27:19+00:00"
-        },
        {
            "name": "ludo/jquery-treetable",
            "version": "3.2.0",
@@ -1614,88 +1496,6 @@
            },
            "type": "library"
        },
-        {
-            "name": "phpmailer/phpmailer",
-            "version": "v7.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/1bc1716a507a65e039d4ac9d9adebbbd0d346e15",
-                "reference": "1bc1716a507a65e039d4ac9d9adebbbd0d346e15",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-filter": "*",
-                "ext-hash": "*",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "doctrine/annotations": "^1.2.6 || ^1.13.3",
-                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcompatibility/php-compatibility": "^10.0.0@dev",
-                "squizlabs/php_codesniffer": "^3.13.5",
-                "yoast/phpunit-polyfills": "^1.0.4"
-            },
-            "suggest": {
-                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-                "directorytree/imapengine": "For uploading sent messages via IMAP, see gmail example",
-                "ext-imap": "Needed to support advanced email address parsing according to RFC822",
-                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-                "psr/log": "For optional PSR-3 debug logging",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPMailer\\PHPMailer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-only"
-            ],
-            "authors": [
-                {
-                    "name": "Marcus Bointon",
-                    "email": "phpmailer@synchromedia.co.uk"
-                },
-                {
-                    "name": "Jim Jagielski",
-                    "email": "jimjag@gmail.com"
-                },
-                {
-                    "name": "Andy Prevost",
-                    "email": "codeworxtech@users.sourceforge.net"
-                },
-                {
-                    "name": "Brent R. Matzelle"
-                }
-            ],
-            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "support": {
-                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v7.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Synchro",
-                    "type": "github"
-                }
-            ],
-            "time": "2026-05-18T08:06:14+00:00"
-        },
        {
            "name": "phpseclib/phpseclib",
            "version": "2.0.55",
@@ -1824,85 +1624,6 @@
            },
            "type": "library"
        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.19.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
-                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "url": "https://github.com/symfony/polyfill",
-                    "name": "symfony/polyfill"
-                },
-                "branch-alias": {
-                    "dev-main": "1.19-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T09:01:57+00:00"
-        },
        {
            "name": "tapmodo/jcrop",
            "version": "2.0.4",
@@ -1949,84 +1670,6 @@
            },
            "type": "library"
        },
-        {
-            "name": "twig/twig",
-            "version": "v1.42.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
-                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "require-dev": {
-                "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^4.4|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.42-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                },
-                "psr-4": {
-                    "Twig\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Twig Team",
-                    "role": "Contributors"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "https://twig.symfony.com",
-            "keywords": [
-                "templating"
-            ],
-            "support": {
-                "issues": "https://github.com/twigphp/Twig/issues",
-                "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"
-        },
        {
            "name": "vuejs/vuedatepicker_css",
            "version": "7.2.0",
@@ -4727,6 +4370,85 @@
            ],
            "time": "2020-11-16T17:02:08+00:00"
        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "reference": "aed596913b70fae57be53d86faa2e9ef85a2297b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                },
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
        {
            "name": "symfony/polyfill-mbstring",
            "version": "v1.19.0",
@@ -16,9 +16,9 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 *
 * Authors: Christian Paminger <christian.paminger@technikum-wien.at>,
- *	  Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
- *	  Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
- *	  Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
+ *          Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at>,
+ *          Rudolf Hangl <rudolf.hangl@technikum-wien.at> and
+ *			Gerald Simane-Sequens <gerald.simane-sequens@technikum-wien.at>
 */
 /**
 * Klasse Mail
@@ -28,12 +28,6 @@
 * Replyto und Attachments
 */

-include_once DOC_ROOT . 'vendor/autoload.php';
-
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
 class mail
 {
 	public $to;
@@ -47,8 +41,6 @@ class mail
 	public $attachments;
 	public $errormsg;

-	private $_mail; // PHPMailer instance
-
 	/**
 	 * MAIL - Konstruktor
 	 * $to Empfaenger
@@ -73,30 +65,6 @@ class mail
 	 */
 	public function send()
 	{
-		// PHPMailer configuration
-		try
-		{
-			$this->_mail = new PHPMailer(true);
-			$this->_mail->isSMTP();		 // Send using SMTP
-			$this->_mail->Host = 'localhost';       // Set the SMTP server to send through
-			$this->_mail->Port = 25;		// TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-			$this->_mail->SMTPAuth = false;	 // Enable SMTP authentication
-			$this->_mail->Username = '';	    // SMTP username
-			$this->_mail->Password = '';	    // SMTP password
-			$this->_mail->SMTPSecure = '';	  // Enable implicit TLS encryption
-			$this->_mail->Timeout = 1;	      // set the timeout (seconds)
-			$this->_mail->SMTPKeepAlive = false;    // Persistent SMTP connection
-			$this->_mail->Priority = 3;	     // 1 = High, 3 = Normal, 5 = low. When null, the header is not set at all.
-			$this->_mail->WordWrap = 76;
-			$this->_mail->isHTML(true);	     // html or text
-			$this->_mail->SMTPDebug = 0;	    // Disable debugging      
-			$this->_mail->CharSet = 'UTF-8';
-		}
-		catch(Exception $e)
-		{
-			return false;
-		}
-
 		//wenn MAIL_DEBUG gesetzt ist dann alles an diese Adresse schicken
 		if(MAIL_DEBUG!='')
 		{
@@ -114,38 +82,68 @@ class mail
 			$this->sender = MAIL_FROM;

 		// Header
-		$this->_mail->setFrom($this->sender);
+		$header = '';
+  		$header .= "From: {$this->sender}".$eol;

  		if (!empty($this->CC_recievers))
-			$this->_mail->addCC($this->CC_recievers);
+			$header .= "CC: {$this->CC_recievers}".$eol;
 		if (!empty($this->BCC_recievers))
-			$this->_mail->addBCC($this->BCC_recievers);
+			$header .= "BCC: {$this->BCC_recievers}".$eol;
 		if (!empty($this->replyTo))
+			$header .= "Reply-To: {$this->replyTo}".$eol;
+		if (!empty($this->replyTo))
+			$header .= "Return-Path: {$this->replyTo}".$eol;
+
+		$header .= 'X-Mailer: FHComplete V1'.$eol;
+	  	$header .= 'Mime-Version: 1.0'.$eol;
+		$header .= 'Precedence: bulk'.$eol;
+		$header .= 'Auto-Submitted: auto-generated'.$eol;
+		$header .= "Content-Type: multipart/related; boundary=\"$mime_boundary_mixed\"".$eol;
+		$header .= "Content-Transfer-Encoding: 8bit".$eol;
+
+		// Body
+		$mailbody = "";
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_mixed".$eol;
+		$mailbody .= "Content-Type: multipart/alternative; boundary=\"$mime_boundary_alternative\"".$eol;
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_alternative".$eol;
+		$mailbody .= "Content-Type: text/plain; charset={$this->textContent[1]}".$eol;
+		$mailbody .= "Content-Transfer-Encoding: {$this->textContent[2]}".$eol;
+		$mailbody .= $eol;
+		$mailbody .= $this->textContent[0];
+		$mailbody .= $eol;
+		$mailbody .= $eol;
+
+		if (!empty($this->htmlContent[0]))
 		{
-			$this->_mail->addReplyTo($this->replyTo);
-			$this->_mail->addCustomHeader('Return-Path', $this->replyTo);
+			$mailbody .= "--$mime_boundary_alternative".$eol;
+			$mailbody .= "Content-Type: text/html; charset={$this->htmlContent[1]}".$eol;
+			$mailbody .= "Content-Transfer-Encoding: {$this->htmlContent[2]}".$eol;
+			$mailbody .= $eol;
+			$mailbody .= $this->htmlContent[0];
+			$mailbody .= $eol;
+			$mailbody .= $eol;
 		}
-
-		$this->_mail->addCustomHeader('X-Mailer', 'FHComplete V1');
-		$this->_mail->addCustomHeader('Mime-Version', '1.0');
-		$this->_mail->addCustomHeader('Precedence', 'bulk');
-		$this->_mail->addCustomHeader('Auto-Submitted', 'auto-generated');
-
-		$this->_mail->Body = $this->htmlContent[0];
-		$this->_mail->AltBody = $this->textContent[0];
+		$mailbody .= "--{$mime_boundary_alternative}--".$eol;
+		$mailbody .= $eol;
+		$mailbody .= "--$mime_boundary_mixed";

 		// Attachments Plain
 		if (is_array($this->attachmentsplain) && (count($this->attachmentsplain) > 0))
 		{
 			foreach ($this->attachmentsplain as $attachment)
 			{
-				$this->_mail->addStringAttachment(
-					$attachment[0], // File content
-					$attachment[2], // Name
-					$attachment[3], // Encoding
-					$attachment[1], // Type
-					'attachment'	// Disposition
-				);
+				$dispo = 'attachment';
+				$mailbody .= $eol;
+				$mailbody .= "Content-Disposition: $dispo; filename={$attachment[2]}".$eol;
+				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;
+
+				$mailbody .= 'Content-Transfer-Encoding: '.$attachment[3].$eol;
+				$mailbody .= $eol;
+				$mailbody .= $attachment[0];
+				$mailbody .= $eol;
+				$mailbody .= "--$mime_boundary_mixed";
 			}
 		}

@@ -154,23 +152,31 @@ class mail
 		{
 			foreach ($this->attachments as $attachment)
 			{
-				$this->_mail->addStringEmbeddedImage(
-					$attachment[0], // File content
-					$attachment[3], // Content ID
-					$attachment[2], // Content name
-					PHPMailer::ENCODING_BASE64, // Encoding
-					$attachment[1], // Type
-					empty($attachment[3]) ? 'attachment' : 'inline'	// Disposition
-				);
+				$dispo = empty($attachment[3]) ? 'attachment' : 'inline';
+				$mailbody .= $eol;
+				$mailbody .= "Content-Disposition: $dispo; filename={$attachment[2]}".$eol;
+				$mailbody .= "Content-Type: {$attachment[1]}; name={$attachment[2]}".$eol;
+				if (!empty($attachment[3]))
+				{
+					$mailbody .= "Content-ID: <{$attachment[3]}>".$eol;
+				}
+				$mailbody .= 'Content-Transfer-Encoding: base64'.$eol;
+				$mailbody .= $eol;
+				$mailbody .= $attachment[0];
+				$mailbody .= $eol;
+				$mailbody .= "--$mime_boundary_mixed";
 			}
 		}
+		$mailbody .= "--".$eol;

 		// Subject Encoding setzen
-		$this->_mail->Subject = $this->subject;
-		$this->_mail->addAddress($this->to);
+		$subject = "=?UTF-8?B?".base64_encode($this->subject)."?=";

 		// Senden
-		return $this->_mail->send();
+		if(mail($this->to, $subject, $mailbody, $header))
+			return true;
+		else
+			return false;
 	}

 	/**
@@ -225,7 +225,6 @@ $menu=array
 		'name'=>'Admin', 'opener'=>'true', 'hide'=>'true', 'permissions'=>array('basis/cronjob'), 'image'=>'vilesci_admin.png',
 		'link'=>'left.php?categorie=Admin', 'target'=>'nav',
 		'Cronjobs'=>array('name'=>'Cronjobs', 'link'=>'stammdaten/cronjobverwaltung.php', 'target'=>'main','permissions'=>array('basis/cronjob')),
-		'Vorlagen'=>array('name'=>'Vorlagen', 'link'=>'../index.ci.php/system/Vorlage', 'target'=>'main','permissions'=>array('basis/cronjob')),
 		'Phrasen'=>array('name'=>'Phrasen', 'link'=>'../index.ci.php/system/Phrases', 'target'=>'main','permissions'=>array('basis/cronjob'))
 	)
 );
Author	SHA1	Message	Date
Paolo	e9117740d9	Merge branch 'master' into feature-26336/Composer_Twig_Dependency_Security_Issue	2026-07-09 10:47:01 +02:00
Paolo	62a2b64d1f	Merge branch 'master' into feature-26336/Composer_Twig_Dependency_Security_Issue	2026-06-10 14:24:24 +02:00
Harald Bamberger	c989cfc563	Merge branch 'master' into feature-26336/Composer_Twig_Dependency_Security_Issue	2023-05-15 16:43:04 +02:00
Paolo	e3a63eb491	- Dropped the Vorlage editor from Vilesci - Removed brutusin/json-forms and kingsquare/json-schema-form - Updated composer.lock - Removed not anymore used files and widgets	2022-11-30 17:27:28 +01:00