Merge branch 'master' into feature-69542/Composer_Dependencies_Update

- kingsquare/json-schema-form has been removed
- Removed testing tools from require-dev
- netcarver/textile updated to 4.1.3

application/config/mail.php

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

application/helpers/hlp_sancho_helper.php

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

application/libraries/MailLib.php

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

composer.json

@@ -482,8 +482,6 @@
 		"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",
@@ -493,7 +491,7 @@
 		"mottie/tablesorter": "2.*",
 
 		"nategood/httpful": "0.2.*",
-		"netcarver/textile": "3.7.*",
+		"netcarver/textile": "4.1.*",
 		"nicolaskruchten/pivottable": "2.23.0",
 		"npm-asset/primevue": "3.29.1",
 		"npm-asset/primeicons": "5.0.0",
@@ -519,24 +517,18 @@
 		"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": {
 		"bin-dir": "vendor/bin"
 	},
-
 	"require-dev": {
-		"vuejs/vuejs3_dev": "3.3.8",
-		"squizlabs/php_codesniffer": "3.6.*",
-		"phpmd/phpmd": "2.*",
-		"phpmetrics/phpmetrics": "2.*",
-		"sebastian/phpcpd": "3.*",
-		"phpunit/phpunit": "^6"
+		"vuejs/vuejs3_dev": "3.3.8"
 	},
 	"scripts": {
 		"post-install-cmd": "@symlink_vendor_to_public",
 		"symlink_vendor_to_public": "ln -sfn ../vendor ./public/"
 	}
 }
+

include/mail.class.php

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