[Mapbender-commits] r9936 - in trunk/mapbender/http/classes: . phpmailer-1.72 phpmailer-6.0.2 phpmailer-6.0.2/PHPMailer phpmailer-6.0.2/PHPMailer/.git phpmailer-6.0.2/PHPMailer/.git/hooks phpmailer-6.0.2/PHPMailer/.git/info phpmailer-6.0.2/PHPMailer/.git/logs phpmailer-6.0.2/PHPMailer/.git/logs/refs phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin phpmailer-6.0.2/PHPMailer/.git/objects phpmailer-6.0.2/PHPMailer/.git/objects/pack phpmailer-6.0.2/PHPMailer/.git/refs phpmailer-6.0.2/PHPMailer/.git/refs/heads phpmailer-6.0.2/PHPMailer/.git/refs/remotes phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin phpmailer-6.0.2/docs phpmailer-6.0.2/examples phpmailer-6.0.2/examples/images phpmailer-6.0.2/language phpmailer-6.0.2/src phpmailer-6.0.2/test

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Thu Aug 9 05:30:02 PDT 2018


Author: armin11
Date: 2018-08-09 05:30:02 -0700 (Thu, 09 Aug 2018)
New Revision: 9936

Added:
   trunk/mapbender/http/classes/phpmailer-6.0.2/
   trunk/mapbender/http/classes/phpmailer-6.0.2/.gitattributes
   trunk/mapbender/http/classes/phpmailer-6.0.2/.gitignore
   trunk/mapbender/http/classes/phpmailer-6.0.2/.php_cs
   trunk/mapbender/http/classes/phpmailer-6.0.2/.scrutinizer.yml
   trunk/mapbender/http/classes/phpmailer-6.0.2/.travis.yml
   trunk/mapbender/http/classes/phpmailer-6.0.2/LICENSE
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/HEAD
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/config
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/description
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/applypatch-msg.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/commit-msg.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/post-update.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-applypatch.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-commit.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-push.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-rebase.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-receive.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/prepare-commit-msg.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/update.sample
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/info/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/info/exclude
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/HEAD
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads/master
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin/HEAD
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/info/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/packed-refs
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/heads/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/heads/master
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin/
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin/HEAD
   trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/tags/
   trunk/mapbender/http/classes/phpmailer-6.0.2/README.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/SECURITY.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/UPGRADING.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/VERSION
   trunk/mapbender/http/classes/phpmailer-6.0.2/changelog.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/composer.json
   trunk/mapbender/http/classes/phpmailer-6.0.2/docs/
   trunk/mapbender/http/classes/phpmailer-6.0.2/docs/README.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_gen_keys.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_sign.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/README.md
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/callback.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contactform.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contents.html
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contentsutf8.html
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/exceptions.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/extending.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail_xoauth.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mail.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mailing_list.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/pop_before_smtp.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_file_upload.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_multiple_file_upload.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/sendmail.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/simple_contact_form.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smime_signed_mail.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_check.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_low_memory.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_no_auth.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/examples/ssl_options.phps
   trunk/mapbender/http/classes/phpmailer-6.0.2/get_oauth_token.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-am.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ar.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-az.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ba.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-be.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-bg.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ca.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ch.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-cs.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-da.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-de.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-el.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-eo.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-es.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-et.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fa.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fi.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fo.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fr.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-gl.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-he.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hr.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hu.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-id.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-it.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ja.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ka.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ko.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lt.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lv.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ms.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nb.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nl.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pl.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt_br.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ro.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-rs.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ru.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sk.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sl.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sv.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-tr.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-uk.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-vi.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh_cn.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/phpdoc.dist.xml
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/Exception.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/OAuth.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/POP3.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/src/SMTP.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/DebugLogTestListener.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerLangTest.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerTest.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/bootstrap.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakepopserver.sh
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakesendmail.sh
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/runfakepopserver.sh
   trunk/mapbender/http/classes/phpmailer-6.0.2/test/testbootstrap-dist.php
   trunk/mapbender/http/classes/phpmailer-6.0.2/travis.phpunit.xml.dist
Modified:
   trunk/mapbender/http/classes/class.ezpdf.php
   trunk/mapbender/http/classes/class.pdf.php
   trunk/mapbender/http/classes/class_SaveLegend.php
   trunk/mapbender/http/classes/class_administration.php
   trunk/mapbender/http/classes/class_checkInput.php
   trunk/mapbender/http/classes/class_ckanApi.php
   trunk/mapbender/http/classes/class_csw.php
   trunk/mapbender/http/classes/class_cswrecord.php
   trunk/mapbender/http/classes/class_gml2.php
   trunk/mapbender/http/classes/class_iso19139.php
   trunk/mapbender/http/classes/class_kml.php
   trunk/mapbender/http/classes/class_locale.php
   trunk/mapbender/http/classes/class_log.php
   trunk/mapbender/http/classes/class_mb_log.php
   trunk/mapbender/http/classes/class_stripRequest.php
   trunk/mapbender/http/classes/class_user.php
   trunk/mapbender/http/classes/class_weldLegend2PNG.php
   trunk/mapbender/http/classes/class_weldMaps2Image.php
   trunk/mapbender/http/classes/class_weldMaps2JPEG.php
   trunk/mapbender/http/classes/class_weldMaps2PNG.php
   trunk/mapbender/http/classes/class_weldMaps2PNG_rotate.php
   trunk/mapbender/http/classes/class_weldOverview2PNG.php
   trunk/mapbender/http/classes/class_weldOverview2PNG_rotate.php
   trunk/mapbender/http/classes/class_wfs_conf.php
   trunk/mapbender/http/classes/class_wfs_deprecated.php
   trunk/mapbender/http/classes/class_wms.php
   trunk/mapbender/http/classes/phpmailer-1.72/class.smtp.php
Log:
First fixes for php7 compatibility thanx to http://www.benndorf.de

Modified: trunk/mapbender/http/classes/class.ezpdf.php
===================================================================
--- trunk/mapbender/http/classes/class.ezpdf.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class.ezpdf.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -25,7 +25,7 @@
 
 // ------------------------------------------------------------------------------
 
-function Cezpdf($paper='a4',$orientation='portrait'){
+function __construct($paper='a4',$orientation='portrait'){
 	// Assuming that people don't want to specify the paper size using the absolute coordinates
 	// allow a couple of options:
 	// orientation can be 'portrait' or 'landscape'
@@ -128,6 +128,10 @@
 	$this->ezPageCount=1;
 }
 
+function Cezpdf($paper='a4',$orientation='portrait'){
+	self::__construct($paper,$orientation);
+}
+
 // ------------------------------------------------------------------------------
 // 2002-07-24: Nicola Asuni (info at tecnick.com)
 // Set Margins in centimeters

Modified: trunk/mapbender/http/classes/class.pdf.php
===================================================================
--- trunk/mapbender/http/classes/class.pdf.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class.pdf.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -194,7 +194,7 @@
 * this will start a new document
 * @var array array of 4 numbers, defining the bottom left and upper right corner of the page. first two are normally zero.
 */
-function Cpdf ($pageSize=array(0,0,612,792)){
+function __construct($pageSize=array(0,0,612,792)){
   $this->newDocument($pageSize);
   
   // also initialize the font families that are known about already
@@ -204,6 +204,13 @@
 }
 
 /**
+        * Old constructor to keep PHP downward compatibility
+        */
+function Cpdf ($pageSize=array(0,0,612,792)){
+  self::__construct($pageSize);
+}
+
+/**
 * Document object methods (internal use only)
 *
 * There is about one object method for each type of object in the pdf document
@@ -1231,7 +1238,7 @@
   $this->checkAllHere();
 
   $xref=array();
-  $content="%PDF-1.3\n%âãÏÓ\n";
+  $content="%PDF-1.3\n%����\n";
 //  $content="%PDF-1.3\n";
   $pos=strlen($content);
   foreach($this->objects as $k=>$v){
@@ -1518,10 +1525,14 @@
         // note that pdf supports only binary format type 1 font files, though there is a 
         // simple utility to convert them from pfa to pfb.
         $fp = fopen($fbfile,'rb');
-        $tmp = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $tmp = get_magic_quotes_runtime();
+            set_magic_quotes_runtime(0);
+        }
         $data = fread($fp,filesize($fbfile));
-        set_magic_quotes_runtime($tmp);
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            set_magic_quotes_runtime($tmp);
+        }
         fclose($fp);
 
         // create the font descriptor
@@ -2645,8 +2656,10 @@
 function addPngFromFile($file,$x,$y,$w=0,$h=0){
   // read in a png file, interpret it, then add to the system
   $error=0;
-  $tmp = get_magic_quotes_runtime();
-  set_magic_quotes_runtime(0);
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    $tmp = get_magic_quotes_runtime();
+    set_magic_quotes_runtime(0);
+  }
   $fp = @fopen($file,'rb');
   if ($fp){
     $data='';
@@ -2658,7 +2671,9 @@
     $error = 1;
     $errormsg = 'trouble opening file: '.$file;
   }
-  set_magic_quotes_runtime($tmp);
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    set_magic_quotes_runtime($tmp);
+  }  
   
   if (!$error){
     $header = chr(137).chr(80).chr(78).chr(71).chr(13).chr(10).chr(26).chr(10);
@@ -2859,12 +2874,17 @@
   }
 
   $fp=fopen($img,'rb');
-
-  $tmp = get_magic_quotes_runtime();
-  set_magic_quotes_runtime(0);
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    $tmp = get_magic_quotes_runtime();
+    set_magic_quotes_runtime(0);
+  }
+  
   $data = fread($fp,filesize($img));
-  set_magic_quotes_runtime($tmp);
   
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    set_magic_quotes_runtime($tmp);
+  }
+  
   fclose($fp);
 
   $this->addJpegImage_common($data,$x,$y,$w,$h,$imageWidth,$imageHeight,$channels);
@@ -2911,8 +2931,11 @@
   imagejpeg($img,$tmpName,$quality);
   $fp=fopen($tmpName,'rb');
 
-  $tmp = get_magic_quotes_runtime();
-  set_magic_quotes_runtime(0);
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    $tmp = get_magic_quotes_runtime();
+    set_magic_quotes_runtime(0);
+  }
+  
   $fp = @fopen($tmpName,'rb');
   if ($fp){
     $data='';
@@ -2925,7 +2948,10 @@
     $errormsg = 'trouble opening file';
   }
 //  $data = fread($fp,filesize($tmpName));
-  set_magic_quotes_runtime($tmp);
+  if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+    set_magic_quotes_runtime($tmp);
+  }
+  
 //  fclose($fp);
   unlink($tmpName);
   $this->addJpegImage_common($data,$x,$y,$w,$h,$imageWidth,$imageHeight);

Modified: trunk/mapbender/http/classes/class_SaveLegend.php
===================================================================
--- trunk/mapbender/http/classes/class_SaveLegend.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_SaveLegend.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -29,7 +29,7 @@
 
 class SaveLegend{
 
-	function SaveLegend($url,$legend_filename){
+	function __construct($url,$legend_filename){
 		if(!$url || $url == ""){
 			$e = new mb_exception("SaveLegend: no legendurl delivered");
 		}
@@ -60,6 +60,14 @@
 		imagepng($image,$legend_filename);
 		imagedestroy($img);
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function SaveLegend($url,$legend_filename){
+		self::__construct($url,$legend_filename);
+	}
+        
 	function loadpng ($imgurl) {
 		$x = new connector($imgurl);
 		try {

Modified: trunk/mapbender/http/classes/class_administration.php
===================================================================
--- trunk/mapbender/http/classes/class_administration.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_administration.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -20,7 +20,9 @@
 require_once(dirname(__FILE__)."/class_user.php");
 require_once(dirname(__FILE__)."/class_cache.php");
 require_once dirname(__FILE__) . "/../../tools/wms_extent/extent_service.conf";
-require(dirname(__FILE__) . "/phpmailer-1.72/class.phpmailer.php");
+# changed to Version 6.0.2 due to dprecated/removed functionality
+# require(dirname(__FILE__) . "/phpmailer-1.72/class.phpmailer.php");
+require(dirname(__FILE__) . "/phpmailer-6.0.2/src/PHPMailer.php");
 
 /**
  * class to wrap administration methods
@@ -2259,9 +2261,6 @@
 		case "wfs":
 			$sql = "SELECT wfs_id as id, fkey_mb_group_id, wfs_owner as owner FROM wfs WHERE wfs_id = $1";
 			break;
-		case "wmc":
-			$sql = "SELECT wmc_serial_id as id, null as fkey_mb_group_id, fkey_user_id as owner FROM mb_user_wmc WHERE wmc_serial_id = $1";
-			break;
 	}
 	//get resource owner information
 	$v = array($resourceId);

Modified: trunk/mapbender/http/classes/class_checkInput.php
===================================================================
--- trunk/mapbender/http/classes/class_checkInput.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_checkInput.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -21,7 +21,8 @@
 
 class checkInput{
 	var $v;
-	function checkInput($q,$v,$t){
+        
+	function __construct($q,$v,$t){
 		if(is_array($v) == false){
 			$v = array($v);
 		}
@@ -51,6 +52,13 @@
 			}
 			$this->v = $v;
 		}		
-	}	
+	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function checkInput($q,$v,$t){
+ 		self::__construct($q,$v,$t);
+        }
 }
 ?>

Modified: trunk/mapbender/http/classes/class_ckanApi.php
===================================================================
--- trunk/mapbender/http/classes/class_ckanApi.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_ckanApi.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -1097,10 +1097,10 @@
 		$e = new mb_exception("response: ".$response);
 		$e = new mb_exception("content_type: ".$info['content_type']);*/
 
-		$this->logit("url: ".$curlUrl);
+		/*$this->logit("url: ".$curlUrl);
 		$this->logit("send data: ".$data);
 		$this->logit("response: ".$response);
-		$this->logit("content_type: ".$info['content_type']);
+		$this->logit("content_type: ".$info['content_type']);*/
 		// Determine how to parse
 		if (isset($info['content_type']) && $info['content_type']) {
 			$content_type = str_replace('application/', '', 

Modified: trunk/mapbender/http/classes/class_csw.php
===================================================================
--- trunk/mapbender/http/classes/class_csw.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_csw.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -71,9 +71,16 @@
 	//store catalog retrieval status
 	var $cat_status;
 	
-	function csw(){
+	function __construct(){
 		
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function csw(){
+		self::__construct();
+	}
 	
 	//Getters of common items
 	function getCatVersion(){

Modified: trunk/mapbender/http/classes/class_cswrecord.php
===================================================================
--- trunk/mapbender/http/classes/class_cswrecord.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_cswrecord.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -42,9 +42,16 @@
 	var $SummaryRecordsArray = array();
 	
 	//Constructor
-	function cswrecord(){
+	function __construct(){
 		
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function cswrecord(){
+		self::__construct();
+	}
 	
 	// Public Methods
 	
@@ -232,9 +239,17 @@
 	var $format;
 	
 	//Constructor
-	function cswSummaryRecord(){
+	function __construct(){
 		
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function cswSummaryRecord(){
+		self::__construct();
+	}
+
 	
 	//Getters
 	

Modified: trunk/mapbender/http/classes/class_gml2.php
===================================================================
--- trunk/mapbender/http/classes/class_gml2.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_gml2.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -38,9 +38,17 @@
 	var $geomFeaturetypeElement = null;
 	
 	
-	function gml2(){
+	function __construct(){
 		$this->geometries = array($this->geomtype_point, $this->geomtype_polygon, $this->geomtype_line, $this->geomtype_multipolygon, $this->geomtype_multiline);
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function gml2(){
+		self::__construct();
+	}
+        
 	function getGml($req){
 		$x = new connector($req);
 		return $x->file;

Modified: trunk/mapbender/http/classes/class_iso19139.php
===================================================================
--- trunk/mapbender/http/classes/class_iso19139.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_iso19139.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -313,7 +313,7 @@
 					$this->datasetIdCodeSpace = rtrim($code[0], $this->datasetId);	
 				} else {
 					if (($parsedUrl['scheme'] == 'http' || $parsedUrl['scheme'] == 'https') && strpos($code[0],'#') !== false) {
-						$e = new mb_exception($code[0]);
+						//$e = new mb_exception($code[0]);
 						$explodedUrl = explode('#', $code[0]);
 						$this->datasetId = $explodedUrl[1];
 						$this->datasetIdCodeSpace = $explodedUrl[0];

Modified: trunk/mapbender/http/classes/class_kml.php
===================================================================
--- trunk/mapbender/http/classes/class_kml.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_kml.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -32,7 +32,7 @@
 		var $y;
 		var $kml;
 					
-	function kml($title, $description, $x, $y, $icon) {
+	function __construct($title, $description, $x, $y, $icon) {
   		$this->kml_id = md5(microtime());
   		$this->x = $x;
   		$this->y = $y;
@@ -40,7 +40,15 @@
   		$this->title = $title;
   		$this->description = $description;
 	} 
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function kml($title, $description, $x, $y, $icon) {
+  		self::__construct($title, $description, $x, $y, $icon);
+	} 
 
+
 	function setLookAt($range, $heading) {
 		$this->lookAt_range = $range;
 		$this->lookAt_heading = $heading;

Modified: trunk/mapbender/http/classes/class_locale.php
===================================================================
--- trunk/mapbender/http/classes/class_locale.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_locale.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -35,7 +35,7 @@
 	var $defaultLanguage = "en";
 	var $status = "No locale set.";
 
-	function Mb_locale($languageId) {
+	function __construct($languageId) {
 		if (!$languageId) {
 			$languageId = LANGUAGE;
 		}
@@ -49,6 +49,13 @@
 			$this->setCurrentLocale($this->defaultLanguage);
 		}
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function Mb_locale($languageId) {
+		self::__construct($languageId);
+	}
 
     /**
 	 * Get the current locale, evaluating GET/POST variables, browser languages

Modified: trunk/mapbender/http/classes/class_log.php
===================================================================
--- trunk/mapbender/http/classes/class_log.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_log.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -17,7 +17,7 @@
 	 */
 	var $logtype = 'db';
 	
-	function log($module,$req,$time_client,$type = ""){
+	function __construct($module,$req,$time_client,$type = ""){
 
 		$this->url = $req;
 		if($type == "")
@@ -70,5 +70,13 @@
 			}
 		}
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function log($module,$req,$time_client,$type = ""){
+
+		self::__construct($module,$req,$time_client,$type);
+	}
 }
 ?>

Modified: trunk/mapbender/http/classes/class_mb_log.php
===================================================================
--- trunk/mapbender/http/classes/class_mb_log.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_mb_log.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -35,11 +35,25 @@
 	 * @param	string $level	the log level of the message.
 	 * @return	bool			true if the logging succeded; else false.
 	 */
-	protected function mb_log ($n, $level) {
+	protected function __construct ($n, $level) {
 		if (!isset($this->mb_log_level)) {
 			$n = "class_mb_exception: please set LOG_LEVEL in mapbender.conf" . $n;
 		}
 		if ($this->isValidLevel($level)) {
+                    
+                        $callerinfo = "";
+                        $caller = $this->GetCallingMethodName();
+                        if ($caller){
+                            if ($caller["file"]){
+                                $file = $caller["file"];
+                            }
+                            if ($caller["line"]){
+                                $line = $caller["line"];
+                            }
+                            $callerinfo = ($file) ? " $file" : "";
+                            $callerinfo = ($file && $line) ? " $file: $line - " : " $file - ";
+                        }
+
 			if (defined("LOG_PHP_WITH_FIREPHP") && LOG_PHP_WITH_FIREPHP === "on") {
 				$firephp = FirePHP::getInstance(true);
 				switch ($level) {
@@ -57,7 +71,7 @@
 			if (is_dir($this->dir)) {
 				$logfile = $this->dir . $this->filename_prefix . date("Y_m_d") . ".log";
 				if ($h = fopen($logfile,"a")) {
-					$content = date("Y.m.d, H:i:s") . "," . $n .chr(13).chr(10);
+					$content = date("Y.m.d, H:i:s") . "," . $callerinfo . $n .chr(13).chr(10);
 					if(!fwrite($h,$content)){
 						$this->result = false;
 						$this->message = "Unable to write " . $logfile;
@@ -86,7 +100,26 @@
 			return false; 
 		}
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        protected function mb_log ($n, $level) {
+		self::__construct($n, $level);
+	}
+        
+        protected function GetCallingMethodName(){
+            $last_call = [];
+//            $last_call["file"] = "abc";
+//            $last_call["line"] = "10";
+            $e = new Exception();
+            $trace = $e->getTrace();
+            $last_call = $trace[count($trace) - 1];
+            return $last_call;
+        }
 
+
+
 	/**
 	 * Retrieves the index of the level in the array of available levels.
 	 * By this, we can find out if the message is eligable for logging.

Modified: trunk/mapbender/http/classes/class_stripRequest.php
===================================================================
--- trunk/mapbender/http/classes/class_stripRequest.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_stripRequest.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -23,7 +23,8 @@
 class stripRequest{
 	var $url;
 	var $encodeParams = array("LAYERS", "QUERY_LAYERS");
-	function stripRequest($mr){
+        
+	function __construct($mr){
 		if(!$mr || $mr == ""){
 			$t = new mb_exception("stripRequest: maprequest lacks ");
 			die;
@@ -30,6 +31,14 @@
 		}
 		$this->url = $mr;
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function stripRequest(){
+		self::__construct($mr);
+	}
+
 	
 	function set($key,$value){
 		$exists = false;

Modified: trunk/mapbender/http/classes/class_user.php
===================================================================
--- trunk/mapbender/http/classes/class_user.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_user.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -670,7 +670,7 @@
 		$row = db_fetch_all($res);
 		if (count($row) == 1 && $row[0]['featuretype_id'] == null) {
 			//
-			new mb_notice("http_auth/index.php: Some featuretype is null - no anonymous access possible!");
+			new mb_exception("http_auth/index.php: Some featuretype is null - no anonymous access possible!");
 			return false;
 		}
 		//$e = new mb_exception("featuretype_id[0]: '".$row[0]['featuretype_id']."' - ".count($row));

Modified: trunk/mapbender/http/classes/class_weldLegend2PNG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldLegend2PNG.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldLegend2PNG.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -41,7 +41,7 @@
      *
      * @param <string> the maprequests seperated by three underscores
      */
-	function weldMaps2PNG($urls, $filename){
+	function __construct($urls, $filename){
 		if(!$urls || $urls == ""){
 			$e = new mb_exception("weldMaps2PNG: no maprequests delivered");
 		}
@@ -80,6 +80,13 @@
 		imagepng($image,$filename);
 		imagedestroy($image);
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function weldMaps2PNG($urls, $filename){
+		self::__construct($urls, $filename);
+	}
 
 	/**
 	 * Helper function to generate temporary images for each URL
@@ -111,6 +118,7 @@
 		// return the temporary image
 		return $im;
 	}
+        
 } // eof class weldMaps2PNG
 
 ?>
\ No newline at end of file

Modified: trunk/mapbender/http/classes/class_weldMaps2Image.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2Image.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldMaps2Image.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -32,10 +32,17 @@
 	var $urls = array();
 	var $filename; 	
  	
- 	function weldMaps2Image($urls, $array_file){
+ 	function __construct($urls, $array_file){
  		$this->urls = $urls;
   		$this->array_file = $array_file;
  	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function weldMaps2Image($urls, $array_file){
+ 		self::__construct($urls, $array_file);
+        }
  	
  	
 	function getImage($imageTyp_imp, $outputKind=''){

Modified: trunk/mapbender/http/classes/class_weldMaps2JPEG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2JPEG.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldMaps2JPEG.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -29,7 +29,7 @@
 
 class weldMaps2JPEG{
 
-	function weldMaps2JPEG($urls,$filename, $encode = true){
+	function __construct($urls,$filename, $encode = true){
 		if(!$urls || $urls == ""){
 			$e = new mb_exception("weldMaps2JPEG: no maprequests delivered");
 		}
@@ -103,6 +103,13 @@
 		imagedestroy($image); 
 
 	}
+        
+        /**
+	 * Old constructor to keep PHP downward compatibility
+	 */
+        function weldMaps2JPEG($urls,$filename, $encode = true){
+		self::__construct($urls,$filename, $encode);
+	}
 	
 	function loadpng ($imgurl) {
 		$obj = new stripRequest($imgurl);

Modified: trunk/mapbender/http/classes/class_weldMaps2PNG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2PNG.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldMaps2PNG.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -29,7 +29,7 @@
 
 class weldMaps2PNG{
 
-	function weldMaps2PNG($urls,$filename, $encode = true, $opacities=""){
+	function __construct($urls,$filename, $encode = true, $opacities=""){
 		if(!$urls || $urls == ""){
 			$e = new mb_exception("weldMaps2PNG: no maprequests delivered");
 		}
@@ -74,6 +74,13 @@
 		imagedestroy($image); 
 
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function weldMaps2PNG($urls,$filename, $encode = true, $opacities=""){
+		self::__construct($urls,$filename, $encode, $opacities);
+	}
 	
 	function loadpng ($imgurl) {
 		$obj = new stripRequest($imgurl);

Modified: trunk/mapbender/http/classes/class_weldMaps2PNG_rotate.php
===================================================================
--- trunk/mapbender/http/classes/class_weldMaps2PNG_rotate.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldMaps2PNG_rotate.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -30,7 +30,7 @@
 
 class weldMaps2PNG_rotate extends weldMaps2PNG{
 
-    function weldMaps2PNG_rotate($urls,$filename, $angle, $encode = true, $opacities = ""){
+    function __construct($urls,$filename, $angle, $encode = true, $opacities = ""){
         if(!$urls || $urls == ""){
             $e = new mb_exception("weldMaps2PNG_rotate: no maprequests delivered");
         }
@@ -77,16 +77,23 @@
         $image = imagecreatefrompng($filename);
         imagepng($image,$filename);
     }
+    
+        /**
+	 * Old constructor to keep PHP downward compatibility
+	 */
+        function weldMaps2PNG_rotate($urls,$filename, $angle, $encode = true, $opacities = ""){
+            self::__construct($urls,$filename, $angle, $encode, $opacities);
+        }
 
-    function enlargeExtent($coordArray, $oldWidth, $oldHeight, $newWidth, $newHeight){
-         $extentx = ($coordArray[2] - $coordArray[0]);
-         $extenty = ($coordArray[3] - $coordArray[1]);
-         $coordArray[0]+=($extentx/$oldWidth)*($oldWidth-$newWidth)/2;
-         $coordArray[2]+=($extentx/$oldWidth)*($newWidth-$oldWidth)/2;
-         $coordArray[1]+=($extenty/$oldHeight)*($oldHeight-$newHeight)/2;
-         $coordArray[3]+=($extenty/$oldHeight)*($newHeight-$oldHeight)/2;
-        return $coordArray;
-    }
+        function enlargeExtent($coordArray, $oldWidth, $oldHeight, $newWidth, $newHeight){
+             $extentx = ($coordArray[2] - $coordArray[0]);
+             $extenty = ($coordArray[3] - $coordArray[1]);
+             $coordArray[0]+=($extentx/$oldWidth)*($oldWidth-$newWidth)/2;
+             $coordArray[2]+=($extentx/$oldWidth)*($newWidth-$oldWidth)/2;
+             $coordArray[1]+=($extenty/$oldHeight)*($oldHeight-$newHeight)/2;
+             $coordArray[3]+=($extenty/$oldHeight)*($newHeight-$oldHeight)/2;
+            return $coordArray;
+        }
 
 }
 

Modified: trunk/mapbender/http/classes/class_weldOverview2PNG.php
===================================================================
--- trunk/mapbender/http/classes/class_weldOverview2PNG.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldOverview2PNG.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -29,7 +29,7 @@
 
 class weldOverview2PNG{
 
-	function weldOverview2PNG($url_overview,$url_extent,$filename){
+	function __construct($url_overview,$url_extent,$filename){
 
 		if(!$url_overview || $url_overview == ""){
 			$e = new mb_exception("weldOverview2PNG: no maprequests delivered");
@@ -104,6 +104,13 @@
 		imagedestroy($image); 
 		
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function weldOverview2PNG($url_overview,$url_extent,$filename){
+                self::__construct($url_overview,$url_extent,$filename);
+	}
 	
 	
 	function loadpng ($imgurl) {

Modified: trunk/mapbender/http/classes/class_weldOverview2PNG_rotate.php
===================================================================
--- trunk/mapbender/http/classes/class_weldOverview2PNG_rotate.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_weldOverview2PNG_rotate.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -29,7 +29,7 @@
 
 class weldOverview2PNG_rotate{
 
-	function weldOverview2PNG_rotate($url_overview,$url_extent,$filename, $rotatedExtent){
+	function __construct($url_overview,$url_extent,$filename, $rotatedExtent){
 
 		if(!$url_overview || $url_overview == ""){
 			$e = new mb_exception("weldOverview2PNG: no maprequests delivered");
@@ -99,6 +99,13 @@
 		imagedestroy($image); 
 		
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function weldOverview2PNG_rotate($url_overview,$url_extent,$filename, $rotatedExtent){
+                self::__construct($url_overview,$url_extent,$filename, $rotatedExtent);
+	}
 	
 	
 	function loadpng ($imgurl) {

Modified: trunk/mapbender/http/classes/class_wfs_conf.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_conf.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_wfs_conf.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -364,7 +364,7 @@
 	var $featuretype_title;
 	var $featuretype_srs;
 	
-	function features($id){		
+	function __construct($id){		
 		
 		$featuretype_id = array();
 		$featuretype_name = array();
@@ -386,7 +386,14 @@
 			$this->featuretype_srs[$cnt] = $row["featuretype_srs"];
 			$cnt++;
 		}	
-	}	
+	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function features($id){		
+		self::__construct($id);	
+	}
 }
 class elements extends wfs_conf{
 	
@@ -394,7 +401,7 @@
 	var $element_name;
 	var $element_type;
 	
-	function elements($fid){
+        function __construct($fid){
 		
 		$element_id = array();
 		$element_name = array();
@@ -415,13 +422,21 @@
 			$cnt++;
 		}
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+	function elements($fid){
+		self::__construct($fid);
+	}
 }
+
 class namespaces extends wfs_conf{
 	
 	var $namespace_name;
 	var $namespace_location;
 	
-	function namespaces($fid){
+	function __construct($fid){
 		
 		$namespace_name = array();
 		$namespace_location = array();
@@ -440,5 +455,12 @@
 			$cnt++;
 		}
 	}
+        
+        /**
+        * Old constructor to keep PHP downward compatibility
+        */
+        function namespaces($fid){
+		self::__construct($fid);
+	}
 }
 ?>

Modified: trunk/mapbender/http/classes/class_wfs_deprecated.php
===================================================================
--- trunk/mapbender/http/classes/class_wfs_deprecated.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_wfs_deprecated.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -22,7 +22,7 @@
 */
 
 require_once(dirname(__FILE__)."/../../core/globalSettings.php");
-require_once(dirname(__FILE__)."/class_connector.php");
+require_once(dirname(__FILE__)."/class_connector.php");
 require_once(dirname(__FILE__)."/class_administration.php");
 require_once(dirname(__FILE__)."/class_ows.php");
 
@@ -52,9 +52,17 @@
   var $wfs_featuretype = array();
  
  
+function __construct() {
+
+} 
+
+/**
+ * Old constructor to keep PHP downward compatibility
+ */
 function wfs() {
+    self::__construct();
+} 
 
-} 
 /*
 function createObjFromXML($url){
 	
@@ -69,7 +77,7 @@
 	$values = null;
 	$tags = null;
 	$admin = new administration();
-	$this->wfs_getcapabilities_doc = $admin->char_encode($data);
+	$this->wfs_getcapabilities_doc = $admin->char_encode($data);
 	$this->wfs_upload_url = $url;
 	
 	# for temporary wfs a id has to be created...
@@ -80,7 +88,7 @@
 	xml_parser_set_option($parser,XML_OPTION_TARGET_ENCODING,CHARSET);
 	xml_parse_into_struct($parser,$this->wfs_getcapabilities_doc,$values,$tags);
 	//xml_parse_into_struct($parser,$data,$values,$tags);
-	
+	
 	xml_parser_free($parser);
 	
 	$section = false;
@@ -165,8 +173,10 @@
 			$featuretype_title = $this->stripEndlineAndCarriageReturn($element['value']);
 		}
 		if($section == "featuretype" && strtoupper($element['tag']) == "ABSTRACT"){
-			$featuretype_abstract = $this->$element['value'];
-		}
+//			$featuretype_abstract = $this->$element['value'];
+//                        for compatibility reasons (PHP 5 -> 7) changed to (only if someone wants to
+//                        decomment this line again)
+                        $featuretype_abstract = $this->{$element['value']};		}
 		if($section == "featuretype" && strtoupper($element['tag']) == "SRS"){
 			$featuretype_srs = $element['value'];
 			$this->addFeaturetype($featuretype_name,$featuretype_title,$featuretype_abstract,$featuretype_srs,$this->wfs_describefeaturetype,$this->wfs_version);
@@ -206,7 +216,7 @@
 	$this->wfs_featuretype[count($this->wfs_featuretype)] = new featuretype($name,$title,$abstract,$srs,$url,$version);
 }
 */
-/*
+/*
  function stripEndlineAndCarriageReturn($string) {
 	  	return preg_replace("/\n/", "", preg_replace("/\r/", " ", $string));
 	  }
@@ -627,7 +637,9 @@
 			$featuretype_title = $this->stripEndlineAndCarriageReturn($element['value']);
 		}
 		if($section == "featuretype" && strtoupper($element['tag']) == "ABSTRACT"){
-			$featuretype_abstract = $this->$element['value'];
+//			$featuretype_abstract = $this->$element['value'];
+//                        for compatibility reasons (PHP 5 -> 7) changed to
+                        $featuretype_abstract = $this->{$element['value']};
 		}
 		if($section == "featuretype" && strtoupper($element['tag']) == "SRS"){
 			$featuretype_srs = $element['value'];

Modified: trunk/mapbender/http/classes/class_wms.php
===================================================================
--- trunk/mapbender/http/classes/class_wms.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/class_wms.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -2452,7 +2452,9 @@
 					if(in_array(strtoupper($srs),$confSrsArray)) {
 						array_push($supportedSrsArray, strtoupper($srs));
 						
-						$n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".$$layerParentArray[$j]['layer_id']);
+//						//$n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".$$layerParentArray[$j]['layer_id']);
+                                                //for compatibility reasons (PHP 5 -> 7) changed to
+                                                $n = new mb_notice("Requested SRS: ".$srs." is supported by layer: ".$layerName." with layer_id: ".${$layerParentArray[$j]['layer_id']});
 					}	
 				}
 			}

Modified: trunk/mapbender/http/classes/phpmailer-1.72/class.smtp.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-1.72/class.smtp.php	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-1.72/class.smtp.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -54,7 +54,7 @@
      * @access public
      * @return void
      */
-    function SMTP() {
+    function __construct() {
         $this->smtp_conn = 0;
         $this->error = null;
         $this->helo_rply = null;
@@ -61,7 +61,15 @@
 
         $this->do_debug = 0;
     }
+    
+    /**
+    * Old constructor to keep PHP downward compatibility
+    */
+    function SMTP() {
+        self::__construct();
+    }
 
+
     /*************************************************************
      *                    CONNECTION FUNCTIONS                  *
      ***********************************************************/

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/.gitattributes
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/.gitattributes	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/.gitattributes	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,17 @@
+* text=auto
+
+/.gitattributes export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/.phan export-ignore
+/.php_cs export-ignore
+/.scrutinizer.yml export-ignore
+/.travis.yml export-ignore
+/changelog.md export-ignore
+/composer.json export-ignore
+/docs export-ignore
+/examples export-ignore
+/phpdoc.dist.xml export-ignore
+/test export-ignore
+/travis.phpunit.xml.dist export-ignore
+/UPGRADING.md export-ignore

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/.gitignore
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/.gitignore	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/.gitignore	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,9 @@
+docs/*
+!docs/README.md
+test/message.txt
+test/testbootstrap.php
+build/
+vendor/
+*.pem
+composer.lock
+.php_cs.cache

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/.php_cs
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/.php_cs	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/.php_cs	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,31 @@
+<?php
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'binary_operator_spaces' => false,
+        'concat_space' => ['spacing' => 'one'],
+        'heredoc_to_nowdoc' => true,
+        'method_argument_space' => true,
+        'no_extra_consecutive_blank_lines' => ['break', 'continue', 'extra', 'return', 'throw', 'use', 'parenthesis_brace_block', 'square_brace_block', 'curly_brace_block'],
+        'no_php4_constructor' => true,
+        'no_short_echo_tag' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => true,
+        'php_unit_fqcn_annotation' => false,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_order' => true,
+        'phpdoc_summary' => false,
+        'semicolon_after_instruction' => true,
+        'simplified_null_return' => true
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__ . '/src')
+            ->in(__DIR__ . '/test')
+    )
+;

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/.scrutinizer.yml
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/.scrutinizer.yml	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/.scrutinizer.yml	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,128 @@
+build:
+    environment:
+        php: '5.6.0'
+
+before_commands:
+    - "composer install --prefer-source"
+
+tools:
+    external_code_coverage:
+        enabled: true
+        timeout: 300
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    php_code_coverage:
+        enabled:              false
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    php_code_sniffer:
+        enabled:              true
+        config:
+            standard:         PSR2
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    # Copy/Paste Detector
+    php_cpd:
+        enabled:              true
+        excluded_dirs:
+            - docs
+            - examples
+            - extras
+            - test
+            - vendor
+
+    # PHP CS Fixer (http://http://cs.sensiolabs.org/).
+    php_cs_fixer:
+        enabled:              true
+        config:
+            level:            psr2
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    # Analyzes the size and structure of a PHP project.
+    php_loc:
+        enabled:              true
+        excluded_dirs:
+            - docs
+            - examples
+            - extras
+            - test
+            - vendor
+
+    # PHP Mess Detector (http://phpmd.org).
+    php_mess_detector:
+        enabled:              true
+        config:
+            rulesets:
+                - codesize
+                - unusedcode
+                - naming
+                - design
+            naming_rules:
+                short_variable: { minimum: 2 }
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    # Analyzes the size and structure of a PHP project.
+    php_pdepend:
+        enabled:              true
+        excluded_dirs:
+            - docs
+            - examples
+            - extras
+            - test
+            - vendor
+
+    # Runs Scrutinizer's PHP Analyzer Tool
+    # https://scrutinizer-ci.com/docs/tools/php/php-analyzer/config_reference
+    php_analyzer:
+        enabled:              true
+        config:
+            checkstyle:
+                enabled: true
+                naming:
+                    enabled: true
+                    property_name: ^[_a-zA-Z][a-zA-Z0-9_]*$ #Allow underscores & caps
+                    method_name: ^(?:[_a-zA-Z]|__)[a-zA-Z0-9_]*$ #Allow underscores & caps
+                    parameter_name: ^[a-z][a-zA-Z0-9_]*$ # Allow underscores
+                    local_variable: ^[a-zA-Z][a-zA-Z0-9_]*$ #Allow underscores & caps
+                    exception_name: ^[a-zA-Z][a-zA-Z0-9]*Exception$
+                    isser_method_name: ^(?:[_a-zA-Z]|__)[a-zA-Z0-9]*$ #Allow underscores & caps
+        filter:
+            excluded_paths:
+                - 'docs/*'
+                - 'examples/*'
+                - 'extras/*'
+                - 'test/*'
+                - 'vendor/*'
+
+    # Security Advisory Checker
+    sensiolabs_security_checker: true

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/.travis.yml
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/.travis.yml	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/.travis.yml	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,60 @@
+language: php
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq postfix
+
+install:
+  - REMOVE_PACKAGE="friendsofphp/php-cs-fixer"; if [ "$CS_CHECK" = 1 ]; then REMOVE_PACKAGE="phpunit/phpunit"; fi; composer remove --no-update --no-scripts --dev $REMOVE_PACKAGE
+  - composer remove --no-update --no-scripts --dev phpdocumentor/phpdocumentor
+  - composer install
+  - if [ "$CODE_COVERAGE" != 1 ]; then phpenv config-rm xdebug.ini || true; fi
+
+before_script:
+  - sudo service postfix stop
+  - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
+  - mkdir -p build/logs
+  - cp test/testbootstrap-dist.php test/testbootstrap.php
+  - chmod +x test/fakesendmail.sh
+  - sudo mkdir -p /var/qmail/bin
+  - sudo cp test/fakesendmail.sh /var/qmail/bin/sendmail
+  - sudo cp test/fakesendmail.sh /usr/sbin/sendmail
+  - |
+    if [[ $TRAVIS_PHP_VERSION = "hhv"* ]]; then
+      echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' >> /etc/hhvm/php.ini
+    else
+      echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
+    fi
+
+script: ./vendor/bin/phpunit --configuration ./travis.phpunit.xml.dist
+
+after_script:
+  - if [ "$CODE_COVERAGE" = 1 ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+  - if [ "$CODE_COVERAGE" = 1 ]; then php ocular.phar code-coverage:upload --format=php-clover ../build/logs/clover.xml; fi
+
+stages:
+  - coding-standard
+  - test
+
+jobs:
+  include:
+    - stage: coding-standard
+      before_install:
+      before_script:
+      script: ./vendor/bin/php-cs-fixer --diff --dry-run --verbose fix
+      after_script:
+      php: 5.5
+      env: CS_CHECK=1
+    - stage: test
+      php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
+      env: CODE_COVERAGE=1
+    - php: 7.2
+    - php: hhvm
+      dist: trusty

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/LICENSE
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/LICENSE	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/LICENSE	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/HEAD
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/HEAD	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/HEAD	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+ref: refs/heads/master

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/config
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/config	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/config	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,13 @@
+[core]
+	repositoryformatversion = 0
+	filemode = false
+	bare = false
+	logallrefupdates = true
+	symlinks = false
+	ignorecase = true
+[remote "origin"]
+	url = https://github.com/PHPMailer/PHPMailer.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/description
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/description	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/description	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/applypatch-msg.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/applypatch-msg.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/applypatch-msg.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
+test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
+:

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/commit-msg.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/commit-msg.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/commit-msg.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/post-update.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/post-update.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/post-update.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-applypatch.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-applypatch.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-applypatch.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+precommit="$(git rev-parse --git-path hooks/pre-commit)"
+test -x "$precommit" && exec "$precommit" ${1+"$@"}
+:

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-commit.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-commit.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-commit.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-push.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-push.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-push.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo >&2 "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-rebase.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-rebase.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-rebase.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-receive.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-receive.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/pre-receive.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to make use of push options.
+# The example simply echoes all push options that start with 'echoback='
+# and rejects all pushes when the "reject" push option is used.
+#
+# To enable this hook, rename this file to "pre-receive".
+
+if test -n "$GIT_PUSH_OPTION_COUNT"
+then
+	i=0
+	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
+	do
+		eval "value=\$GIT_PUSH_OPTION_$i"
+		case "$value" in
+		echoback=*)
+			echo "echo from the pre-receive-hook: ${value#*=}" >&2
+			;;
+		reject)
+			exit 1
+		esac
+		i=$((i + 1))
+	done
+fi

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/prepare-commit-msg.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/prepare-commit-msg.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/prepare-commit-msg.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/update.sample
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/update.sample	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/hooks/update.sample	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to block unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index
===================================================================
(Binary files differ)

Index: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index	2018-08-09 12:30:02 UTC (rev 9936)

Property changes on: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/index
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/info/exclude
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/info/exclude	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/info/exclude	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/HEAD
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/HEAD	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/HEAD	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b0c7223f65b51f512c1995786ac00616db4cf0de Tobias Rieck <tobias.rieck at benndorf.de> 1512729921 +0100	clone: from https://github.com/PHPMailer/PHPMailer.git

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads/master
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads/master	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/heads/master	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b0c7223f65b51f512c1995786ac00616db4cf0de Tobias Rieck <tobias.rieck at benndorf.de> 1512729921 +0100	clone: from https://github.com/PHPMailer/PHPMailer.git

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin/HEAD
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin/HEAD	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/logs/refs/remotes/origin/HEAD	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 b0c7223f65b51f512c1995786ac00616db4cf0de Tobias Rieck <tobias.rieck at benndorf.de> 1512729921 +0100	clone: from https://github.com/PHPMailer/PHPMailer.git

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx
===================================================================
(Binary files differ)

Index: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx	2018-08-09 12:30:02 UTC (rev 9936)

Property changes on: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.idx
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack
===================================================================
(Binary files differ)

Index: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack	2018-08-09 12:30:02 UTC (rev 9936)

Property changes on: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/objects/pack/pack-4a443c7677633446b5567270adf372a31cb6dfd5.pack
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/packed-refs
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/packed-refs	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/packed-refs	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,76 @@
+# pack-refs with: peeled fully-peeled 
+49ae798ccff007a7fc7fa52b599550492a5dcb65 refs/remotes/origin/5.2-stable
+ea25dc122d22966b7dd4ca1083c63afeeb50dfcd refs/remotes/origin/6.0
+ee443163c4032fe1e57039777be33f39eaaa100f refs/remotes/origin/6.0-ical
+578a81752fde7daf8a3437fa7042a664894b51dd refs/remotes/origin/gh-pages
+b0c7223f65b51f512c1995786ac00616db4cf0de refs/remotes/origin/master
+a1cd2167160a1a7c40690cf4c43918e2c0f39d61 refs/tags/phpmailer-2.0.3
+^6ffa946a66bb84934fe65c404547af913c382b6b
+ef6c58d3ba9107728201b3076ed738047688840e refs/tags/phpmailer-2.3.0
+^fd036f306b486fab9992f598e5614bee6ead922e
+b75e6c4611cf61b6c88ac43d53a251610f31c83d refs/tags/phpmailer-2.3.0 at 186
+^40df5e651ef17adb42fb42d5404a8f2fc16d2c8a
+83fa9aef67da84194bf27312e586e241c815a391 refs/tags/phpmailer-5.0.0
+^e4fa65ecb37b7a31a339d337a3a7b763eca9a49b
+d022044d3fa76eeb09be9aeaba8baddd42a3364d refs/tags/phpmailer-5.0.2
+^9cea856975d69873d741f24cda85ee0366bfd99d
+0e3e11a547aadb896fd8be1377a920352029f70e refs/tags/phpmailer-5.1
+^424e50f919eec5963537eb3ff24ede39c7914069
+767fe306cef25182f077cbd7c567e5e4b1619113 refs/tags/v2.0.3
+^6ffa946a66bb84934fe65c404547af913c382b6b
+697c716ba0ce4c8fab6b84ea1f228f04d9e11b8f refs/tags/v2.2.1
+^50b36f580184c4b354cc061bff5da34d9afaa952
+bc5121a1cd2d06b2d3552511ccb7edbf3f68b6eb refs/tags/v2.3.0
+^fd036f306b486fab9992f598e5614bee6ead922e
+7a234731c12bbc2ad45d976f0f187faa233d7575 refs/tags/v5.0.0
+^e4fa65ecb37b7a31a339d337a3a7b763eca9a49b
+b87fcc12ccc37c4e79eeb827ab02103a053f4ec5 refs/tags/v5.0.2
+^9cea856975d69873d741f24cda85ee0366bfd99d
+710c6f503fba3c72816c3f4745eda3b97483aa9d refs/tags/v5.1.0
+^424e50f919eec5963537eb3ff24ede39c7914069
+1bac109eed24de983ac4d85394678c4253b02299 refs/tags/v5.2.0
+^cca7fc22fb115c0a75cff77432afd38228f45bbb
+f37ce756338de8651ea8a9a2fce28111c8c97460 refs/tags/v5.2.1
+^06aff1b403ffce1eb65693e2a693cbaa5a92693e
+07005ecbb80d11ec8c0f067bb37e8909cc7fcbb7 refs/tags/v5.2.10
+7830cb9a761d974e58e3173137eac93da1cd715a refs/tags/v5.2.11
+5dd754112d07ab7480824c2916689ce06f83a842 refs/tags/v5.2.12
+45df3a88f7f46071e10d0b600f228d19f95911b3 refs/tags/v5.2.13
+e774bc9152de85547336e22b8926189e582ece95 refs/tags/v5.2.14
+d0186171b28af4f06ac2ad8a84a8f3d6cbc3ba6c refs/tags/v5.2.15
+1d85f9ef3ecfc42bbc4f3c70d5e37ca9a65f629a refs/tags/v5.2.16
+208913c6042967ba404f4bfa0819bf5bef79dbec refs/tags/v5.2.17
+ed4e7ce8ad877a8f578139c491c256ab1933c7c9 refs/tags/v5.2.18
+9e4b8fb3deb7d9cfa515c04cec41f71bc37ce9a9 refs/tags/v5.2.19
+737b85715f303f2158f11d576cfc5e117fa388ac refs/tags/v5.2.2
+^10c57b72fe4476901d1b3f5ccf3f5cedb4b3c8b1
+efde5edb3da8e1d257e030e3c2d922c4de6e5d09 refs/tags/v5.2.20
+1d51856b76c06fc687fcd9180efa7a0bed0d761e refs/tags/v5.2.21
+b18cb98131bd83103ccb26a888fdfe3177b8a663 refs/tags/v5.2.22
+7115df4a6f76281109ebe352900c42403b728bb4 refs/tags/v5.2.23
+22d04c6a58145a244696f3f254c1875aa653b26a refs/tags/v5.2.24
+2baf20b01690fba8cf720c1ebcf9b988eda50915 refs/tags/v5.2.25
+6414cff3f9ab261d3b821625de79edc63cd4dea8 refs/tags/v5.2.26
+^70362997bda4376378be7d92d81e2200550923f7
+207edf2f154636bfeb63df20253ec5bcb3ae8f54 refs/tags/v5.2.4
+^adb0197c106fad05c1fab28dbed5437133836c44
+46625e04139cfe2b1f1908159328988f6a9cf1c0 refs/tags/v5.2.5
+^fb6e90a8650bebb1d23ba15494113cf612774759
+39b3e80893ef106acf731a5d60ea3967c706cf24 refs/tags/v5.2.6
+^4d9434e394496a5bb7acd9e73046587184b413df
+aab86eb07d52709a9b48f19a7fd843771b0c91c2 refs/tags/v5.2.7
+^8717a79565b2c0ed67f851d70e1949febdf3b226
+d3802c597bff8f6c2ccfa3eab2a511aa01b8d68f refs/tags/v5.2.8
+0b24a9bb61ed89d57b9172f98838a790ea8fe15e refs/tags/v5.2.9
+^73b61679809615850706f1dbf88e6df2ddc05745
+80b309b20dae387fbd76f2c00a879c99e23c31fe refs/tags/v6.0.0
+^ea25dc122d22966b7dd4ca1083c63afeeb50dfcd
+7a67a3318165ac9c56b2f43e9817a9a8a2bfa266 refs/tags/v6.0.0rc1
+5b34f25e314558a8f7bc94f0f2ee0a09969f0640 refs/tags/v6.0.0rc2
+9727777f27b56b80654498713c6a17414b1b2e9e refs/tags/v6.0.0rc3
+2963f2b2945610cc0c1a6b8a1714602cdd7299a2 refs/tags/v6.0.0rc4
+9c3ba23563a54f9318bb2e4748db45e0c4cd96c6 refs/tags/v6.0.0rc5
+0612c52b03ba59ff5713ad24fa6efe0a966a0934 refs/tags/v6.0.1
+^992392437c2e2784e0dc41446024fe411d293c96
+41b99ecba32a0cb7a925d88de9279175bf4a7d75 refs/tags/v6.0.2
+^7a4459cff6abeb86b63cdbad760f567252f3f39c

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/heads/master
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/heads/master	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/heads/master	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+b0c7223f65b51f512c1995786ac00616db4cf0de

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin/HEAD
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin/HEAD	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/PHPMailer/.git/refs/remotes/origin/HEAD	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/README.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/README.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/README.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,219 @@
+![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
+
+# PHPMailer - A full-featured email creation and transfer class for PHP
+
+Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/quality-score.png?s=3758e21d279becdf847a557a56a3ed16dfec9d5d)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
+[![Code Coverage](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/coverage.png?s=3fe6ca5fe8cd2cdf96285756e42932f7ca256962)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
+
+[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![Latest Unstable Version](https://poser.pugx.org/phpmailer/phpmailer/v/unstable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
+
+## Class Features
+- Probably the world's most popular code for sending email from PHP!
+- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
+- Integrated SMTP support - send without a local mail server
+- Send emails with multiple To, CC, BCC and Reply-to addresses
+- Multipart/alternative emails for mail clients that do not read HTML email
+- Add attachments, including inline
+- Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
+- SMTP authentication with LOGIN, PLAIN, CRAM-MD5 and XOAUTH2 mechanisms over SSL and SMTP+STARTTLS transports
+- Validates email addresses automatically
+- Protect against header injection attacks
+- Error messages in 47 languages!
+- DKIM and S/MIME signing support
+- Compatible with PHP 5.5 and later
+- Namespaced to prevent name clashes
+- Much more!
+
+## Why you might need it
+Many PHP developers utilize email in their code. The only PHP function that supports this is the `mail()` function. However, it does not provide any assistance for making use of popular features such as HTML-based emails and attachments.
+
+Formatting email correctly is surprisingly difficult. There are myriad overlapping RFCs, requiring tight adherence to horribly complicated formatting and encoding rules - the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong!
+*Please* don't be tempted to do it yourself - if you don't use PHPMailer, there are many other excellent libraries that you should look at before rolling your own - try SwiftMailer, Zend_Mail, eZcomponents etc.
+
+The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD and OS X platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP implementation allows email sending on Windows platforms without a local mail server.
+
+## License
+This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license. Please read LICENSE for information on the
+software availability and distribution.
+
+## Installation & loading
+PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via composer is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
+
+```json
+"phpmailer/phpmailer": "~6.0"
+```
+
+or run
+
+```sh
+composer require phpmailer/phpmailer
+```
+
+Note that the `vendor` folder and the `vendor/autoload.php` script are generated by composer; they are not part of PHPMailer.
+
+If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
+
+Alternatively, if you're not using composer, copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
+
+```php
+<?php
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require 'path/to/PHPMailer/src/Exception.php';
+require 'path/to/PHPMailer/src/PHPMailer.php';
+require 'path/to/PHPMailer/src/SMTP.php';
+```
+
+If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class.
+
+If you don't speak git or just want a tarball, click the 'zip' button on the right of the project page in GitHub, though note that docs and examples are not included in the tarball.
+
+## Upgrading from 5.2
+The biggest changes are that source files are now in the `src/` folder, and PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several important effects – [read the upgrade guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for more details.
+
+## Legacy versions
+PHPMailer 5.2 (which is compatible with PHP 5.0 - 7.0) is no longer being supported for feature updates, and will only be receiving security updates from now on. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable), and future versions of 5.2 will be tagged with 5.2.x version numbers, so existing composer configs should remain working. If you're using PHP 5.5 or later, we recommend you make the necessary changes to switch to the 6.0 release.
+
+### Minimal installation
+While installing the entire package manually or with composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php), and if you're using POP-before SMTP, you'll need [src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php). You can skip the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using XOAUTH2 you will need [src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php) as well as the composer dependencies for the services you wish to authenticate with. Really, it's much easier to use composer!
+
+## A Simple Example
+
+```php
+<?php
+// Import PHPMailer classes into the global namespace
+// These must be at the top of your script, not inside a function
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+//Load composer's autoloader
+require 'vendor/autoload.php';
+
+$mail = new PHPMailer(true);                              // Passing `true` enables exceptions
+try {
+    //Server settings
+    $mail->SMTPDebug = 2;                                 // Enable verbose debug output
+    $mail->isSMTP();                                      // Set mailer to use SMTP
+    $mail->Host = 'smtp1.example.com;smtp2.example.com';  // Specify main and backup SMTP servers
+    $mail->SMTPAuth = true;                               // Enable SMTP authentication
+    $mail->Username = 'user at example.com';                 // SMTP username
+    $mail->Password = 'secret';                           // SMTP password
+    $mail->SMTPSecure = 'tls';                            // Enable TLS encryption, `ssl` also accepted
+    $mail->Port = 587;                                    // TCP port to connect to
+
+    //Recipients
+    $mail->setFrom('from at example.com', 'Mailer');
+    $mail->addAddress('joe at example.net', 'Joe User');     // Add a recipient
+    $mail->addAddress('ellen at example.com');               // Name is optional
+    $mail->addReplyTo('info at example.com', 'Information');
+    $mail->addCC('cc at example.com');
+    $mail->addBCC('bcc at example.com');
+
+    //Attachments
+    $mail->addAttachment('/var/tmp/file.tar.gz');         // Add attachments
+    $mail->addAttachment('/tmp/image.jpg', 'new.jpg');    // Optional name
+
+    //Content
+    $mail->isHTML(true);                                  // Set email format to HTML
+    $mail->Subject = 'Here is the subject';
+    $mail->Body    = 'This is the HTML message body <b>in bold!</b>';
+    $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
+
+    $mail->send();
+    echo 'Message has been sent';
+} catch (Exception $e) {
+    echo 'Message could not be sent.';
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+}
+```
+
+You'll find plenty more to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder.
+
+That's it. You should now be ready to use PHPMailer!
+
+## Localization
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find numerous (46 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+
+```php
+// To load the French version
+$mail->setLanguage('fr', '/optional/path/to/language/directory/');
+```
+
+We welcome corrections and new languages - if you're looking for corrections to do, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
+
+## Documentation
+Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated.
+
+Examples of how to use PHPMailer for common scenarios can be found in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder. If you're looking for a good starting point, we recommend you start with [the Gmail example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
+
+Note that in order to reduce PHPMailer's deployed code footprint, the examples are no longer included if you load PHPMailer via composer or via [GitHub's zip file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so you'll need to either clone the git repository or use the above links to get to the examples directly.
+
+Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
+
+You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in teh `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/phpmailerTest.php) a good source of how to do various operations such as encryption.
+
+If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
+
+## Tests
+There is a PHPUnit test script in the [test](https://github.com/PHPMailer/PHPMailer/tree/master/test/) folder. PHPMailer uses PHPUnit 4.8 - we would use 5.x but we need to run on PHP 5.5.
+
+Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
+
+If this isn't passing, is there something you can do to help?
+
+## Security
+
+Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues.
+
+## Contributing
+Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
+
+We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
+
+If you found a mistake in the docs, or want to add something, go ahead and amend the wiki - anyone can edit it.
+
+If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
+
+```sh
+git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
+```
+
+Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
+
+## Sponsorship
+Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), a powerful email marketing system.
+
+<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="250" height="28" alt="Smartmessages email marketing"></a>
+
+Other contributions are gladly received, whether in beer 🍺, T-shirts 👕, Amazon wishlist raids, or cold, hard cash 💰. If you'd like to donate to say "thank you" to maintainers or contributors, please contact them through individual profile pages via [the contributors page](https://github.com/PHPMailer/PHPMailer/graphs/contributors).
+
+## Changelog
+See [changelog](changelog.md).
+
+## History
+- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
+- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004.
+- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
+- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer) in 2008.
+- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
+- PHPMailer moves to the [PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
+
+### What's changed since moving from SourceForge?
+- Official successor to the SourceForge and Google Code projects.
+- Test suite.
+- Continuous integration with Travis-CI.
+- Composer support.
+- Public development.
+- Additional languages and language strings.
+- CRAM-MD5 authentication support.
+- Preserves full repo history of authors, commits and branches from the original SourceForge project.

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/SECURITY.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/SECURITY.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/SECURITY.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+# Security notices relating to PHPMailer
+
+Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
+
+PHPMailer versions prior to 5.2.10 (released May 2015) are vulnerable to [CVE-2008-5619](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5619), a remote code execution vulnerability in the bundled html2text library. This file was removed in 5.2.10, so if you are using a version prior to that and make use of the html2text function, it's vitally important that you upgrade and remove this file.
+
+PHPMailer versions prior to 2.0.7 and 2.2.1 are vulnerable to [CVE-2012-0796](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0796), an email header injection attack.
+
+Joomla 1.6.0 uses PHPMailer in an unsafe way, allowing it to reveal local file paths, reported in [CVE-2011-3747](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3747).
+
+PHPMailer didn't sanitise the `$lang_path` parameter in `SetLanguage`. This wasn't a problem in itself, but some apps (PHPClassifieds, ATutor) also failed to sanitise user-provided parameters passed to it, permitting semi-arbitrary local file inclusion, reported in [CVE-2010-4914](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4914), [CVE-2007-2021](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-2021) and [CVE-2006-5734](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-5734).
+
+PHPMailer 1.7.2 and earlier contained a possible DDoS vulnerability reported in [CVE-2005-1807](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-1807).
+
+PHPMailer 1.7 and earlier (June 2003) have a possible vulnerability in the `SendmailSend` method where shell commands may not be sanitised. Reported in [CVE-2007-3215](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-3215).
+

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/UPGRADING.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/UPGRADING.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/UPGRADING.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,125 @@
+# Upgrading from PHPMailer 5.2 to 6.0
+
+PHPMailer 6.0 is a major update, breaking backward compatibility.
+
+If you're in doubt about how you should be using PHPMailer 6, take a look at the examples as they have all been updated to work in a PHPMailer 6.0 style.
+
+## PHP Version
+
+PHPMailer 6.0 requires PHP 5.5 or later, and is fully compatible with PHP 7.0. PHPMailer 5.2 supported PHP 5.0 and upwards, so if you need to run on a legacy PHP version, see the [PHPMailer 5.2-stable branch on Github](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable).
+
+## Loading PHPMailer
+ 
+The single biggest change will be in the way that you load PHPMailer. In earlier versions you may have done this:
+
+```php
+require 'PHPMailerAutoload.php';
+```
+
+or
+
+```php
+require 'class.phpmailer.php';
+require 'class.smtp.php';
+```
+
+We recommend that you load PHPMailer via composer, using its standard autoloader, which you probably won't need to load if you're using it already, but in case you're not, you will need to do this instead:
+
+```php
+require 'vendor/autoload.php';
+```
+
+If you're not using composer, you can still load the classes manually, depending on what you're using:
+
+```php
+require 'src/PHPMailer.php';
+require 'src/SMTP.php';
+require 'src/Exception.php';
+```
+
+## Namespace
+PHPMailer 6 uses a [namespace](http://php.net/manual/en/language.namespaces.rationale.php) of `PHPMailer\PHPMailer`, because it's the PHPMailer project within the PHPMailer organisation. You **must** import (with a `use` statement) classes you're using explicitly into your own namespace, or reference them absolutely in the global namespace - all the examples do this. This means the fully-qualified name of the main PHPMailer class is `PHPMailer\PHPMailer\PHPMailer`, which is a bit of a mouthful, but there's no harm in it! If you are using other PHPMailer classes explicitly (such as `SMTP` or `Exception`), you will need to import them into your namespace too.
+
+For example you might create an instance like this:
+
+```php
+<?php
+namespace MyProject;
+use PHPMailer\PHPMailer\PHPMailer;
+require 'vendor/autoload.php';
+$mail = new PHPMailer;
+...
+```
+
+or alternatively, using a fully qualified name:
+
+```php
+<?php
+namespace MyProject;
+require 'vendor/autoload.php';
+$mail = new PHPMailer\PHPMailer\PHPMailer;
+...
+```
+
+Note that `use` statements apply *only* to the file they appear in (they are local aliases), so if an included file contains `use` statements, it will not import the namespaced classes into the file you're including from.
+
+## Namespaced exceptions
+PHPMailer now uses its own namespaced `Exception` class, so if you were previously catching exceptions of type `phpmailerException` (or subclasses of that), you will need to update them to use the PHPMailer namespace, and make any existing `Exception` references use the global namespace, i.e. `\Exception`. If your original code was:
+
+```php
+try {
+...
+} catch (phpmailerException $e) {
+    echo $e->errorMessage();
+} catch (Exception $e) {
+    echo $e->getMessage();
+}
+```
+
+Convert it to:
+
+```php
+use PHPMailer\PHPMailer\Exception;
+...
+try {
+...
+} catch (Exception $e) {
+    echo $e->errorMessage();
+} catch (\Exception $e) {
+    echo $e->getMessage();
+}
+```
+
+## OAuth2 Support
+The OAuth2 implementation has been completely redesigned using the [OAuth2 packages](http://oauth2-client.thephpleague.com) from the [League of of extraordinary packages](http://thephpleague.com), providing support for many more OAuth services, and you'll need to update your code if you were using OAuth in 5.2. See [the examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) and documentation in the [PHPMailer wiki](https://github.com/PHPMailer/PHPMailer/wiki).
+
+## Extras
+Additional classes previously bundled in the `Extras` folder (such as htmlfilter and EasyPeasyICS) have been removed - use equivalent packages from [packagist.org](https://packagist.org) instead.
+
+## Other upgrade changes
+See the changelog for full details.
+* File structure simplified, classes live in the `src/` folder
+* Most statically called functions now use the `static` keyword instead of `self`, so it's possible to override static internal functions in subclasses, for example `validateAddress()`
+* Complete RFC standardisation on CRLF (`\r\n`) line breaks by default:
+  * `PHPMailer::$LE` still exists, but all uses of it are changed to `static::$LE` for easier overriding. It may be changed to `\n` automatically when sending via `mail()` on UNIX-like OSs
+  * `PHPMailer::CRLF` line ending constant removed
+  * The length of the line break is no longer used in line length calculations
+  * Similar changes to line break handling in SMTP and POP3 classes
+* All elements previously marked as deprecated have been removed:
+  * `PHPMailer->Version`
+  * `PHPMailer->ReturnPath`
+  * `PHPMailer->PluginDir`
+  * `PHPMailer->encodeQPphp()`
+  * `SMTP->CRLF`
+  * `SMTP->Version`
+  * `SMTP->SMTP_PORT`
+  * `POP3->CRLF`
+  * `POP3->Version`
+* NTLM authentication has been removed - it never worked anyway!
+  * `PHPMailer->Workstation`
+  * `PHPMailer->Realm`
+* `SMTP::authenticate` method signature changed
+* `parseAddresses()` is now static
+* `validateAddress()` is now called statically from `parseAddresses()`
+* `idnSupported()` is now static and is called statically from `punyencodeAddress()`
+* `PHPMailer->SingleToArray` is now protected

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/VERSION
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/VERSION	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/VERSION	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1 @@
+6.0.2
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/changelog.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/changelog.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/changelog.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,783 @@
+# PHPMailer Change Log
+
+## Version 6.0.2 (November 29th 2017)
+* Don't make max line length depend on line break format
+* Improve Travis-CI config - thanks to Filippo Tessarotto
+* Match SendGrid transaction IDs
+* `idnSupported()` now static, as previously documented
+* Improve error messages for invalid addresses
+* Improve Indonesian translation (thanks to @januridp)
+* Improve Esperanto translation (thanks to @dknacht)
+* Clean up git export ignore settings for production and zip bundles
+* Update license doc
+* Updated upgrading docs
+* Clarify `addStringEmbeddedImage` docs
+* Hide auth credentials in all but lowest level debug output, prevents leakage in bug reports
+* Code style cleanup
+
+## Version 6.0.1 (September 14th 2017)
+* Use shorter Message-ID headers (with more entropy) to avoid iCloud blackhole bug
+* Switch to Symfony code style (though it's not well defined)
+* CI builds now apply syntax & code style checks, so make your PRs tidy!
+* CI code coverage only applied on latest version of PHP to speed up builds (thanks to @Slamdunk for these CI changes)
+* Remove `composer.lock` - it's important that libraries break early; keeping it is for apps
+* Rename test scripts to PSR-4 spec
+* Make content-id values settable on attachments, not just embedded items
+* Add SMTP transaction IDs to callbacks & allow for future expansion
+* Expand test coverage
+
+## Version 6.0 (August 28th 2017)
+This is a major update that breaks backwards compatibility.
+
+* **Requires PHP 5.5 or later**
+* **Uses the `PHPMailer\PHPMailer` namespace**
+* File structure simplified and PSR-4 compatible, classes live in the `src/` folder
+* The custom autoloader has been removed: [**use composer**](https://getcomposer.org)!
+* Classes & Exceptions renamed to make use of the namespace
+* Most statically called functions now use the `static` keyword instead of `self`, so it's possible to override static internal functions in subclasses, for example `validateAddress()`
+* Complete RFC standardisation on CRLF (`\r\n`) line breaks for SMTP by default:
+  * `PHPMailer:$LE` defaults to CRLF
+  * All uses of `PHPMailer::$LE` property converted to use `static::$LE` constant for consistency and ease of overriding
+  * Similar changes to line break handling in SMTP and POP3 classes.
+  * Line break format for `mail()` transport is set automatically.
+  * Warnings emitted for buggy `mail()` in PHP versions 7.0.0 - 7.0.16 and 7.1.0 - 7.1.2; either upgrade or switch to SMTP.
+* Extensive reworking of XOAUTH2, adding support for Google, Yahoo and Microsoft providers, thanks to @sherryl4george
+* Major cleanup of docs and examples
+* All elements previously marked as deprecated have been removed:
+  * `PHPMailer->Version` (replaced with `VERSION` constant)
+  * `PHPMailer->ReturnPath`
+  * `PHPMailer->PluginDir`
+  * `PHPMailer->encodeQPphp()`
+  * `SMTP->CRLF` (replaced with `LE` constant)
+  * `SMTP->Version` (replaced with `VERSION` constant)
+  * `SMTP->SMTP_PORT` (replaced with `DEFAULT_PORT` constant)
+  * `POP3->CRLF` (replaced with `LE` constant)
+  * `POP3->Version` (replaced with `VERSION` constant)
+  * `POP3->POP3_PORT` (replaced with `DEFAULT_PORT` constant)
+  * `POP3->POP3_TIMEOUT` (replaced with `DEFAULT_TIMEOUT` constant)
+* NTLM authentication has been removed - it never worked anyway!
+  * `PHPMailer->Workstation`
+  * `PHPMailer->Realm`
+* `SingleTo` functionality is deprecated; this belongs at a higher level - PHPMailer is not a mailing list system.
+* `SMTP::authenticate` method signature changed
+* `parseAddresses()` is now static
+* `validateAddress()` is now called statically from `parseAddresses()`
+* `idnSupported()` is now static and is called statically from `punyencodeAddress()`
+* `PHPMailer->SingleToArray` is now protected
+* `fixEOL()` method removed - it duplicates `PHPMailer::normalizeBreaks()`, so use that instead
+* Don't try to use an auth mechanism if it's not supported by the server
+* Reorder automatic AUTH mechanism selector to try most secure method first
+* `Extras` classes have been removed - use alternative packages from [packagist.org](https://packagist.org) instead
+* Better handling of automatic transfer encoding switch in the presence of long lines
+* Simplification of address validation - now uses PHP's `FILTER_VALIDATE_EMAIL` pattern by default, retains advanced options
+* `Debugoutput` can accept a PSR-3 logger instance
+* To reduce code footprint, the examples folder is no longer included in composer deployments or github zip files
+* Trap low-level errors in SMTP, reports via debug output
+* More reliable folding of message headers
+* Inject your own SMTP implementation via `setSMTPInstance()` instead of having to subclass and override `getSMTPInstance()`.
+* Make obtaining SMTP transaction ID more reliable
+* Better handling of unreliable PHP timeouts
+* Made `SMTPDebug = 4` slightly less noisy
+
+## Version 5.2.25 (August 28th 2017)
+* Make obtaining SMTP transaction ID more reliable
+* Add Bosnian translation
+* This is the last official release in the legacy PHPMailer 5.2 series; there may be future security patches (which will be found in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable)), but no further non-security PRs or issues will be accepted. Migrate to PHPMailer 6.0.
+
+## Version 5.2.24 (July 26th 2017)
+* **SECURITY** Fix XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+* Handle bare codes (an RFC contravention) in SMTP server responses
+* Make message timestamps more dynamic - calculate the date separately for each message
+* More thorough checks for reading attachments.
+* Throw an exception when trying to send a message with an empty body caused by an internal error.
+* Replaced all use of MD5 and SHA1 hash functions with SHA256.
+* Now checks for invalid host strings when sending via SMTP.
+* Include timestamps in HTML-format debug output
+* Improve Turkish, Norwegian, Serbian, Brazilian Portuguese & simplified Chinese translations
+* Correction of Serbian ISO language code from `sr` to `rs`
+* Fix matching of multiple entries in `Host` to match IPv6 literals without breaking port selection (see #1094, caused by a3b4f6b)
+* Better capture and reporting of SMTP connection errors
+
+## Version 5.2.23 (March 15th 2017)
+* Improve trapping of TLS errors during connection so that they don't cause warnings, and are reported better in debug output
+* Amend test suite so it uses PHPUnit version 4.8, compatible with older versions of PHP, instead of the version supplied by Travis-CI
+* This forces pinning of some dev packages to older releases, but should make travis builds more reliable
+* Test suite now runs on HHVM, and thus so should PHPMailer in general
+* Improve Czech translations
+* Add links to CVE-2017-5223 resources
+
+## Version 5.2.22 (January 5th 2017)
+* **SECURITY** Fix [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223), local file disclosure vulnerability if content passed to `msgHTML()` is sourced from unfiltered user input. Reported by Yongxiang Li of Asiasecurity. The fix for this means that calls to `msgHTML()` without a `$basedir` will not import images with relative URLs, and relative URLs containing `..` will be ignored.
+* Add simple contact form example
+* Emoji in test content
+
+## Version 5.2.21 (December 28th 2016)
+* Fix missed number update in version file - no functional changes
+
+## Version 5.2.20 (December 28th 2016)
+* **SECURITY** Critical security update for CVE-2016-10045 please update now! Thanks to [Dawid Golunski](https://legalhackers.com) and Paul Buonopane (@Zenexer).
+* Note that this change will break VERP addresses in Sender if you're using mail() - workaround: use SMTP to localhost instead.
+
+## Version 5.2.19 (December 26th 2016)
+* Minor cleanup
+
+## Version 5.2.18 (December 24th 2016)
+* **SECURITY** Critical security update for CVE-2016-10033 please update now! Thanks to [Dawid Golunski](https://legalhackers.com).
+* Add ability to extract the SMTP transaction ID from some common SMTP success messages
+* Minor documentation tweaks
+
+## Version 5.2.17 (December 9th 2016)
+* This is officially the last feature release of 5.2. Security fixes only from now on; use PHPMailer 6.0!
+* Allow DKIM private key to be provided as a string
+* Provide mechanism to allow overriding of boundary and message ID creation
+* Improve Brazilian Portuguese, Spanish, Swedish, Romanian, and German translations
+* PHP 7.1 support for Travis-CI
+* Fix some language codes
+* Add security notices
+* Improve DKIM compatibility in older PHP versions
+* Improve trapping and capture of SMTP connection errors
+* Improve passthrough of error levels for debug output
+* PHPDoc cleanup
+
+## Version 5.2.16 (June 6th 2016)
+* Added DKIM example
+* Fixed empty additional_parameters problem
+* Fixed wrong version number in VERSION file!
+* Improve line-length tests
+* Use instance settings for SMTP::connect by default
+* Use more secure auth mechanisms first
+
+## Version 5.2.15 (May 10th 2016)
+* Added ability to inject custom address validators, and set the default validator
+* Fix TLS 1.2 compatibility
+* Remove some excess line breaks in MIME structure
+* Updated Polish, Russian, Brazilian Portuguese, Georgian translations
+* More DRY!
+* Improve error messages
+* Update dependencies
+* Add example showing how to handle multiple form file uploads
+* Improve SMTP example
+* Improve Windows compatibility
+* Use consistent names for temp files
+* Fix gmail XOAUTH2 scope, thanks to @sherryl4george
+* Fix extra line break in getSentMIMEMessage()
+* Improve DKIM signing to use SHA-2
+
+## Version 5.2.14 (Nov 1st 2015)
+* Allow addresses with IDN (Internationalized Domain Name) in PHP 5.3+, thanks to @fbonzon
+* Allow access to POP3 errors
+* Make all POP3 private properties and methods protected
+* **SECURITY** Fix vulnerability that allowed email addresses with line breaks (valid in RFC5322) to pass to SMTP, permitting message injection at the SMTP level. Mitigated in both the address validator and in the lower-level SMTP class. Thanks to Takeshi Terada.
+* Updated Brazilian Portuguese translations (Thanks to @phelipealves)
+
+## Version 5.2.13 (Sep 14th 2015)
+* Rename internal oauth class to avoid name clashes
+* Improve Estonian translations
+
+## Version 5.2.12 (Sep 1st 2015)
+* Fix incorrect composer package dependencies
+* Skip existing embedded image `cid`s in `msgHTML`
+
+## Version 5.2.11 (Aug 31st 2015)
+* Don't switch to quoted-printable for long lines if already using base64
+* Fixed Travis-CI config when run on PHP 7
+* Added Google XOAUTH2 authentication mechanism, thanks to @sherryl4george
+* Add address parser for RFC822-format addresses
+* Update MS Office MIME types
+* Don't convert line breaks when using quoted-printable encoding
+* Handle MS Exchange returning an invalid empty AUTH-type list in EHLO
+* Don't set name or filename properties on MIME parts that don't have one
+
+## Version 5.2.10 (May 4th 2015)
+* Add custom header getter
+* Use `application/javascript` for .js attachments
+* Improve RFC2821 compliance for timelimits, especially for end-of-data
+* Add Azerbaijani translations (Thanks to @mirjalal)
+* Minor code cleanup for robustness
+* Add Indonesian translations (Thanks to @ceceprawiro)
+* Avoid `error_log` Debugoutput naming clash
+* Add ability to parse server capabilities in response to EHLO (useful for SendGrid etc)
+* Amended default values for WordWrap to match RFC
+* Remove html2text converter class (has incompatible license)
+* Provide new mechanism for injecting html to text converters
+* Improve pointers to docs and support in README
+* Add example file upload script
+* Refactor and major cleanup of EasyPeasyICS, now a lot more usable
+* Make set() method simpler and more reliable
+* Add Malay translation (Thanks to @nawawi)
+* Add Bulgarian translation (Thanks to @mialy)
+* Add Armenian translation (Thanks to Hrayr Grigoryan)
+* Add Slovenian translation (Thanks to Klemen Tušar)
+* More efficient word wrapping
+* Add support for S/MIME signing with additional CA certificate (thanks to @IgitBuh)
+* Fix incorrect MIME structure when using S/MIME signing and isMail() (#372)
+* Improved checks and error messages for missing extensions
+* Store and report SMTP errors more consistently
+* Add MIME multipart preamble for better Outlook compatibility
+* Enable TLS encryption automatically if the server offers it
+* Provide detailed errors when individual recipients fail
+* Report more errors when connecting
+* Add extras classes to composer classmap
+* Expose stream_context_create options via new SMTPOptions property
+* Automatic encoding switch to quoted-printable if message lines are too long
+* Add Korean translation (Thanks to @ChalkPE)
+* Provide a pointer to troubleshooting docs on SMTP connection failure
+
+## Version 5.2.9 (Sept 25th 2014)
+* **Important: The autoloader is no longer autoloaded by the PHPMailer class**
+* Update html2text from https://github.com/mtibben/html2text
+* Improve Arabic translations (Thanks to @tarekdj)
+* Consistent handling of connection variables in SMTP and POP3
+* PHPDoc cleanup
+* Update composer to use PHPUnit 4.1
+* Pass consistent params to callbacks
+* More consistent handling of error states and debug output
+* Use property defaults, remove constructors
+* Remove unreachable code
+* Use older regex validation pattern for troublesome PCRE library versions
+* Improve PCRE detection in older PHP versions
+* Handle debug output consistently, and always in UTF-8
+* Allow user-defined debug output method via a callable
+* msgHTML now converts data URIs to embedded images
+* SMTP::getLastReply() will now always be populated
+* Improved example code in README
+* Ensure long filenames in Content-Disposition are encoded correctly
+* Simplify SMTP debug output mechanism, clarify levels with constants
+* Add SMTP connection check example
+* Simplify examples, don't use mysql* functions
+
+## Version 5.2.8 (May 14th 2014)
+* Increase timeout to match RFC2821 section 4.5.3.2 and thus not fail greetdelays, fixes #104
+* Add timestamps to default debug output
+* Add connection events and new level 3 to debug output options
+* Chinese language update (Thanks to @binaryoung)
+* Allow custom Mailer types (Thanks to @michield)
+* Cope with spaces around SMTP host specs
+* Fix processing of multiple hosts in connect string
+* Added Galician translation (Thanks to @donatorouco)
+* Autoloader now prepends
+* Docs updates
+* Add Latvian translation (Thanks to @eddsstudio)
+* Add Belarusian translation (Thanks to @amaksymiuk)
+* Make autoloader work better on older PHP versions
+* Avoid double-encoding if mbstring is overloading mail()
+* Add Portuguese translation (Thanks to @Jonadabe)
+* Make quoted-printable encoder respect line ending setting
+* Improve Chinese translation (Thanks to @PeterDaveHello)
+* Add Georgian translation (Thanks to @akalongman)
+* Add Greek translation (Thanks to @lenasterg)
+* Fix serverHostname on PHP < 5.3
+* Improve performance of SMTP class
+* Implement automatic 7bit downgrade
+* Add Vietnamese translation (Thanks to @vinades)
+* Improve example images, switch to PNG
+* Add Croatian translation (Thanks to @hrvoj3e)
+* Remove setting the Return-Path and deprecate the Return-path property - it's just wrong!
+* Fix language file loading if CWD has changed (@stephandesouza)
+* Add HTML5 email validation pattern
+* Improve Turkish translations (Thanks to @yasinaydin)
+* Improve Romanian translations (Thanks to @aflorea)
+* Check php.ini for path to sendmail/qmail before using default
+* Improve Farsi translation (Thanks to @MHM5000)
+* Don't use quoted-printable encoding for multipart types
+* Add Serbian translation (Thanks to ajevremovic at gmail.com)
+* Remove useless PHP5 check
+* Use SVG for build status badges
+* Store MessageDate on creation
+* Better default behaviour for validateAddress
+
+## Version 5.2.7 (September 12th 2013)
+* Add Ukrainian translation from @Krezalis
+* Support for do_verp
+* Fix bug in CRAM-MD5 AUTH
+* Propagate Debugoutput option to SMTP class (@Reblutus)
+* Determine MIME type of attachments automatically
+* Add cross-platform, multibyte-safe pathinfo replacement (with tests) and use it
+* Add a new 'html' Debugoutput type
+* Clean up SMTP debug output, remove embedded HTML
+* Some small changes in header formatting to improve IETF msglint test results
+* Update test_script to use some recently changed features, rename to code_generator
+* Generated code actually works!
+* Update SyntaxHighlighter
+* Major overhaul and cleanup of example code
+* New PHPMailer graphic
+* msgHTML now uses RFC2392-compliant content ids
+* Add line break normalization function and use it in msgHTML
+* Don't set unnecessary reply-to addresses
+* Make fakesendmail.sh a bit cleaner and safer
+* Set a content-transfer-encoding on multiparts (fixes msglint error)
+* Fix cid generation in msgHTML (Thanks to @digitalthought)
+* Fix handling of multiple SMTP servers (Thanks to @NanoCaiordo)
+* SMTP->connect() now supports stream context options (Thanks to @stanislavdavid)
+* Add support for iCal event alternatives (Thanks to @reblutus)
+* Update to Polish language file (Thanks to Krzysztof Kowalewski)
+* Update to Norwegian language file (Thanks to @datagutten)
+* Update to Hungarian language file (Thanks to @dominicus-75)
+* Add Persian/Farsi translation from @jaii
+* Make SMTPDebug property type match type in SMTP class
+* Add unit tests for DKIM
+* Major refactor of SMTP class
+* Reformat to PSR-2 coding standard
+* Introduce autoloader
+* Allow overriding of SMTP class
+* Overhaul of PHPDocs
+* Fix broken Q-encoding
+* Czech language update (Thanks to @nemelu)
+* Removal of excess blank lines in messages
+* Added fake POP server and unit tests for POP-before-SMTP
+
+## Version 5.2.6 (April 11th 2013)
+* Reflect move to PHPMailer GitHub organisation at https://github.com/PHPMailer/PHPMailer
+* Fix unbumped version numbers
+* Update packagist.org with new location
+* Clean up Changelog
+
+## Version 5.2.5 (April 6th 2013)
+* First official release after move from Google Code
+* Fixes for qmail when sending via mail()
+* Merge in changes from Google code 5.2.4 release
+* Minor coding standards cleanup in SMTP class
+* Improved unit tests, now tests S/MIME signing
+* Travis-CI support on GitHub, runs tests with fake SMTP server
+
+## Version 5.2.4 (February 19, 2013)
+* Fix tag and version bug.
+* un-deprecate isSMTP(), isMail(), IsSendmail() and isQmail().
+* Numerous translation updates
+
+## Version 5.2.3 (February 8, 2013)
+* Fix issue with older PCREs and ValidateAddress() (Bugz: 124)
+* Add CRAM-MD5 authentication, thanks to Elijah madden, https://github.com/okonomiyaki3000
+* Replacement of obsolete Quoted-Printable encoder with a much better implementation
+* Composer package definition
+* New language added: Hebrew
+
+## Version 5.2.2 (December 3, 2012)
+* Some fixes and syncs from https://github.com/Synchro/PHPMailer
+* Add Slovak translation, thanks to Michal Tinka
+
+## Version 5.2.2-rc2 (November 6, 2012)
+* Fix SMTP server rotation (Bugz: 118)
+* Allow override of autogen'ed 'Date' header (for Drupal's
+  og_mailinglist module)
+* No whitespace after '-f' option (Bugz: 116)
+* Work around potential warning (Bugz: 114)
+
+## Version 5.2.2-rc1 (September 28, 2012)
+* Header encoding works with long lines (Bugz: 93)
+* Turkish language update (Bugz: 94)
+* undefined $pattern in EncodeQ bug squashed (Bugz: 98)
+* use of mail() in safe_mode now works (Bugz: 96)
+* ValidateAddress() now 'public static' so people can override the
+  default and use their own validation scheme.
+* ValidateAddress() no longer uses broken FILTER_VALIDATE_EMAIL
+* Added in AUTH PLAIN SMTP authentication
+
+## Version 5.2.2-beta2 (August 17, 2012)
+* Fixed Postfix VERP support (Bugz: 92)
+* Allow action_function callbacks to pass/use
+  the From address (passed as final param)
+* Prevent inf look for get_lines() (Bugz: 77)
+* New public var ($UseSendmailOptions). Only pass sendmail()
+  options iff we really are using sendmail or something sendmail
+  compatible. (Bugz: 75)
+* default setting for LE returned to "\n" due to popular demand.
+
+## Version 5.2.2-beta1 (July 13, 2012)
+* Expose PreSend() and PostSend() as public methods to allow
+  for more control if serializing message sending.
+* GetSentMIMEMessage() only constructs the message copy when
+ needed. Save memory.
+* Only pass params to mail() if the underlying MTA is
+  "sendmail" (as defined as "having the string sendmail
+  in its pathname") [#69]
+* Attachments now work with Amazon SES and others [Bugz#70]
+* Debug output now sent to stdout (via echo) or error_log [Bugz#5]
+* New var: Debugoutput (for above) [Bugz#5]
+* SMTP reads now Timeout aware (new var: Timeout=15) [Bugz#71]
+* SMTP reads now can have a Timelimit associated with them
+  (new var: Timelimit=30)[Bugz#71]
+* Fix quoting issue associated with charsets
+* default setting for LE is now RFC compliant: "\r\n"
+* Return-Path can now be user defined (new var: ReturnPath)
+  (the default is "" which implies no change from previous
+  behavior, which was to use either From or Sender) [Bugz#46]
+* X-Mailer header can now be disabled (by setting to a
+  whitespace string, eg "  ") [Bugz#66]
+* Bugz closed: #68, #60, #42, #43, #59, #55, #66, #48, #49,
+               #52, #31, #41, #5. #70, #69
+
+## Version 5.2.1 (January 16, 2012)
+* Closed several bugs #5
+* Performance improvements
+* MsgHTML() now returns the message as required.
+* New method: GetSentMIMEMessage() (returns full copy of sent message)
+
+## Version 5.2 (July 19, 2011)
+* protected MIME body and header
+* better DKIM DNS Resource Record support
+* better aly handling
+* htmlfilter class added to extras
+* moved to Apache Extras
+
+## Version 5.1 (October 20, 2009)
+* fixed filename issue with AddStringAttachment (thanks to Tony)
+* fixed "SingleTo" property, now works with Senmail, Qmail, and SMTP in
+  addition to PHP mail()
+* added DKIM digital signing functionality, new properties:
+  - DKIM_domain (sets the domain name)
+  - DKIM_private (holds DKIM private key)
+  - DKIM_passphrase (holds your DKIM passphrase)
+  - DKIM_selector (holds the DKIM "selector")
+  - DKIM_identity (holds the identifying email address)
+* added callback function support
+  - callback function parameters include:
+    result, to, cc, bcc, subject and body
+  - see the test/test_callback.php file for usage.
+* added "auto" identity functionality
+  - can automatically add:
+    - Return-path (if Sender not set)
+    - Reply-To (if ReplyTo not set)
+  - can be disabled:
+    - $mail->SetFrom('yourname at yourdomain.com','First Last',false);
+    - or by adding the $mail->Sender and/or $mail->ReplyTo properties
+
+Note: "auto" identity added to help with emails ending up in spam or junk boxes because of missing headers
+
+## Version 5.0.2 (May 24, 2009)
+* Fix for missing attachments when inline graphics are present
+* Fix for missing Cc in header when using SMTP (mail was sent,
+  but not displayed in header -- Cc receiver only saw email To:
+  line and no Cc line, but did get the email (To receiver
+  saw same)
+
+## Version 5.0.1 (April 05, 2009)
+* Temporary fix for missing attachments
+
+## Version 5.0.0 (April 02, 2009)
+With the release of this version, we are initiating a new version numbering
+system to differentiate from the PHP4 version of PHPMailer.
+Most notable in this release is fully object oriented code.
+
+### class.smtp.php:
+* Refactored class.smtp.php to support new exception handling
+* code size reduced from 29.2 Kb to 25.6 Kb
+* Removed unnecessary functions from class.smtp.php:
+  - public function Expand($name) {
+  - public function Help($keyword="") {
+  - public function Noop() {
+  - public function Send($from) {
+  - public function SendOrMail($from) {
+  - public function Verify($name) {
+
+###  class.phpmailer.php:
+* Refactored class.phpmailer.php with new exception handling
+* Changed processing functionality of Sendmail and Qmail so they cannot be
+  inadvertently used
+* removed getFile() function, just became a simple wrapper for
+  file_get_contents()
+* added check for PHP version (will gracefully exit if not at least PHP 5.0)
+* enhanced code to check if an attachment source is the same as an embedded or
+  inline graphic source to eliminate duplicate attachments
+
+### New /test_script
+We have written a test script you can use to test the script as part of your
+installation. Once you press submit, the test script will send a multi-mime
+email with either the message you type in or an HTML email with an inline
+graphic. Two attachments are included in the email (one of the attachments
+is also the inline graphic so you can see that only one copy of the graphic
+is sent in the email). The test script will also display the functional
+script that you can copy/paste to your editor to duplicate the functionality.
+
+### New examples
+All new examples in both basic and advanced modes. Advanced examples show
+   Exception handling.
+
+### PHPDocumentator (phpdocs) documentation for PHPMailer version 5.0.0
+All new documentation
+
+## Version 2.3 (November 06, 2008)
+* added Arabic language (many thanks to Bahjat Al Mostafa)
+* removed English language from language files and made it a default within
+  class.phpmailer.php - if no language is found, it will default to use
+  the english language translation
+* fixed public/private declarations
+* corrected line 1728, $basedir to $directory
+* added $sign_cert_file to avoid improper duplicate use of $sign_key_file
+* corrected $this->Hello on line 612 to $this->Helo
+* changed default of $LE to "\r\n" to comply with RFC 2822. Can be set by the user
+  if default is not acceptable
+* removed trim() from return results in EncodeQP
+* /test and three files it contained are removed from version 2.3
+* fixed phpunit.php for compliance with PHP5
+* changed $this->AltBody = $textMsg; to $this->AltBody = html_entity_decode($textMsg);
+* We have removed the /phpdoc from the downloads. All documentation is now on
+  the http://phpmailer.codeworxtech.com website.
+
+## Version 2.2.1 () July 19 2008
+* fixed line 1092 in class.smtp.php (my apologies, error on my part)
+
+## Version 2.2 () July 15 2008
+* Fixed redirect issue (display of UTF-8 in thank you redirect)
+* fixed error in getResponse function declaration (class.pop3.php)
+* PHPMailer now PHP6 compliant
+* fixed line 1092 in class.smtp.php (endless loop from missing = sign)
+
+## Version 2.1 (Wed, June 04 2008)
+NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS. IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE APPRECIATED.
+
+* added S/MIME functionality (ability to digitally sign emails)
+  BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
+  The "Signed Emails" functionality adds the Sign method to pass the private key
+  filename and the password to read it, and then email will be sent with
+  content-type multipart/signed and with the digital signature attached.
+* fully compatible with E_STRICT error level
+  - Please note:
+    In about half the test environments this development version was subjected
+    to, an error was thrown for the date() functions used (line 1565 and 1569).
+    This is NOT a PHPMailer error, it is the result of an incorrectly configured
+    PHP5 installation. The fix is to modify your 'php.ini' file and include the
+    date.timezone = Etc/UTC (or your own zone)
+    directive, to your own server timezone
+  - If you do get this error, and are unable to access your php.ini file:
+    In your PHP script, add
+    `date_default_timezone_set('Etc/UTC');`
+  - do not try to use
+    `$myVar = date_default_timezone_get();`
+    as a test, it will throw an error.
+* added ability to define path (mainly for embedded images)
+  function `MsgHTML($message,$basedir='')` ... where:
+  `$basedir` is the fully qualified path
+* fixed `MsgHTML()` function:
+  - Embedded Images where images are specified by `<protocol>://` will not be altered or embedded
+* fixed the return value of SMTP exit code ( pclose )
+* addressed issue of multibyte characters in subject line and truncating
+* added ability to have user specified Message ID
+  (default is still that PHPMailer create a unique Message ID)
+* corrected unidentified message type to 'application/octet-stream'
+* fixed chunk_split() multibyte issue (thanks to Colin Brown, et al).
+* added check for added attachments
+* enhanced conversion of HTML to text in MsgHTML (thanks to "brunny")
+
+## Version 2.1.0beta2 (Sun, Dec 02 2007)
+* implemented updated EncodeQP (thanks to coolbru, aka Marcus Bointon)
+* finished all testing, all known bugs corrected, enhancements tested
+
+Note: will NOT work with PHP4.
+
+Please note, this is BETA software **DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS; INTENDED STRICTLY FOR TESTING**
+
+## Version 2.1.0beta1
+Please note, this is BETA software
+** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
+ INTENDED STRICTLY FOR TESTING
+
+## Version 2.0.0 rc2 (Fri, Nov 16 2007), interim release
+* implements new property to control VERP in class.smtp.php
+  example (requires instantiating class.smtp.php):
+  $mail->do_verp = true;
+* POP-before-SMTP functionality included, thanks to Richard Davey
+  (see class.pop3.php & pop3_before_smtp_test.php for examples)
+* included example showing how to use PHPMailer with GMAIL
+* fixed the missing Cc in SendMail() and Mail()
+
+## Version 2.0.0 rc1 (Thu, Nov 08 2007), interim release
+* dramatically simplified using inline graphics ... it's fully automated and requires no user input
+* added automatic document type detection for attachments and pictures
+* added MsgHTML() function to replace Body tag for HTML emails
+* fixed the SendMail security issues (input validation vulnerability)
+* enhanced the AddAddresses functionality so that the "Name" portion is used in the email address
+* removed the need to use the AltBody method (set from the HTML, or default text used)
+* set the PHP Mail() function as the default (still support SendMail, SMTP Mail)
+* removed the need to set the IsHTML property (set automatically)
+* added Estonian language file by Indrek Päri
+* added header injection patch
+* added "set" method to permit users to create their own pseudo-properties like 'X-Headers', etc.
+* fixed warning message in SMTP get_lines method
+* added TLS/SSL SMTP support.
+* PHPMailer has been tested with PHP4 (4.4.7) and PHP5 (5.2.7)
+* Works with PHP installed as a module or as CGI-PHP
+NOTE: will NOT work with PHP5 in E_STRICT error mode
+
+## Version 1.73 (Sun, Jun 10 2005)
+* Fixed denial of service bug: http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
+* Now has a total of 20 translations
+* Fixed alt attachments bug: http://tinyurl.com/98u9k
+
+## Version 1.72 (Wed, May 25 2004)
+* Added Dutch, Swedish, Czech, Norwegian, and Turkish translations.
+* Received: Removed this method because spam filter programs like
+  SpamAssassin reject this header.
+* Fixed error count bug.
+* SetLanguage default is now "language/".
+* Fixed magic_quotes_runtime bug.
+
+## Version 1.71 (Tue, Jul 28 2003)
+* Made several speed enhancements
+* Added German and Italian translation files
+* Fixed HELO/AUTH bugs on keep-alive connects
+* Now provides an error message if language file does not load
+* Fixed attachment EOL bug
+* Updated some unclear documentation
+* Added additional tests and improved others
+
+## Version 1.70 (Mon, Jun 20 2003)
+* Added SMTP keep-alive support
+* Added IsError method for error detection
+* Added error message translation support (SetLanguage)
+* Refactored many methods to increase library performance
+* Hello now sends the newer EHLO message before HELO as per RFC 2821
+* Removed the boundary class and replaced it with GetBoundary
+* Removed queue support methods
+* New $Hostname variable
+* New Message-ID header
+* Received header reformat
+* Helo variable default changed to $Hostname
+* Removed extra spaces in Content-Type definition (#667182)
+* Return-Path should be set to Sender when set
+* Adds Q or B encoding to headers when necessary
+* quoted-encoding should now encode NULs \000
+* Fixed encoding of body/AltBody (#553370)
+* Adds "To: undisclosed-recipients:;" when all recipients are hidden (BCC)
+* Multiple bug fixes
+
+## Version 1.65 (Fri, Aug 09 2002)
+* Fixed non-visible attachment bug (#585097) for Outlook
+* SMTP connections are now closed after each transaction
+* Fixed SMTP::Expand return value
+* Converted SMTP class documentation to phpDocumentor format
+
+## Version 1.62 (Wed, Jun 26 2002)
+* Fixed multi-attach bug
+* Set proper word wrapping
+* Reduced memory use with attachments
+* Added more debugging
+* Changed documentation to phpDocumentor format
+
+## Version 1.60 (Sat, Mar 30 2002)
+* Sendmail pipe and address patch (Christian Holtje)
+* Added embedded image and read confirmation support (A. Ognio)
+* Added unit tests
+* Added SMTP timeout support (*nix only)
+* Added possibly temporary PluginDir variable for SMTP class
+* Added LE message line ending variable
+* Refactored boundary and attachment code
+* Eliminated SMTP class warnings
+* Added SendToQueue method for future queuing support
+
+## Version 1.54 (Wed, Dec 19 2001)
+* Add some queuing support code
+* Fixed a pesky multi/alt bug
+* Messages are no longer forced to have "To" addresses
+
+## Version 1.50 (Thu, Nov 08 2001)
+* Fix extra lines when not using SMTP mailer
+* Set WordWrap variable to int with a zero default
+
+## Version 1.47 (Tue, Oct 16 2001)
+* Fixed Received header code format
+* Fixed AltBody order error
+* Fixed alternate port warning
+
+## Version 1.45 (Tue, Sep 25 2001)
+* Added enhanced SMTP debug support
+* Added support for multiple ports on SMTP
+* Added Received header for tracing
+* Fixed AddStringAttachment encoding
+* Fixed possible header name quote bug
+* Fixed wordwrap() trim bug
+* Couple other small bug fixes
+
+## Version 1.41 (Wed, Aug 22 2001)
+* Fixed AltBody bug w/o attachments
+* Fixed rfc_date() for certain mail servers
+
+## Version 1.40 (Sun, Aug 12 2001)
+* Added multipart/alternative support (AltBody)
+* Documentation update
+* Fixed bug in Mercury MTA
+
+## Version 1.29 (Fri, Aug 03 2001)
+* Added AddStringAttachment() method
+* Added SMTP authentication support
+
+## Version 1.28 (Mon, Jul 30 2001)
+* Fixed a typo in SMTP class
+* Fixed header issue with Imail (win32) SMTP server
+* Made fopen() calls for attachments use "rb" to fix win32 error
+
+## Version 1.25 (Mon, Jul 02 2001)
+* Added RFC 822 date fix (Patrice)
+* Added improved error handling by adding a $ErrorInfo variable
+* Removed MailerDebug variable (obsolete with new error handler)
+
+## Version 1.20 (Mon, Jun 25 2001)
+* Added quoted-printable encoding (Patrice)
+* Set Version as public and removed PrintVersion()
+* Changed phpdoc to only display public variables and methods
+
+## Version 1.19 (Thu, Jun 21 2001)
+* Fixed MS Mail header bug
+* Added fix for Bcc problem with mail(). *Does not work on Win32*
+  (See PHP bug report: http://www.php.net/bugs.php?id=11616)
+* mail() no longer passes a fifth parameter when not needed
+
+## Version 1.15 (Fri, Jun 15 2001)
+Note: these changes contributed by Patrice Fournier
+* Changed all remaining \n to \r\n
+* Bcc: header no longer written to message except
+  when sent directly to sendmail
+* Added a small message to non-MIME compliant mail reader
+* Added Sender variable to change the Sender email
+  used in -f for sendmail/mail and in 'MAIL FROM' for smtp mode
+* Changed boundary setting to a place it will be set only once
+* Removed transfer encoding for whole message when using multipart
+* Message body now uses Encoding in multipart messages
+* Can set encoding and type to attachments 7bit, 8bit
+  and binary attachment are sent as is, base64 are encoded
+* Can set Encoding to base64 to send 8 bits body
+  through 7 bits servers
+
+## Version 1.10 (Tue, Jun 12 2001)
+* Fixed win32 mail header bug (printed out headers in message body)
+
+## Version 1.09 (Fri, Jun 08 2001)
+* Changed date header to work with Netscape mail programs
+* Altered phpdoc documentation
+
+## Version 1.08 (Tue, Jun 05 2001)
+* Added enhanced error-checking
+* Added phpdoc documentation to source
+
+## Version 1.06 (Fri, Jun 01 2001)
+* Added optional name for file attachments
+
+## Version 1.05 (Tue, May 29 2001)
+* Code cleanup
+* Eliminated sendmail header warning message
+* Fixed possible SMTP error
+
+## Version 1.03 (Thu, May 24 2001)
+* Fixed problem where qmail sends out duplicate messages
+
+## Version 1.02 (Wed, May 23 2001)
+* Added multiple recipient and attachment Clear* methods
+* Added Sendmail public variable
+* Fixed problem with loading SMTP library multiple times
+
+## Version 0.98 (Tue, May 22 2001)
+* Fixed problem with redundant mail hosts sending out multiple messages
+* Added additional error handler code
+* Added AddCustomHeader() function
+* Added support for Microsoft mail client headers (affects priority)
+* Fixed small bug with Mailer variable
+* Added PrintVersion() function
+
+## Version 0.92 (Tue, May 15 2001)
+* Changed file names to class.phpmailer.php and class.smtp.php to match
+  current PHP class trend.
+* Fixed problem where body not being printed when a message is attached
+* Several small bug fixes
+
+## Version 0.90 (Tue, April 17 2001)
+* Initial public release

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/composer.json
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/composer.json	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/composer.json	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,54 @@
+{
+    "name": "phpmailer/phpmailer",
+    "type": "library",
+    "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
+    "authors": [
+        {
+            "name": "Marcus Bointon",
+            "email": "phpmailer at synchromedia.co.uk"
+        },
+        {
+            "name": "Jim Jagielski",
+            "email": "jimjag at gmail.com"
+        },
+        {
+            "name": "Andy Prevost",
+            "email": "codeworxtech at users.sourceforge.net"
+        },
+        {
+            "name": "Brent R. Matzelle"
+        }
+    ],
+    "require": {
+        "php": ">=5.5.0",
+        "ext-ctype": "*"
+    },
+    "require-dev": {
+        "friendsofphp/php-cs-fixer": "^2.2",
+        "phpdocumentor/phpdocumentor": "2.*",
+        "phpunit/phpunit": "^4.8 || ^5.7",
+        "zendframework/zend-serializer": "2.7.*",
+        "doctrine/annotations": "1.2.*",
+        "zendframework/zend-eventmanager": "3.0.*",
+        "zendframework/zend-i18n": "2.7.3"
+    },
+    "suggest": {
+        "psr/log": "For optional PSR-3 debug logging",
+        "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
+        "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
+        "stevenmaguire/oauth2-microsoft": "Needed for Microsoft XOAUTH2 authentication",
+        "ext-mbstring": "Needed to send email in multibyte encoding charset",
+        "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
+    },
+    "autoload": {
+        "psr-4": {
+            "PHPMailer\\PHPMailer\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "PHPMailer\\Test\\": "test/"
+        }
+    },
+    "license": "LGPL-2.1"
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/docs/README.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/docs/README.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/docs/README.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,7 @@
+# PHPMailer Documentation
+
+Pre-built PHPMailer API documentation is not provided with the PHP classes, but you can generate API documentation by running `phpdoc` in the top-level folder of this project, and documentation will be generated in this folder. You will need to have [phpDocumentor](https://www.phpdoc.org) installed, though you will already have that if you installed PHPMailer using composer with dev modules enabled. This documentation is also [available online](http://phpmailer.github.io/PHPMailer/), though it may not be quite up to date or match your version exactly. The configuration for phpdoc is in the [phpdoc.dist.xml file](https://github.com/PHPMailer/PHPMailer/blob/master/phpdoc.dist.xml).
+
+Further help and information is available in [the PHPMailer README](https://github.com/PHPMailer/PHPMailer/blob/master/README.md), [the examples folder](https://github.com/PHPMailer/PHPMailer/tree/master/examples), and in [the GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki).
+
+Fixes and additions to documentation are welcome - please submit pull requests or improve wiki pages.
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_gen_keys.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_gen_keys.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_gen_keys.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,77 @@
+<?php
+/**
+ * This shows how to make a new public/private key pair suitable for use with DKIM.
+ * You should only need to do this once, and the public key (**not** the private key!)
+ * you generate should be inserted in your DNS matching the selector you want.
+ *
+ * You can also use the DKIM wizard here: https://www.port25.com/support/domainkeysdkim-wizard/
+ * but be aware that having your private key known anywhere outside your own server
+ * is a security risk, and it's easy enough to create your own on your own server.
+ *
+ * For security, any keys you create should not be accessible via your web site.
+ *
+ * 2048 bits is the recommended minimum key length - gmail won't accept less than 1024 bits.
+ * To test your DKIM config, use Port25's DKIM tester:
+ * https://www.port25.com/support/authentication-center/email-verification/
+ *
+ * Note that you only need a *private* key to *send* a DKIM-signed message,
+ * but receivers need your *public* key in order to verify it.
+ *
+ * Your public key will need to be formatted appropriately for your DNS and
+ * inserted there using the selector you want to use.
+ */
+
+//Set these to match your domain and chosen DKIM selector
+$domain = 'example.com';
+$selector = 'phpmailer';
+
+//Path to your private key:
+$privatekeyfile = 'dkim_private.pem';
+//Path to your public key:
+$publickeyfile = 'dkim_public.pem';
+
+if (file_exists($privatekeyfile)) {
+    echo "Using existing keys - if you want to generate new keys, delete old key files first.\n\n";
+    $privatekey = file_get_contents($privatekeyfile);
+    $publickey = file_get_contents($publickeyfile);
+} else {
+    //Create a 2048-bit RSA key with an SHA256 digest
+    $pk = openssl_pkey_new(
+        [
+            'digest_alg' => 'sha256',
+            'private_key_bits' => 2048,
+            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+        ]
+    );
+    //Save private key
+    openssl_pkey_export_to_file($pk, $privatekeyfile);
+    //Save public key
+    $pubKey = openssl_pkey_get_details($pk);
+    $publickey = $pubKey['key'];
+    file_put_contents($publickeyfile, $publickey);
+    $privatekey = file_get_contents($privatekeyfile);
+}
+echo "Private key (keep this private!):\n\n" . $privatekey;
+echo "\n\nPublic key:\n\n" . $publickey;
+
+//Prep public key for DNS, e.g.
+//phpmailer._domainkey.example.com IN TXT "v=DKIM1; h=sha256; t=s; p=" "MIIBIjANBg...oXlwIDAQAB"...
+$dnskey = "$selector._domainkey.$domain IN TXT";
+//Some DNS server don't like ; chars unless backslash-escaped
+$dnsvalue = '"v=DKIM1\; h=sha256\; t=s\; p=" ';
+
+//Strip and split the key into smaller parts and format for DNS
+//Many DNS systems don't like long TXT entries
+//but are OK if it's split into 255-char chunks
+//Remove PEM wrapper
+$publickey = preg_replace('/^-+.*?-+$/m', '', $publickey);
+//Strip line breaks
+$publickey = str_replace(["\r", "\n"], '', $publickey);
+//Split into chunks
+$keyparts = str_split($publickey, 253); //Becomes 255 when quotes are included
+//Quote each chunk
+foreach ($keyparts as $keypart) {
+    $dnsvalue .= '"' . trim($keypart) . '" ';
+}
+echo "\n\nDNS key:\n\n" . trim($dnskey);
+echo "\n\nDNS value:\n\n" . trim($dnsvalue);

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_sign.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_sign.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/DKIM_sign.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,41 @@
+<?php
+/**
+ * This example shows sending a DKIM-signed message with PHPMailer.
+ * More info about DKIM can be found here: http://www.dkim.org/info/dkim-faq.html
+ * There's more to using DKIM than just this code - check out this article:
+ * @see https://yomotherboard.com/how-to-setup-email-server-dkim-keys/
+ * See also the DKIM_gen_keys example code in the examples folder,
+ * which shows how to make a key pair from PHP.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+//Usual setup
+$mail = new PHPMailer;
+$mail->setFrom('from at example.com', 'First Last');
+$mail->addAddress('whoto at example.com', 'John Doe');
+$mail->Subject = 'PHPMailer mail() test';
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+
+//This should be the same as the domain of your From address
+$mail->DKIM_domain = 'example.com';
+//See the DKIM_gen_keys.phps script for making a key pair -
+//here we assume you've already done that.
+//Path to your private key:
+$mail->DKIM_private = 'dkim_private.pem';
+//Set this to your own selector
+$mail->DKIM_selector = 'phpmailer';
+//Put your private key's passphrase in here if it has one
+$mail->DKIM_passphrase = '';
+//The identity you're signing as - usually your From address
+$mail->DKIM_identity = $mail->From;
+
+//When you send, the DKIM settings will be used to sign the message
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/README.md
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/README.md	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/README.md	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,97 @@
+# PHPMailer code examples[![PHPMailer logo](images/phpmailer.png)](https://github.com/PHPMailer/PHPMailer)
+
+This folder contains a collection of examples of using [PHPMailer](https://github.com/PHPMailer/PHPMailer).
+
+## About testing email sending
+
+When working on email sending code you'll find yourself worrying about what might happen if all these test emails got sent to your mailing list. The solution is to use a fake mail server, one that acts just like the real thing, but just doesn't actually send anything out. Some offer web interfaces, feedback, logging, the ability to return specific error codes, all things that are useful for testing error handling, authentication etc. Here's a selection of mail testing tools you might like to try:
+
+*   [FakeSMTP](https://github.com/Nilhcem/FakeSMTP), a Java desktop app with the ability to show an SMTP log and save messages to a folder.
+*   [FakeEmail](https://github.com/isotoma/FakeEmail), a Python-based fake mail server with a web interface.
+*   [smtp-sink](http://www.postfix.org/smtp-sink.1.html), part of the Postfix mail server, so you may have this installed already. This is used in the Travis-CI configuration to run PHPMailer's unit tests.
+*   [smtp4dev](http://smtp4dev.codeplex.com), a dummy SMTP server for Windows.
+*   [fakesendmail.sh](https://github.com/PHPMailer/PHPMailer/blob/master/test/fakesendmail.sh), part of PHPMailer's test setup, this is a shell script that emulates sendmail for testing 'mail' or 'sendmail' methods in PHPMailer.
+*   [msglint](http://tools.ietf.org/tools/msglint/), not a mail server, the IETF's MIME structure analyser checks the formatting of your messages.
+
+Most of these examples use the `example.com` and `example.net` domains. These domains are reserved by IANA for illustrative purposes, as documented in [RFC 2606](http://tools.ietf.org/html/rfc2606). Don't use made-up domains like 'mydomain.com' or 'somedomain.com' in examples as someone, somewhere, probably owns them!
+
+## Security note
+Before running these examples in a web server, you'll need to rename them with '.php' extensions. They are supplied as '.phps' files which will usually be displayed with syntax highlighting by PHP instead of running them. This prevents potential security issues with running potential spam-gateway code if you happen to deploy these code examples on a live site - _please don't do that!_
+
+Similarly, don't leave your passwords in these files as they will be visible to the world!
+
+## [code_generator.phps](code_generator.phps)
+
+This script is a simple code generator - fill in the form and hit submit, and it will use what you entered to email you a message, and will also generate PHP code using your settings that you can copy and paste to use in your own apps.
+
+## [mail.phps](mail.phps)
+
+This is a basic example which creates an email message from an external HTML file, creates a plain text body, sets various addresses, adds an attachment and sends the message. It uses PHP's built-in mail() function which is the simplest to use, but relies on the presence of a local mail server, something which is not usually available on Windows. If you find yourself in that situation, either install a local mail server, or use a remote one and send using SMTP instead.
+
+## [simple_contact_form.phps](simple_contact_form.phps)
+
+This is probably the most common reason for using PHPMailer - building a contact form. This example has a basic, unstyled form and also illustrates how to filter input data before using it, how to validate addresses, how to avoid being abused as a spam gateway, and how to address messages correctly so that you don't fail SPF checks.
+
+## [exceptions.phps](exceptions.phps)
+
+Like the mail example, but shows how to use PHPMailer's optional exceptions for error handling.
+
+## [extending.phps](extending.phps)
+
+This shows how to create a subclass of PHPMailer to customise its behaviour and simplify coding in your app.
+
+## [smtp.phps](smtp.phps)
+
+A simple example sending using SMTP with authentication.
+
+## [smtp_no_auth.phps](smtp_no_auth.phps)
+
+A simple example sending using SMTP without authentication.
+
+## [send_file_upload.phps](send_file_upload.phps)
+
+Lots of people want to do this... This is a simple form which accepts a file upload and emails it.
+
+## [send_multiple_file_upload.phps](send_multiple_file_upload.phps)
+
+A slightly more complex form that allows uploading multiple files at once and sends all of them as attachments to an email.
+
+## [sendmail.phps](sendmail.phps)
+
+A simple example using sendmail. Sendmail is a program (usually found on Linux/BSD, OS X and other UNIX-alikes) that can be used to submit messages to a local mail server without a lengthy SMTP conversation. It's probably the fastest sending mechanism, but lacks some error reporting features. There are sendmail emulators for most popular mail servers including postfix, qmail, exim etc.
+
+## [gmail.phps](gmail.phps)
+
+Submitting email via Google's Gmail service is a popular use of PHPMailer. It's much the same as normal SMTP sending, just with some specific settings, namely using TLS encryption, authentication is enabled, and it connects to the SMTP submission port 587 on the smtp.gmail.com host. This example does all that.
+
+## [gmail_xoauth.phps](gmail_xoauth.phps)
+
+Gmail now likes you to use XOAUTH2 for SMTP authentication. This is extremely laborious to set up, but once it's done you can use it repeatedly and will no longer need Gmail's ineptly-named "Allow less secure apps" setting enabled. [Read the guide in the wiki](https://github.com/PHPMailer/PHPMailer/wiki/Using-Gmail-with-XOAUTH2) for how to set it up.
+
+## [pop_before_smtp.phps](pop_before_smtp.phps)
+
+Back in the stone age, before effective SMTP authentication mechanisms were available, it was common for ISPs to use POP-before-SMTP authentication. As it implies, you authenticate using the POP3 protocol (an older protocol now mostly replaced by the far superior IMAP), and then the SMTP server will allow send access from your IP address for a short while, usually 5-15 minutes. PHPMailer includes a basic POP3 protocol client with just enough functionality to carry out this sequence - it's just like a normal SMTP conversation (without authentication), but connects via POP3 first.
+
+## [mailing_list.phps](mailing_list.phps)
+
+This is a somewhat naïve, but reasonably efficient example of sending similar emails to a list of different addresses. It sets up a PHPMailer instance using SMTP, then connects to a MySQL database to retrieve a list of recipients. The code loops over this list, sending email to each person using their info and marks them as sent in the database. It makes use of SMTP keepalive which saves reconnecting and re-authenticating between each message.
+
+## [ssl_options.phps](ssl_options.phps)
+
+PHP 5.6 introduced SSL certificate verification by default, and this applies to mail servers exactly as it does to web servers. Unfortunately, SSL misconfiguration in mail servers is quite common, so this caused a common problem: those that were previously using servers with bad configs suddenly found they stopped working when they upgraded PHP. PHPMailer provides a mechanism to disable SSL certificate verification as a workaround and this example shows how to do it. Bear in mind that this is **not** a good approach - the right way is to fix your mail server config!
+
+## [smime_signed_mail.phps](smime_signed_mail.phps)
+
+An example of how to sign messages using [S/MIME](https://en.wikipedia.org/wiki/S/MIME), ensuring that your data can't be tampered with in transit, and proves to recipients that it was you that sent it.
+
+* * *
+
+## [smtp_check.phps](smtp_check.phps)
+
+This is an example showing how to use the SMTP class by itself (without PHPMailer) to check an SMTP connection.
+
+## [smtp_low_memory.phps](smtp_low_memory.phps)
+
+This demonstrates how to extend the SMTP class and make PHPMailer use it. In this case it's an effort to make the SMTP class use less memory when sending large attachments.
+
+* * *

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/callback.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/callback.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/callback.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,75 @@
+<?php
+/**
+ * This example shows how to use a callback function from PHPMailer.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require '../vendor/autoload.php';
+
+/**
+ * Example PHPMailer callback function.
+ * This is a global function, but you can also pass a closure (or any other callable)
+ * to the `action_function` property.
+ *
+ * @param bool   $result  result of the send action
+ * @param array  $to      email address of the recipient
+ * @param array  $cc      cc email addresses
+ * @param array  $bcc     bcc email addresses
+ * @param string $subject the subject
+ * @param string $body    the email body
+ */
+function callbackAction($result, $to, $cc, $bcc, $subject, $body)
+{
+    echo "Message subject: \"$subject\"\n";
+    foreach ($to as $address) {
+        echo "Message to {$address[1]} <{$address[0]}>\n";
+    }
+    foreach ($cc as $address) {
+        echo "Message CC to {$address[1]} <{$address[0]}>\n";
+    }
+    foreach ($bcc as $toaddress) {
+        echo "Message BCC to {$toaddress[1]} <{$toaddress[0]}>\n";
+    }
+    if ($result) {
+        echo "Message sent successfully\n";
+    } else {
+        echo "Message send failed\n";
+    }
+}
+
+require_once '../vendor/autoload.php';
+
+$mail = new PHPMailer;
+
+try {
+    $mail->isMail();
+    $mail->setFrom('you at example.com', 'Your Name');
+    $mail->addAddress('jane at example.com', 'Jane Doe');
+    $mail->addCC('john at example.com', 'John Doe');
+    $mail->Subject = 'PHPMailer Test Subject';
+    $mail->msgHTML(file_get_contents('../examples/contents.html'));
+    // optional - msgHTML will create an alternate automatically
+    $mail->AltBody = 'To view the message, please use an HTML compatible email viewer!';
+    $mail->addAttachment('images/phpmailer_mini.png'); // attachment
+    $mail->action_function = 'callbackAction';
+    $mail->send();
+} catch (Exception $e) {
+    echo $e->errorMessage();
+}
+
+//Alternative approach using a closure
+try {
+    $mail->action_function = function ($result, $to, $cc, $bcc, $subject, $body) {
+        if ($result) {
+            echo "Message sent successfully\n";
+        } else {
+            echo "Message send failed\n";
+        }
+    };
+    $mail->send();
+} catch (Exception $e) {
+    echo $e->errorMessage();
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contactform.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contactform.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contactform.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,71 @@
+<?php
+/**
+ * This example shows how to handle a simple contact form.
+ */
+
+$msg = '';
+//Don't run this unless we're handling a form submission
+if (array_key_exists('email', $_POST)) {
+    date_default_timezone_set('Etc/UTC');
+
+    require '../PHPMailerAutoload.php';
+
+    //Create a new PHPMailer instance
+    $mail = new PHPMailer;
+    //Tell PHPMailer to use SMTP - requires a local mail server
+    //Faster and safer than using mail()
+    $mail->isSMTP();
+    $mail->Host = 'localhost';
+    $mail->Port = 25;
+
+    //Use a fixed address in your own domain as the from address
+    //**DO NOT** use the submitter's address here as it will be forgery
+    //and will cause your messages to fail SPF checks
+    $mail->setFrom('from at example.com', 'First Last');
+    //Send the message to yourself, or whoever should receive contact for submissions
+    $mail->addAddress('whoto at example.com', 'John Doe');
+    //Put the submitter's address in a reply-to header
+    //This will fail if the address provided is invalid,
+    //in which case we should ignore the whole request
+    if ($mail->addReplyTo($_POST['email'], $_POST['name'])) {
+        $mail->Subject = 'PHPMailer contact form';
+        //Keep it simple - don't use HTML
+        $mail->isHTML(false);
+        //Build a simple message body
+        $mail->Body = <<<EOT
+Email: {$_POST['email']}
+Name: {$_POST['name']}
+Message: {$_POST['message']}
+EOT;
+        //Send the message, check for errors
+        if (!$mail->send()) {
+            //The reason for failing to send will be in $mail->ErrorInfo
+            //but you shouldn't display errors to users - process the error, log it on your server.
+            $msg = 'Sorry, something went wrong. Please try again later.';
+        } else {
+            $msg = 'Message sent! Thanks for contacting us.';
+        }
+    } else {
+        $msg = 'Invalid email address, message ignored.';
+    }
+}
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Contact form</title>
+</head>
+<body>
+<h1>Contact us</h1>
+<?php if (!empty($msg)) {
+    echo "<h2>$msg</h2>";
+} ?>
+<form method="POST">
+    <label for="name">Name: <input type="text" name="name" id="name"></label><br>
+    <label for="email">Email address: <input type="email" name="email" id="email"></label><br>
+    <label for="message">Message: <textarea name="message" id="message" rows="8" cols="20"></textarea></label><br>
+    <input type="submit" value="Send">
+</form>
+</body>
+</html>

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contents.html
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contents.html	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contents.html	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <title>PHPMailer Test</title>
+</head>
+<body>
+<div style="width: 640px; font-family: Arial, Helvetica, sans-serif; font-size: 11px;">
+  <h1>This is a test of PHPMailer.</h1>
+  <div align="center">
+    <a href="https://github.com/PHPMailer/PHPMailer/"><img src="images/phpmailer.png" height="90" width="340" alt="PHPMailer rocks"></a>
+  </div>
+  <p>This example uses <strong>HTML</strong>.</p>
+  <p>ISO-8859-1 text: éèîüçÅñæß</p>
+</div>
+</body>
+</html>

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contentsutf8.html
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contentsutf8.html	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/contentsutf8.html	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <title>PHPMailer Test</title>
+</head>
+<body>
+<div style="width: 640px; font-family: Arial, Helvetica, sans-serif; font-size: 11px;">
+  <h1>This is a test of PHPMailer.</h1>
+  <div align="center">
+    <a href="https://github.com/PHPMailer/PHPMailer/"><img src="images/phpmailer.png" height="90" width="340" alt="PHPMailer rocks"></a>
+  </div>
+  <p>This example uses <strong>HTML</strong> with the UTF-8 unicode charset.</p>
+  <p>Chinese text: 郵件內容為空</p>
+  <p>Russian text: Пустое тело сообщения</p>
+  <p>Armenian text: Հաղորդագրությունը դատարկ է</p>
+  <p>Czech text: Prázdné tělo zprávy</p>
+  <p>Emoji: <span style="font-size: 48px">😂 🦄 💥 📤 📧</span></p>
+  <p>Image data URL (base64)<img src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==" alt="#"></p>
+  <p>Image data URL (URL-encoded)<img src="data:image/gif,GIF89a%01%00%01%00%00%00%00%21%F9%04%01%0A%00%01%00%2C%00%00%00%00%01%00%01%00%00%02%02L%01%00%3B" alt="#"></p>
+</div>
+</body>
+</html>

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/exceptions.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/exceptions.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/exceptions.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * This example shows how to make use of PHPMailer's exceptions for error handling.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+//Passing true to the constructor enables the use of exceptions for error handling
+$mail = new PHPMailer(true);
+try {
+    //Set who the message is to be sent from
+    $mail->setFrom('from at example.com', 'First Last');
+    //Set an alternative reply-to address
+    $mail->addReplyTo('replyto at example.com', 'First Last');
+    //Set who the message is to be sent to
+    $mail->addAddress('whoto at example.com', 'John Doe');
+    //Set the subject line
+    $mail->Subject = 'PHPMailer Exceptions test';
+    //Read an HTML message body from an external file, convert referenced images to embedded,
+    //and convert the HTML into a basic plain-text alternative body
+    $mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+    //Replace the plain text body with one created manually
+    $mail->AltBody = 'This is a plain-text message body';
+    //Attach an image file
+    $mail->addAttachment('images/phpmailer_mini.png');
+    //send the message
+    //Note that we don't need check the response from this because it will throw an exception if it has trouble
+    $mail->send();
+    echo 'Message sent!';
+} catch (Exception $e) {
+    echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (\Exception $e) { //The leading slash means the Global PHP Exception class will be caught
+    echo $e->getMessage(); //Boring error messages from anything else!
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/extending.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/extending.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/extending.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,70 @@
+<?php
+/**
+ * This example shows how to extend PHPMailer to simplify your coding.
+ * If PHPMailer doesn't do something the way you want it to, or your code
+ * contains too much boilerplate, don't edit the library files,
+ * create a subclass instead and customise that.
+ * That way all your changes will be retained when PHPMailer is updated.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require '../vendor/autoload.php';
+
+/**
+ * Use PHPMailer as a base class and extend it
+ */
+class myPHPMailer extends PHPMailer
+{
+    /**
+     * myPHPMailer constructor.
+     *
+     * @param bool|null $exceptions
+     * @param string    $body A default HTML message body
+     */
+    public function __construct($exceptions, $body = '')
+    {
+        //Don't forget to do this or other things may not be set correctly!
+        parent::__construct($exceptions);
+        //Set a default 'From' address
+        $this->setFrom('joe at example.com', 'Joe User');
+        //Send via SMTP
+        $this->isSMTP();
+        //Equivalent to setting `Host`, `Port` and `SMTPSecure` all at once
+        $this->Host = 'tls://smtp.example.com:587';
+        //Set an HTML and plain-text body, import relative image references
+        $this->msgHTML($body, './images/');
+        //Show debug output
+        $this->SMTPDebug = 2;
+        //Inject a new debug output handler
+        $this->Debugoutput = function ($str, $level) {
+            echo "Debug level $level; message: $str\n";
+        };
+    }
+
+    //Extend the send function
+    public function send()
+    {
+        $this->Subject = '[Yay for me!] ' . $this->Subject;
+        $r = parent::send();
+        echo "I sent a message with subject " . $this->Subject;
+
+        return $r;
+    }
+}
+
+//Now creating and sending a message becomes simpler when you use this class in your app code
+try {
+    //Instantiate your new class, making use of the new `$body` parameter
+    $mail = new myPHPMailer(true, '<strong>This is the message body</strong>');
+    // Now you only need to set things that are different from the defaults you defined
+    $mail->addAddress('jane at example.com', 'Jane User');
+    $mail->Subject = 'Here is the subject';
+    $mail->addAttachment(__FILE__, 'myPHPMailer.php');
+    $mail->send(); //no need to check for errors - the exception handler will do it
+} catch (Exception $e) {
+    //Note that this is catching the PHPMailer Exception class, not the global \Exception type!
+    echo "Caught a " . get_class($e) . ": " . $e->getMessage();
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,98 @@
+<?php
+/**
+ * This example shows settings to use when sending via Google's Gmail servers.
+ * This uses traditional id & password authentication - look at the gmail_xoauth.phps
+ * example to see how to use XOAUTH2.
+ * The IMAP section shows how to save this message to the 'Sent Mail' folder using IMAP commands.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+
+//Tell PHPMailer to use SMTP
+$mail->isSMTP();
+
+//Enable SMTP debugging
+// 0 = off (for production use)
+// 1 = client messages
+// 2 = client and server messages
+$mail->SMTPDebug = 2;
+
+//Set the hostname of the mail server
+$mail->Host = 'smtp.gmail.com';
+// use
+// $mail->Host = gethostbyname('smtp.gmail.com');
+// if your network does not support SMTP over IPv6
+
+//Set the SMTP port number - 587 for authenticated TLS, a.k.a. RFC4409 SMTP submission
+$mail->Port = 587;
+
+//Set the encryption system to use - ssl (deprecated) or tls
+$mail->SMTPSecure = 'tls';
+
+//Whether to use SMTP authentication
+$mail->SMTPAuth = true;
+
+//Username to use for SMTP authentication - use full email address for gmail
+$mail->Username = "username at gmail.com";
+
+//Password to use for SMTP authentication
+$mail->Password = "yourpassword";
+
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+
+//Set the subject line
+$mail->Subject = 'PHPMailer GMail SMTP test';
+
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+    //Section 2: IMAP
+    //Uncomment these to save your message in the 'Sent Mail' folder.
+    #if (save_mail($mail)) {
+    #    echo "Message saved!";
+    #}
+}
+
+//Section 2: IMAP
+//IMAP commands requires the PHP IMAP Extension, found at: https://php.net/manual/en/imap.setup.php
+//Function to call which uses the PHP imap_*() functions to save messages: https://php.net/manual/en/book.imap.php
+//You can use imap_getmailboxes($imapStream, '/imap/ssl') to get a list of available folders or labels, this can
+//be useful if you are trying to get this working on a non-Gmail IMAP server.
+function save_mail($mail)
+{
+    //You can change 'Sent Mail' to any other folder or tag
+    $path = "{imap.gmail.com:993/imap/ssl}[Gmail]/Sent Mail";
+
+    //Tell your server to open an IMAP connection using the same username and password as you used for SMTP
+    $imapStream = imap_open($path, $mail->Username, $mail->Password);
+
+    $result = imap_append($imapStream, $path, $mail->getSentMIMEMessage());
+    imap_close($imapStream);
+
+    return $result;
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail_xoauth.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail_xoauth.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/gmail_xoauth.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,105 @@
+<?php
+/**
+ * This example shows how to send via Google's Gmail servers using XOAUTH2 authentication.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\OAuth;
+
+// Alias the League Google OAuth2 provider class
+use League\OAuth2\Client\Provider\Google;
+
+//SMTP needs accurate times, and the PHP time zone MUST be set
+//This should be done in your php.ini, but this is how to do it if you don't have access to that
+date_default_timezone_set('Etc/UTC');
+
+//Load dependencies from composer
+//If this causes an error, run 'composer install'
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+
+//Tell PHPMailer to use SMTP
+$mail->isSMTP();
+
+//Enable SMTP debugging
+// 0 = off (for production use)
+// 1 = client messages
+// 2 = client and server messages
+$mail->SMTPDebug = 2;
+
+//Set the hostname of the mail server
+$mail->Host = 'smtp.gmail.com';
+
+//Set the SMTP port number - 587 for authenticated TLS, a.k.a. RFC4409 SMTP submission
+$mail->Port = 587;
+
+//Set the encryption system to use - ssl (deprecated) or tls
+$mail->SMTPSecure = 'tls';
+
+//Whether to use SMTP authentication
+$mail->SMTPAuth = true;
+
+//Set AuthType to use XOAUTH2
+$mail->AuthType = 'XOAUTH2';
+
+//Fill in authentication details here
+//Either the gmail account owner, or the user that gave consent
+$email = 'someone at gmail.com';
+$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+
+//Obtained by configuring and running get_oauth_token.php
+//after setting up an app in Google Developer Console.
+$refreshToken = 'RANDOMCHARS-----DWxgOvPT003r-yFUV49TQYag7_Aod7y0';
+
+//Create a new OAuth2 provider instance
+$provider = new Google(
+    [
+        'clientId' => $clientId,
+        'clientSecret' => $clientSecret,
+    ]
+);
+
+//Pass the OAuth provider instance to PHPMailer
+$mail->setOAuth(
+    new OAuth(
+        [
+            'provider' => $provider,
+            'clientId' => $clientId,
+            'clientSecret' => $clientSecret,
+            'refreshToken' => $refreshToken,
+            'userName' => $email,
+        ]
+    )
+);
+
+//Set who the message is to be sent from
+//For gmail, this generally needs to be the same as the user you logged in as
+$mail->setFrom($email, 'First Last');
+
+//Set who the message is to be sent to
+$mail->addAddress('someone at gmail.com', 'John Doe');
+
+//Set the subject line
+$mail->Subject = 'PHPMailer GMail XOAUTH2 SMTP test';
+
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->CharSet = 'utf-8';
+$mail->msgHTML(file_get_contents('contentsutf8.html'), __DIR__);
+
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png
===================================================================
(Binary files differ)

Index: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png	2018-08-09 12:30:02 UTC (rev 9936)

Property changes on: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png
===================================================================
(Binary files differ)

Index: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png	2018-08-08 15:49:05 UTC (rev 9935)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png	2018-08-09 12:30:02 UTC (rev 9936)

Property changes on: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/images/phpmailer_mini.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mail.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mail.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mail.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,34 @@
+<?php
+/**
+ * This example shows sending a message using PHP's mail() function.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+//Set the subject line
+$mail->Subject = 'PHPMailer mail() test';
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mailing_list.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mailing_list.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/mailing_list.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,65 @@
+<?php
+/**
+ * This example shows how to send a message to a whole list of recipients efficiently.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+error_reporting(E_STRICT | E_ALL);
+
+date_default_timezone_set('Etc/UTC');
+
+require '../vendor/autoload.php';
+
+$mail = new PHPMailer;
+
+$body = file_get_contents('contents.html');
+
+$mail->isSMTP();
+$mail->Host = 'smtp.example.com';
+$mail->SMTPAuth = true;
+$mail->SMTPKeepAlive = true; // SMTP connection will not close after each email sent, reduces SMTP overhead
+$mail->Port = 25;
+$mail->Username = 'yourname at example.com';
+$mail->Password = 'yourpassword';
+$mail->setFrom('list at example.com', 'List manager');
+$mail->addReplyTo('list at example.com', 'List manager');
+
+$mail->Subject = "PHPMailer Simple database mailing list test";
+
+//Same body for all messages, so set this before the sending loop
+//If you generate a different body for each recipient (e.g. you're using a templating system),
+//set it inside the loop
+$mail->msgHTML($body);
+//msgHTML also sets AltBody, but if you want a custom one, set it afterwards
+$mail->AltBody = 'To view the message, please use an HTML compatible email viewer!';
+
+//Connect to the database and select the recipients from your mailing list that have not yet been sent to
+//You'll need to alter this to match your database
+$mysql = mysqli_connect('localhost', 'username', 'password');
+mysqli_select_db($mysql, 'mydb');
+$result = mysqli_query($mysql, 'SELECT full_name, email, photo FROM mailinglist WHERE sent = FALSE');
+
+foreach ($result as $row) {
+    $mail->addAddress($row['email'], $row['full_name']);
+    if (!empty($row['photo'])) {
+        $mail->addStringAttachment($row['photo'], 'YourPhoto.jpg'); //Assumes the image data is stored in the DB
+    }
+
+    if (!$mail->send()) {
+        echo "Mailer Error (" . str_replace("@", "@", $row["email"]) . ') ' . $mail->ErrorInfo . '<br />';
+        break; //Abandon sending
+    } else {
+        echo "Message sent to :" . $row['full_name'] . ' (' . str_replace("@", "@", $row['email']) . ')<br />';
+        //Mark it as sent in the DB
+        mysqli_query(
+            $mysql,
+            "UPDATE mailinglist SET sent = TRUE WHERE email = '" .
+            mysqli_real_escape_string($mysql, $row['email']) . "'"
+        );
+    }
+    // Clear all addresses and attachments for next loop
+    $mail->clearAddresses();
+    $mail->clearAttachments();
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/pop_before_smtp.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/pop_before_smtp.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/pop_before_smtp.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,58 @@
+<?php
+/**
+ * This example shows how to use POP-before-SMTP for authentication.
+ * POP-before-SMTP is a very old technology that is hardly used any more.
+ */
+
+//Import PHPMailer classes into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+use PHPMailer\PHPMailer\POP3;
+
+require '../vendor/autoload.php';
+
+//Authenticate via POP3.
+//After this you should be allowed to submit messages over SMTP for a few minutes.
+//Only applies if your host supports POP-before-SMTP.
+$pop = POP3::popBeforeSmtp('pop3.example.com', 110, 30, 'username', 'password', 1);
+
+//Create a new PHPMailer instance
+//Passing true to the constructor enables the use of exceptions for error handling
+$mail = new PHPMailer(true);
+try {
+    $mail->isSMTP();
+    //Enable SMTP debugging
+    // 0 = off (for production use)
+    // 1 = client messages
+    // 2 = client and server messages
+    $mail->SMTPDebug = 2;
+    //Set the hostname of the mail server
+    $mail->Host = 'mail.example.com';
+    //Set the SMTP port number - likely to be 25, 465 or 587
+    $mail->Port = 25;
+    //Whether to use SMTP authentication
+    $mail->SMTPAuth = false;
+    //Set who the message is to be sent from
+    $mail->setFrom('from at example.com', 'First Last');
+    //Set an alternative reply-to address
+    $mail->addReplyTo('replyto at example.com', 'First Last');
+    //Set who the message is to be sent to
+    $mail->addAddress('whoto at example.com', 'John Doe');
+    //Set the subject line
+    $mail->Subject = 'PHPMailer POP-before-SMTP test';
+    //Read an HTML message body from an external file, convert referenced images to embedded,
+    //and convert the HTML into a basic plain-text alternative body
+    $mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+    //Replace the plain text body with one created manually
+    $mail->AltBody = 'This is a plain-text message body';
+    //Attach an image file
+    $mail->addAttachment('images/phpmailer_mini.png');
+    //send the message
+    //Note that we don't need check the response from this because it will throw an exception if it has trouble
+    $mail->send();
+    echo 'Message sent!';
+} catch (Exception $e) {
+    echo $e->errorMessage(); //Pretty error messages from PHPMailer
+} catch (\Exception $e) {
+    echo $e->getMessage(); //Boring error messages from anything else!
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_file_upload.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_file_upload.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_file_upload.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,52 @@
+<?php
+/**
+ * PHPMailer simple file upload and send example.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+$msg = '';
+if (array_key_exists('userfile', $_FILES)) {
+    // First handle the upload
+    // Don't trust provided filename - same goes for MIME types
+    // See http://php.net/manual/en/features.file-upload.php#114004 for more thorough upload validation
+    $uploadfile = tempnam(sys_get_temp_dir(), hash('sha256', $_FILES['userfile']['name']));
+    if (move_uploaded_file($_FILES['userfile']['tmp_name'], $uploadfile)) {
+        // Upload handled successfully
+        // Now create a message
+        require '../vendor/autoload.php';
+        $mail = new PHPMailer;
+        $mail->setFrom('from at example.com', 'First Last');
+        $mail->addAddress('whoto at example.com', 'John Doe');
+        $mail->Subject = 'PHPMailer file sender';
+        $mail->Body = 'My message body';
+        // Attach the uploaded file
+        $mail->addAttachment($uploadfile, 'My uploaded file');
+        if (!$mail->send()) {
+            $msg .= "Mailer Error: " . $mail->ErrorInfo;
+        } else {
+            $msg .= "Message sent!";
+        }
+    } else {
+        $msg .= 'Failed to move file to ' . $uploadfile;
+    }
+}
+?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>PHPMailer Upload</title>
+</head>
+<body>
+<?php if (empty($msg)) { ?>
+    <form method="post" enctype="multipart/form-data">
+        <input type="hidden" name="MAX_FILE_SIZE" value="100000"> Send this file: <input name="userfile" type="file">
+        <input type="submit" value="Send File">
+    </form>
+<?php } else {
+    echo $msg;
+} ?>
+</body>
+</html>
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_multiple_file_upload.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_multiple_file_upload.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/send_multiple_file_upload.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,53 @@
+<?php
+/**
+ * PHPMailer multiple files upload and send example
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+$msg = '';
+if (array_key_exists('userfile', $_FILES)) {
+    require '../vendor/autoload.php';
+    // Create a message
+    $mail = new PHPMailer;
+    $mail->setFrom('from at example.com', 'First Last');
+    $mail->addAddress('whoto at example.com', 'John Doe');
+    $mail->Subject = 'PHPMailer file sender';
+    $mail->Body = 'My message body';
+    //Attach multiple files one by one
+    for ($ct = 0; $ct < count($_FILES['userfile']['tmp_name']); $ct++) {
+        $uploadfile = tempnam(sys_get_temp_dir(), hash('sha256', $_FILES['userfile']['name'][$ct]));
+        $filename = $_FILES['userfile']['name'][$ct];
+        if (move_uploaded_file($_FILES['userfile']['tmp_name'][$ct], $uploadfile)) {
+            $mail->addAttachment($uploadfile, $filename);
+        } else {
+            $msg .= 'Failed to move file to ' . $uploadfile;
+        }
+    }
+    if (!$mail->send()) {
+        $msg .= "Mailer Error: " . $mail->ErrorInfo;
+    } else {
+        $msg .= "Message sent!";
+    }
+}
+?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>PHPMailer Upload</title>
+</head>
+<body>
+<?php if (empty($msg)) { ?>
+    <form method="post" enctype="multipart/form-data">
+        <input type="hidden" name="MAX_FILE_SIZE" value="100000">
+        Select one or more files:
+        <input name="userfile[]" type="file" multiple="multiple">
+        <input type="submit" value="Send Files">
+    </form>
+<?php } else {
+    echo $msg;
+} ?>
+</body>
+</html>

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/sendmail.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/sendmail.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/sendmail.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,36 @@
+<?php
+/**
+ * This example shows sending a message using a local sendmail binary.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+// Set PHPMailer to use the sendmail transport
+$mail->isSendmail();
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+//Set the subject line
+$mail->Subject = 'PHPMailer sendmail test';
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/simple_contact_form.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/simple_contact_form.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/simple_contact_form.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,101 @@
+<?php
+/**
+ * PHPMailer simple contact form example.
+ * If you want to accept and send uploads in your form, look at the send_file_upload example.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+if (array_key_exists('to', $_POST)) {
+    $err = false;
+    $msg = '';
+    $email = '';
+    //Apply some basic validation and filtering to the subject
+    if (array_key_exists('subject', $_POST)) {
+        $subject = substr(strip_tags($_POST['subject']), 0, 255);
+    } else {
+        $subject = 'No subject given';
+    }
+    //Apply some basic validation and filtering to the query
+    if (array_key_exists('query', $_POST)) {
+        //Limit length and strip HTML tags
+        $query = substr(strip_tags($_POST['query']), 0, 16384);
+    } else {
+        $query = '';
+        $msg = 'No query provided!';
+        $err = true;
+    }
+    //Apply some basic validation and filtering to the name
+    if (array_key_exists('name', $_POST)) {
+        //Limit length and strip HTML tags
+        $name = substr(strip_tags($_POST['name']), 0, 255);
+    } else {
+        $name = '';
+    }
+    //Validate to address
+    //Never allow arbitrary input for the 'to' address as it will turn your form into a spam gateway!
+    //Substitute appropriate addresses from your own domain, or simply use a single, fixed address
+    if (array_key_exists('to', $_POST) and in_array($_POST['to'], ['sales', 'support', 'accounts'])) {
+        $to = $_POST['to'] . '@example.com';
+    } else {
+        $to = 'support at example.com';
+    }
+    //Make sure the address they provided is valid before trying to use it
+    if (array_key_exists('email', $_POST) and PHPMailer::validateAddress($_POST['email'])) {
+        $email = $_POST['email'];
+    } else {
+        $msg .= "Error: invalid email address provided";
+        $err = true;
+    }
+    if (!$err) {
+        $mail = new PHPMailer;
+        $mail->isSMTP();
+        $mail->Host = 'localhost';
+        $mail->Port = 2500;
+        $mail->CharSet = 'utf-8';
+        //It's important not to use the submitter's address as the from address as it's forgery,
+        //which will cause your messages to fail SPF checks.
+        //Use an address in your own domain as the from address, put the submitter's address in a reply-to
+        $mail->setFrom('contact at example.com', (empty($name) ? 'Contact form' : $name));
+        $mail->addAddress($to);
+        $mail->addReplyTo($email, $name);
+        $mail->Subject = 'Contact form: ' . $subject;
+        $mail->Body = "Contact form submission\n\n" . $query;
+        if (!$mail->send()) {
+            $msg .= "Mailer Error: " . $mail->ErrorInfo;
+        } else {
+            $msg .= "Message sent!";
+        }
+    }
+} ?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>PHPMailer Contact Form</title>
+</head>
+<body>
+<h1>Contact us</h1>
+<?php if (empty($msg)) { ?>
+    <form method="post">
+        <label for="to">Send to:</label>
+        <select name="to" id="to">
+            <option value="sales">Sales</option>
+            <option value="support" selected="selected">Support</option>
+            <option value="accounts">Accounts</option>
+        </select><br>
+        <label for="subject">Subject: <input type="text" name="subject" id="subject" maxlength="255"></label><br>
+        <label for="name">Your name: <input type="text" name="name" id="name" maxlength="255"></label><br>
+        <label for="email">Your email address: <input type="email" name="email" id="email" maxlength="255"></label><br>
+        <label for="query">Your question:</label><br>
+        <textarea cols="30" rows="8" name="query" id="query" placeholder="Your question"></textarea><br>
+        <input type="submit" value="Submit">
+    </form>
+<?php } else {
+    echo $msg;
+} ?>
+</body>
+</html>
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smime_signed_mail.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smime_signed_mail.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smime_signed_mail.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,98 @@
+<?php
+/**
+ * This PHPMailer example shows S/MIME signing a message and then sending.
+ *
+ * Before you can sign the mail certificates are needed.
+ *
+ *
+ * STEP 1 - Creating a certificate:
+ * You can either use a self-signed certificate, pay for a signed one,
+ * or use free alternatives such as StartSSL, Comodo etc.
+ * Check out this link for more providers: http://kb.mozillazine.org/Getting_an_SMIME_certificate
+ * In this example I am using Comodo.
+ * The form is directly available via https://secure.comodo.com/products/frontpage?area=SecureEmailCertificate
+ * Fill it out and you'll get an email with a link to download your certificate.
+ * Usually the certificate will be directly installed into your browser (FireFox/Chrome).
+ *
+ *
+ * STEP 2 - Exporting the certificate
+ * This is specific to your browser, however, most browsers will give you the option
+ * to export your recently added certificate in PKCS12 (.pfx)
+ * Include your private key if you are asked for it.
+ * Set up a password to protect your exported file.
+ *
+ * STEP 3 - Splitting the .pfx into a private key and the certificate.
+ * I use openssl for this. You only need two commands. In my case the certificate file is called 'exported-cert.pfx'
+ * To create the private key do the following:
+ *
+ * openssl pkcs12 -in exported-cert.pfx -nocerts -out cert.key
+ *
+ * Of course the way you name your file (-out) is up to you.
+ * You will be asked for a password for the Import password. This is the password you
+ * set while exporting the certificate into the pfx file.
+ * Afterwards, you can password protect your private key (recommended)
+ * Also make sure to set the permissions to a minimum level and suitable for your application.
+ * To create the certificate file use the following command:
+ *
+ * openssl pkcs12 -in exported-cert.pfx -clcerts -nokeys -out cert.crt
+ *
+ * Again, the way you name your certificate is up to you. You will be also asked for the Import Password.
+ * To create the certificate-chain file use the following command:
+ *
+ * openssl pkcs12 -in exported-cert.pfx -cacerts -out certchain.pem
+ *
+ * Again, the way you name your chain file is up to you. You will be also asked for the Import Password.
+ *
+ *
+ * STEP 3 - Code
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+//Set who the message is to be sent from
+//IMPORTANT: This must match the email address of your certificate.
+//Although the certificate will be valid, an error will be thrown since it cannot be verified
+//that the sender and the signer are the same person.
+$mail->setFrom('from at example.com', 'First Last');
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+//Set the subject line
+$mail->Subject = 'PHPMailer mail() test';
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//Convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//Configure message signing (the actual signing does not occur until sending)
+$mail->sign(
+    '/path/to/cert.crt', //The location of your certificate file
+    '/path/to/cert.key', //The location of your private key file
+    //The password you protected your private key with (not the Import Password!
+    //May be empty but the parameter must not be omitted!
+    'yourSecretPrivateKeyPassword',
+    '/path/to/certchain.pem' //The location of your chain file
+);
+
+//Send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}
+/*
+ * REMARKS:
+ * If your email client does not support S/MIME it will most likely just show an attachment smime.p7s,
+ * which is the signature contained in the email.
+ * Other clients, such as Thunderbird support S/MIME natively and will validate the signature
+ * automatically and report the result in some way.
+ */

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,55 @@
+<?php
+/**
+ * This example shows making an SMTP connection with authentication.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+//SMTP needs accurate times, and the PHP time zone MUST be set
+//This should be done in your php.ini, but this is how to do it if you don't have access to that
+date_default_timezone_set('Etc/UTC');
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+//Tell PHPMailer to use SMTP
+$mail->isSMTP();
+//Enable SMTP debugging
+// 0 = off (for production use)
+// 1 = client messages
+// 2 = client and server messages
+$mail->SMTPDebug = 2;
+//Set the hostname of the mail server
+$mail->Host = 'mail.example.com';
+//Set the SMTP port number - likely to be 25, 465 or 587
+$mail->Port = 25;
+//Whether to use SMTP authentication
+$mail->SMTPAuth = true;
+//Username to use for SMTP authentication
+$mail->Username = 'yourname at example.com';
+//Password to use for SMTP authentication
+$mail->Password = 'yourpassword';
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+//Set the subject line
+$mail->Subject = 'PHPMailer SMTP test';
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+} else {
+    echo 'Message sent!';
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_check.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_check.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_check.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This uses the SMTP class alone to check that a connection can be made to an SMTP server,
+ * authenticate, then disconnect
+ */
+
+//Import the PHPMailer SMTP class into the global namespace
+use PHPMailer\PHPMailer\SMTP;
+use PHPMailer\PHPMailer\Exception;
+
+require '../vendor/autoload.php';
+
+//SMTP needs accurate times, and the PHP time zone MUST be set
+//This should be done in your php.ini, but this is how to do it if you don't have access to that
+date_default_timezone_set('Etc/UTC');
+
+//Create a new SMTP instance
+$smtp = new SMTP;
+
+//Enable connection-level debug output
+$smtp->do_debug = SMTP::DEBUG_CONNECTION;
+
+try {
+    //Connect to an SMTP server
+    if (!$smtp->connect('mail.example.com', 25)) {
+        throw new Exception('Connect failed');
+    }
+    //Say hello
+    if (!$smtp->hello(gethostname())) {
+        throw new Exception('EHLO failed: ' . $smtp->getError()['error']);
+    }
+    //Get the list of ESMTP services the server offers
+    $e = $smtp->getServerExtList();
+    //If server can do TLS encryption, use it
+    if (is_array($e) && array_key_exists('STARTTLS', $e)) {
+        $tlsok = $smtp->startTLS();
+        if (!$tlsok) {
+            throw new Exception('Failed to start encryption: ' . $smtp->getError()['error']);
+        }
+        //Repeat EHLO after STARTTLS
+        if (!$smtp->hello(gethostname())) {
+            throw new Exception('EHLO (2) failed: ' . $smtp->getError()['error']);
+        }
+        //Get new capabilities list, which will usually now include AUTH if it didn't before
+        $e = $smtp->getServerExtList();
+    }
+    //If server supports authentication, do it (even if no encryption)
+    if (is_array($e) && array_key_exists('AUTH', $e)) {
+        if ($smtp->authenticate('username', 'password')) {
+            echo "Connected ok!";
+        } else {
+            throw new Exception('Authentication failed: ' . $smtp->getError()['error']);
+        }
+    }
+} catch (Exception $e) {
+    echo 'SMTP error: ' . $e->getMessage(), "\n";
+}
+//Whatever happened, close the connection.
+$smtp->quit(true);

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_low_memory.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_low_memory.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_low_memory.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,130 @@
+<?php
+/**
+ * SMTP low memory example.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+require '../vendor/autoload.php';
+
+/**
+ * This class demonstrates sending an already-built RFC822 message via SMTP
+ * by extending PHPMailer's SMTP class.
+ * It uses less memory that PHPMailer's usual approach because it keeps
+ * the message as a single string rather than splitting its lines into
+ * an array, which can consume very large amounts of memory if you have
+ * large attachments. The downside is that it's somewhat slower.
+ * This is mainly of academic interest, but shows how you can change how
+ * core classes work without having to alter the library itself.
+ */
+class SMTPLowMemory extends SMTP
+{
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the LE)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks
+        $msg_data = str_replace(["\r\n", "\r"], "\n", $msg_data);
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $firstline = substr($msg_data, 0, strcspn($msg_data, "\n", 0));
+        $field = substr($firstline, 0, strpos($firstline, ':'));
+        $in_headers = false;
+        if (!empty($field) && strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        $offset = 0;
+        $len = strlen($msg_data);
+        while ($offset < $len) {
+            //Get position of next line break
+            $linelen = strcspn($msg_data, "\n", $offset);
+            //Get the next line
+            $line = substr($msg_data, $offset, $linelen);
+            //Remember where we have got to
+            $offset += ($linelen + 1);
+            $lines_out = [];
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //We need to break this line up into several smaller lines
+            //This is a small micro-optimisation: isset($str[$len]) is equivalent to (strlen($str) > $len)
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                //Deliberately matches both false and 0
+                if (!$pos) {
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . self::LE);
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+
+        return $result;
+    }
+}
+
+/**
+ * We need to use a PHPMailer subclass to make it use our SMTP implementation.
+ * @package PHPMailer\PHPMailer
+ */
+class PHPMailerLowMemory extends PHPMailer
+{
+    /**
+     * Patch in the new SMTP class.
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTPLowMemory;
+        }
+
+        return $this->smtp;
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_no_auth.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_no_auth.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/smtp_no_auth.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,51 @@
+<?php
+/**
+ * This example shows making an SMTP connection without using authentication.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+//SMTP needs accurate times, and the PHP time zone MUST be set
+//This should be done in your php.ini, but this is how to do it if you don't have access to that
+date_default_timezone_set('Etc/UTC');
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+//Tell PHPMailer to use SMTP
+$mail->isSMTP();
+//Enable SMTP debugging
+// 0 = off (for production use)
+// 1 = client messages
+// 2 = client and server messages
+$mail->SMTPDebug = 2;
+//Set the hostname of the mail server
+$mail->Host = 'mail.example.com';
+//Set the SMTP port number - likely to be 25, 465 or 587
+$mail->Port = 25;
+//We don't need to set this as it's the default value
+//$mail->SMTPAuth = false;
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+//Set an alternative reply-to address
+$mail->addReplyTo('replyto at example.com', 'First Last');
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+//Set the subject line
+$mail->Subject = 'PHPMailer SMTP without auth test';
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+//Replace the plain text body with one created manually
+$mail->AltBody = 'This is a plain-text message body';
+//Attach an image file
+$mail->addAttachment('images/phpmailer_mini.png');
+
+//send the message, check for errors
+if (!$mail->send()) {
+    echo "Mailer Error: " . $mail->ErrorInfo;
+} else {
+    echo "Message sent!";
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/examples/ssl_options.phps
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/examples/ssl_options.phps	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/examples/ssl_options.phps	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,75 @@
+<?php
+/**
+ * This example shows settings to use when sending over SMTP with TLS and custom connection options.
+ */
+
+//Import the PHPMailer class into the global namespace
+use PHPMailer\PHPMailer\PHPMailer;
+
+//SMTP needs accurate times, and the PHP time zone MUST be set
+//This should be done in your php.ini, but this is how to do it if you don't have access to that
+date_default_timezone_set('Etc/UTC');
+
+require '../vendor/autoload.php';
+
+//Create a new PHPMailer instance
+$mail = new PHPMailer;
+
+//Tell PHPMailer to use SMTP
+$mail->isSMTP();
+
+//Enable SMTP debugging
+// 0 = off (for production use)
+// 1 = client messages
+// 2 = client and server messages
+$mail->SMTPDebug = 2;
+
+//Set the hostname of the mail server
+$mail->Host = 'smtp.example.com';
+
+//Set the SMTP port number - 587 for authenticated TLS, a.k.a. RFC4409 SMTP submission
+$mail->Port = 587;
+
+//Set the encryption system to use - ssl (deprecated) or tls
+$mail->SMTPSecure = 'tls';
+
+//Custom connection options
+//Note that these settings are INSECURE
+$mail->SMTPOptions = array(
+    'ssl' => [
+        'verify_peer' => true,
+        'verify_depth' => 3,
+        'allow_self_signed' => true,
+        'peer_name' => 'smtp.example.com',
+        'cafile' => '/etc/ssl/ca_cert.pem',
+    ],
+);
+
+//Whether to use SMTP authentication
+$mail->SMTPAuth = true;
+
+//Username to use for SMTP authentication - use full email address for gmail
+$mail->Username = 'username at example.com';
+
+//Password to use for SMTP authentication
+$mail->Password = 'yourpassword';
+
+//Set who the message is to be sent from
+$mail->setFrom('from at example.com', 'First Last');
+
+//Set who the message is to be sent to
+$mail->addAddress('whoto at example.com', 'John Doe');
+
+//Set the subject line
+$mail->Subject = 'PHPMailer SMTP options test';
+
+//Read an HTML message body from an external file, convert referenced images to embedded,
+//convert HTML into a basic plain-text alternative body
+$mail->msgHTML(file_get_contents('contents.html'), __DIR__);
+
+//Send the message, check for errors
+if (!$mail->send()) {
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+} else {
+    echo 'Message sent!';
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/get_oauth_token.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/get_oauth_token.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/get_oauth_token.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,144 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5
+ * @package PHPMailer
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Get an OAuth2 token from an OAuth2 provider.
+ * * Install this script on your server so that it's accessible
+ * as [https/http]://<yourdomain>/<folder>/get_oauth_token.php
+ * e.g.: http://localhost/phpmailer/get_oauth_token.php
+ * * Ensure dependencies are installed with 'composer install'
+ * * Set up an app in your Google/Yahoo/Microsoft account
+ * * Set the script address as the app's redirect URL
+ * If no refresh token is obtained when running this file,
+ * revoke access to your app and run the script again.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * Aliases for League Provider Classes
+ * Make sure you have added these to your composer.json and run `composer install`
+ * Plenty to choose from here:
+ * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
+ */
+// @see https://github.com/thephpleague/oauth2-google
+use League\OAuth2\Client\Provider\Google;
+// @see https://packagist.org/packages/hayageek/oauth2-yahoo
+use Hayageek\OAuth2\Client\Provider\Yahoo;
+// @see https://github.com/stevenmaguire/oauth2-microsoft
+use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
+
+if (!isset($_GET['code']) && !isset($_GET['provider'])) {
+?>
+<html>
+<body>Select Provider:<br/>
+<a href='?provider=Google'>Google</a><br/>
+<a href='?provider=Yahoo'>Yahoo</a><br/>
+<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
+</body>
+</html>
+<?php
+exit;
+}
+
+require 'vendor/autoload.php';
+
+session_start();
+
+$providerName = '';
+
+if (array_key_exists('provider', $_GET)) {
+    $providerName = $_GET['provider'];
+    $_SESSION['provider'] = $providerName;
+} elseif (array_key_exists('provider', $_SESSION)) {
+    $providerName = $_SESSION['provider'];
+}
+if (!in_array($providerName, ['Google', 'Microsoft', 'Yahoo'])) {
+    exit('Only Google, Microsoft and Yahoo OAuth2 providers are currently supported in this script.');
+}
+
+//These details are obtained by setting up an app in the Google developer console,
+//or whichever provider you're using.
+$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+
+//If this automatic URL doesn't work, set it yourself manually to the URL of this script
+$redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+//$redirectUri = 'http://localhost/PHPMailer/redirect';
+
+$params = [
+    'clientId' => $clientId,
+    'clientSecret' => $clientSecret,
+    'redirectUri' => $redirectUri,
+    'accessType' => 'offline'
+];
+
+$options = [];
+$provider = null;
+
+switch ($providerName) {
+    case 'Google':
+        $provider = new Google($params);
+        $options = [
+            'scope' => [
+                'https://mail.google.com/'
+            ]
+        ];
+        break;
+    case 'Yahoo':
+        $provider = new Yahoo($params);
+        break;
+    case 'Microsoft':
+        $provider = new Microsoft($params);
+        $options = [
+            'scope' => [
+                'wl.imap',
+                'wl.offline_access'
+            ]
+        ];
+        break;
+}
+
+if (null === $provider) {
+    exit('Provider missing');
+}
+
+if (!isset($_GET['code'])) {
+    // If we don't have an authorization code then get one
+    $authUrl = $provider->getAuthorizationUrl($options);
+    $_SESSION['oauth2state'] = $provider->getState();
+    header('Location: ' . $authUrl);
+    exit;
+// Check given state against previously stored one to mitigate CSRF attack
+} elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
+    unset($_SESSION['oauth2state']);
+    unset($_SESSION['provider']);
+    exit('Invalid state');
+} else {
+    unset($_SESSION['provider']);
+    // Try to get an access token (using the authorization code grant)
+    $token = $provider->getAccessToken(
+        'authorization_code',
+        [
+            'code' => $_GET['code']
+        ]
+    );
+    // Use this to interact with an API on the users behalf
+    // Use this to get a new access token if the old one expires
+    echo 'Refresh Token: ', $token->getRefreshToken();
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-am.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-am.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-am.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Armenian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Hrayr Grigoryan <hrayr at bits.am>
+ */
+ 
+$PHPMAILER_LANG['authenticate']         = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP -ի սխալ: տվյալները ընդունված չեն.';
+$PHPMAILER_LANG['empty_message']        = 'Հաղորդագրությունը դատարկ է';
+$PHPMAILER_LANG['encoding']             = 'Կոդավորման անհայտ տեսակ: ';
+$PHPMAILER_LANG['execute']              = 'Չհաջողվեց իրականացնել հրամանը: ';
+$PHPMAILER_LANG['file_access']          = 'Ֆայլը հասանելի չէ: ';
+$PHPMAILER_LANG['file_open']            = 'Ֆայլի սխալ: ֆայլը չհաջողվեց բացել: ';
+$PHPMAILER_LANG['from_failed']          = 'Ուղարկողի հետևյալ հասցեն սխալ է: ';
+$PHPMAILER_LANG['instantiate']          = 'Հնարավոր չէ կանչել mail ֆունկցիան.';
+$PHPMAILER_LANG['invalid_address']      = 'Հասցեն սխալ է: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' փոստային սերվերի հետ չի աշխատում.';
+$PHPMAILER_LANG['provide_address']      = 'Անհրաժեշտ է տրամադրել գոնե մեկ ստացողի e-mail հասցե.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP -ի սխալ: չի հաջողվել ուղարկել հետևյալ ստացողների հասցեներին: ';
+$PHPMAILER_LANG['signing']              = 'Ստորագրման սխալ: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP -ի connect() ֆունկցիան չի հաջողվել';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP սերվերի սխալ: ';
+$PHPMAILER_LANG['variable_set']         = 'Չի հաջողվում ստեղծել կամ վերափոխել փոփոխականը: ';
+$PHPMAILER_LANG['extension_missing']    = 'Հավելվածը բացակայում է: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ar.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ar.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ar.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Arabic PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author bahjat al mostafa <bahjat983 at hotmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'خطأ SMTP : لا يمكن تأكيد الهوية.';
+$PHPMAILER_LANG['connect_host']         = 'خطأ SMTP: لا يمكن الاتصال بالخادم SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'خطأ SMTP: لم يتم قبول المعلومات .';
+$PHPMAILER_LANG['empty_message']        = 'نص الرسالة فارغ';
+$PHPMAILER_LANG['encoding']             = 'ترميز غير معروف: ';
+$PHPMAILER_LANG['execute']              = 'لا يمكن تنفيذ : ';
+$PHPMAILER_LANG['file_access']          = 'لا يمكن الوصول للملف: ';
+$PHPMAILER_LANG['file_open']            = 'خطأ في الملف: لا يمكن فتحه: ';
+$PHPMAILER_LANG['from_failed']          = 'خطأ على مستوى عنوان المرسل : ';
+$PHPMAILER_LANG['instantiate']          = 'لا يمكن توفير خدمة البريد.';
+$PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
+$PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+                                          'فشل في الارسال لكل من : ';
+$PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
+$PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'لا يمكن تعيين أو إعادة تعيين متغير: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-az.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-az.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-az.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Azerbaijani PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @mirjalal
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP xətası: Giriş uğursuz oldu.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP xətası: SMTP serverinə qoşulma uğursuz oldu.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP xətası: Verilənlər qəbul edilməyib.';
+$PHPMAILER_LANG['empty_message']        = 'Boş mesaj göndərilə bilməz.';
+$PHPMAILER_LANG['encoding']             = 'Qeyri-müəyyən kodlaşdırma: ';
+$PHPMAILER_LANG['execute']              = 'Əmr yerinə yetirilmədi: ';
+$PHPMAILER_LANG['file_access']          = 'Fayla giriş yoxdur: ';
+$PHPMAILER_LANG['file_open']            = 'Fayl xətası: Fayl açıla bilmədi: ';
+$PHPMAILER_LANG['from_failed']          = 'Göstərilən poçtlara göndərmə uğursuz oldu: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail funksiyası işə salına bilmədi.';
+$PHPMAILER_LANG['invalid_address']      = 'Düzgün olmayan e-mail adresi: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - e-mail kitabxanası dəstəklənmir.';
+$PHPMAILER_LANG['provide_address']      = 'Ən azı bir e-mail adresi daxil edilməlidir.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP xətası: Aşağıdakı ünvanlar üzrə alıcılara göndərmə uğursuzdur: ';
+$PHPMAILER_LANG['signing']              = 'İmzalama xətası: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP serverinə qoşulma uğursuz oldu.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP serveri xətası: ';
+$PHPMAILER_LANG['variable_set']         = 'Dəyişənin quraşdırılması uğursuz oldu: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ba.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ba.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ba.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Bosnian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ermin Islamagić <ermin at islamagic.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela prijava.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Nije moguće spojiti se sa SMTP serverom.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznata kriptografija: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje sa navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedene e-mail adrese nije uspjelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.';
+$PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definišite barem jednu adresu primaoca.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP server nije uspjelo.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP greška: ';
+$PHPMAILER_LANG['variable_set']         = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: ';
\ No newline at end of file

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-be.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-be.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-be.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Belarusian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Aleksander Maksymiuk <info at setpro.pl>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Памылка SMTP: памылка ідэнтыфікацыі.';
+$PHPMAILER_LANG['connect_host']         = 'Памылка SMTP: нельга ўстанавіць сувязь з SMTP-серверам.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Памылка SMTP: звесткі непрынятыя.';
+$PHPMAILER_LANG['empty_message']        = 'Пустое паведамленне.';
+$PHPMAILER_LANG['encoding']             = 'Невядомая кадыроўка тэксту: ';
+$PHPMAILER_LANG['execute']              = 'Нельга выканаць каманду: ';
+$PHPMAILER_LANG['file_access']          = 'Няма доступу да файла: ';
+$PHPMAILER_LANG['file_open']            = 'Нельга адкрыць файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Няправільны адрас адпраўніка: ';
+$PHPMAILER_LANG['instantiate']          = 'Нельга прымяніць функцыю mail().';
+$PHPMAILER_LANG['invalid_address']      = 'Нельга даслаць паведамленне, няправільны email атрымальніка: ';
+$PHPMAILER_LANG['provide_address']      = 'Запоўніце, калі ласка, правільны email атрымальніка.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - паштовы сервер не падтрымліваецца.';
+$PHPMAILER_LANG['recipients_failed']    = 'Памылка SMTP: няправільныя атрымальнікі: ';
+$PHPMAILER_LANG['signing']              = 'Памылка подпісу паведамлення: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Памылка сувязі з SMTP-серверам.';
+$PHPMAILER_LANG['smtp_error']           = 'Памылка SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Нельга ўстанавіць або перамяніць значэнне пераменнай: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-bg.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-bg.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-bg.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Bulgarian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mikhail Kyosev <mialygk at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: Не може да се удостовери пред сървъра.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: Не може да се свърже с SMTP хоста.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: данните не са приети.';
+$PHPMAILER_LANG['empty_message']        = 'Съдържанието на съобщението е празно';
+$PHPMAILER_LANG['encoding']             = 'Неизвестно кодиране: ';
+$PHPMAILER_LANG['execute']              = 'Не може да се изпълни: ';
+$PHPMAILER_LANG['file_access']          = 'Няма достъп до файл: ';
+$PHPMAILER_LANG['file_open']            = 'Файлова грешка: Не може да се отвори файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Следните адреси за подател са невалидни: ';
+$PHPMAILER_LANG['instantiate']          = 'Не може да се инстанцира функцията mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Невалиден адрес: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - пощенски сървър не се поддържа.';
+$PHPMAILER_LANG['provide_address']      = 'Трябва да предоставите поне един email адрес за получател.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: Следните адреси за Получател са невалидни: ';
+$PHPMAILER_LANG['signing']              = 'Грешка при подписване: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP провален connect().';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP сървърна грешка: ';
+$PHPMAILER_LANG['variable_set']         = 'Не може да се установи или възстанови променлива: ';
+$PHPMAILER_LANG['extension_missing']    = 'Липсва разширение: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ca.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ca.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ca.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Catalan PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ivan <web AT microstudi DOT com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: No s’ha pogut autenticar.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: No es pot connectar al servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Dades no acceptades.';
+$PHPMAILER_LANG['empty_message']        = 'El cos del missatge està buit.';
+$PHPMAILER_LANG['encoding']             = 'Codificació desconeguda: ';
+$PHPMAILER_LANG['execute']              = 'No es pot executar: ';
+$PHPMAILER_LANG['file_access']          = 'No es pot accedir a l’arxiu: ';
+$PHPMAILER_LANG['file_open']            = 'Error d’Arxiu: No es pot obrir l’arxiu: ';
+$PHPMAILER_LANG['from_failed']          = 'La(s) següent(s) adreces de remitent han fallat: ';
+$PHPMAILER_LANG['instantiate']          = 'No s’ha pogut crear una instància de la funció Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Adreça d’email invalida: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no està suportat';
+$PHPMAILER_LANG['provide_address']      = 'S’ha de proveir almenys una adreça d’email com a destinatari.';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Els següents destinataris han fallat: ';
+$PHPMAILER_LANG['signing']              = 'Error al signar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ha fallat el SMTP Connect().';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No s’ha pogut establir o restablir la variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ch.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ch.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ch.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author LiuXin <http://www.80x86.cn/blog/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误:身份验证失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: 不能连接SMTP主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数据不可接受。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '未知编码:';
+$PHPMAILER_LANG['execute']              = '不能执行: ';
+$PHPMAILER_LANG['file_access']          = '不能访问文件:';
+$PHPMAILER_LANG['file_open']            = '文件错误:不能打开文件:';
+$PHPMAILER_LANG['from_failed']          = '下面的发送地址邮件发送失败了: ';
+$PHPMAILER_LANG['instantiate']          = '不能实现mail方法。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
+$PHPMAILER_LANG['provide_address']      = '您必须提供至少一个 收信人的email地址。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误: 下面的 收件人失败了: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-cs.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-cs.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-cs.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Czech PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Chyba SMTP: Autentizace selhala.';
+$PHPMAILER_LANG['connect_host']         = 'Chyba SMTP: Nelze navázat spojení se SMTP serverem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Chyba SMTP: Data nebyla přijata.';
+$PHPMAILER_LANG['empty_message']        = 'Prázdné tělo zprávy';
+$PHPMAILER_LANG['encoding']             = 'Neznámé kódování: ';
+$PHPMAILER_LANG['execute']              = 'Nelze provést: ';
+$PHPMAILER_LANG['file_access']          = 'Nelze získat přístup k souboru: ';
+$PHPMAILER_LANG['file_open']            = 'Chyba souboru: Nelze otevřít soubor pro čtení: ';
+$PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
+$PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
+$PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
+$PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
+$PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';
+$PHPMAILER_LANG['signing']              = 'Chyba přihlašování: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() selhal.';
+$PHPMAILER_LANG['smtp_error']           = 'Chyba SMTP serveru: ';
+$PHPMAILER_LANG['variable_set']         = 'Nelze nastavit nebo změnit proměnnou: ';
+$PHPMAILER_LANG['extension_missing']    = 'Chybí rozšíření: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-da.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-da.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-da.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Danish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mikael Stokkebro <info at stokkebro.dk>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Kunne ikke logge på.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data kunne ikke accepteres.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke køre: ';
+$PHPMAILER_LANG['file_access']          = 'Ingen adgang til fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere email funktionen.';
+//$PHPMAILER_LANG['invalid_address']        = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
+$PHPMAILER_LANG['provide_address']      = 'Du skal indtaste mindst en modtagers emailadresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-de.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-de.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-de.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * German PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-Fehler: Authentifizierung fehlgeschlagen.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-Fehler: Konnte keine Verbindung zum SMTP-Host herstellen.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-Fehler: Daten werden nicht akzeptiert.';
+$PHPMAILER_LANG['empty_message']        = 'E-Mail-Inhalt ist leer.';
+$PHPMAILER_LANG['encoding']             = 'Unbekannte Kodierung: ';
+$PHPMAILER_LANG['execute']              = 'Konnte folgenden Befehl nicht ausführen: ';
+$PHPMAILER_LANG['file_access']          = 'Zugriff auf folgende Datei fehlgeschlagen: ';
+$PHPMAILER_LANG['file_open']            = 'Dateifehler: Konnte folgende Datei nicht öffnen: ';
+$PHPMAILER_LANG['from_failed']          = 'Die folgende Absenderadresse ist nicht korrekt: ';
+$PHPMAILER_LANG['instantiate']          = 'Mail-Funktion konnte nicht initialisiert werden.';
+$PHPMAILER_LANG['invalid_address']      = 'Die Adresse ist ungültig: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
+$PHPMAILER_LANG['provide_address']      = 'Bitte geben Sie mindestens eine Empfängeradresse an.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: ';
+$PHPMAILER_LANG['signing']              = 'Fehler beim Signieren: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Verbindung zum SMTP-Server fehlgeschlagen.';
+$PHPMAILER_LANG['smtp_error']           = 'Fehler vom SMTP-Server: ';
+$PHPMAILER_LANG['variable_set']         = 'Kann Variable nicht setzen oder zurücksetzen: ';
+$PHPMAILER_LANG['extension_missing']    = 'Fehlende Erweiterung: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-el.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-el.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-el.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Greek PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Σφάλμα: Αδυναμία σύνδεσης στον SMTP-Host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.';
+$PHPMAILER_LANG['empty_message']        = 'Το E-Mail δεν έχει περιεχόμενο .';
+$PHPMAILER_LANG['encoding']             = 'Αγνωστο Encoding-Format: ';
+$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: ';
+$PHPMAILER_LANG['file_access']          = 'Αδυναμία προσπέλασης του αρχείου: ';
+$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου αρχείου: ';
+$PHPMAILER_LANG['from_failed']          = 'Η παρακάτω διεύθυνση αποστολέα δεν είναι σωστή: ';
+$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης Mail function.';
+$PHPMAILER_LANG['invalid_address']      = 'Το μήνυμα δεν εστάλη, η διεύθυνση δεν είναι έγκυρη: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.';
+$PHPMAILER_LANG['provide_address']      = 'Παρακαλούμε δώστε τουλάχιστον μια e-mail διεύθυνση παραλήπτη.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Σφάλμα: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
+$PHPMAILER_LANG['signing']              = 'Σφάλμα υπογραφής: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης στον SMTP Server.';
+$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
+$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-eo.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-eo.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-eo.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Esperanto PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Eraro de servilo SMTP : aŭtentigo malsukcesis.';
+$PHPMAILER_LANG['connect_host']         = 'Eraro de servilo SMTP : konektado al servilo malsukcesis.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eraro de servilo SMTP : neĝustaj datumoj.';
+$PHPMAILER_LANG['empty_message']        = 'Teksto de mesaĝo mankas.';
+$PHPMAILER_LANG['encoding']             = 'Nekonata kodoprezento: ';
+$PHPMAILER_LANG['execute']              = 'Lanĉi rulumadon ne eblis: ';
+$PHPMAILER_LANG['file_access']          = 'Aliro al dosiero ne sukcesis: ';
+$PHPMAILER_LANG['file_open']            = 'Eraro de dosiero: malfermo neeblas: ';
+$PHPMAILER_LANG['from_failed']          = 'Jena adreso de sendinto malsukcesis: ';
+$PHPMAILER_LANG['instantiate']          = 'Genero de retmesaĝa funkcio neeblis.';
+$PHPMAILER_LANG['invalid_address']      = 'Retadreso ne validas: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mesaĝilo ne subtenata.';
+$PHPMAILER_LANG['provide_address']      = 'Vi devas tajpi almenaŭ unu recevontan retadreson.';
+$PHPMAILER_LANG['recipients_failed']    = 'Eraro de servilo SMTP : la jenaj poŝtrecivuloj kaŭzis eraron: ';
+$PHPMAILER_LANG['signing']              = 'Eraro de subskribo: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP konektado malsukcesis.';
+$PHPMAILER_LANG['smtp_error']           = 'Eraro de servilo SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Variablo ne pravalorizeblas aŭ ne repravalorizeblas: ';
+$PHPMAILER_LANG['extension_missing']    = 'Mankas etendo: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-es.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-es.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-es.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Spanish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Matt Sturdy <matt.sturdy at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
+$PHPMAILER_LANG['connect_host']         = 'Error SMTP: Imposible conectar al servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Error SMTP: Datos no aceptados.';
+$PHPMAILER_LANG['empty_message']        = 'El cuerpo del mensaje está vacío';
+$PHPMAILER_LANG['encoding']             = 'Codificación desconocida: ';
+$PHPMAILER_LANG['execute']              = 'Imposible ejecutar: ';
+$PHPMAILER_LANG['file_access']          = 'Imposible acceder al archivo: ';
+$PHPMAILER_LANG['file_open']            = 'Error de Archivo: Imposible abrir el archivo: ';
+$PHPMAILER_LANG['from_failed']          = 'La(s) siguiente(s) direcciones de remitente fallaron: ';
+$PHPMAILER_LANG['instantiate']          = 'Imposible crear una instancia de la función Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Imposible enviar: dirección de email inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer no está soportado.';
+$PHPMAILER_LANG['provide_address']      = 'Debe proporcionar al menos una dirección de email de destino.';
+$PHPMAILER_LANG['recipients_failed']    = 'Error SMTP: Los siguientes destinos fallaron: ';
+$PHPMAILER_LANG['signing']              = 'Error al firmar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
+$PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-et.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-et.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-et.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Estonian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Indrek Päri
+ * @author Elan Ruusamäe <glen at delfi.ee>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Viga: Autoriseerimise viga.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Viga: Ei õnnestunud luua ühendust SMTP serveriga.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Viga: Vigased andmed.';
+$PHPMAILER_LANG['empty_message']        = 'Tühi kirja sisu';
+$PHPMAILER_LANG["encoding"]             = 'Tundmatu kodeering: ';
+$PHPMAILER_LANG['execute']              = 'Tegevus ebaõnnestus: ';
+$PHPMAILER_LANG['file_access']          = 'Pole piisavalt õiguseid järgneva faili avamiseks: ';
+$PHPMAILER_LANG['file_open']            = 'Faili Viga: Faili avamine ebaõnnestus: ';
+$PHPMAILER_LANG['from_failed']          = 'Järgnev saatja e-posti aadress on vigane: ';
+$PHPMAILER_LANG['instantiate']          = 'mail funktiooni käivitamine ebaõnnestus.';
+$PHPMAILER_LANG['invalid_address']      = 'Saatmine peatatud, e-posti address vigane: ';
+$PHPMAILER_LANG['provide_address']      = 'Te peate määrama vähemalt ühe saaja e-posti aadressi.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' maileri tugi puudub.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Viga: Järgnevate saajate e-posti aadressid on vigased: ';
+$PHPMAILER_LANG["signing"]              = 'Viga allkirjastamisel: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() ebaõnnestus.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP serveri viga: ';
+$PHPMAILER_LANG['variable_set']         = 'Ei õnnestunud määrata või lähtestada muutujat: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nõutud laiendus on puudu: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fa.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fa.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fa.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Persian/Farsi PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ali Jazayeri <jaza.ali at gmail.com>
+ * @author Mohammad Hossein Mojtahedi <mhm5000 at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'خطای SMTP: احراز هویت با شکست مواجه شد.';
+$PHPMAILER_LANG['connect_host']         = 'خطای SMTP: اتصال به سرور SMTP برقرار نشد.';
+$PHPMAILER_LANG['data_not_accepted']    = 'خطای SMTP: داده‌ها نا‌درست هستند.';
+$PHPMAILER_LANG['empty_message']        = 'بخش متن پیام خالی است.';
+$PHPMAILER_LANG['encoding']             = 'کد‌گذاری نا‌شناخته: ';
+$PHPMAILER_LANG['execute']              = 'امکان اجرا وجود ندارد: ';
+$PHPMAILER_LANG['file_access']          = 'امکان دسترسی به فایل وجود ندارد: ';
+$PHPMAILER_LANG['file_open']            = 'خطای File: امکان بازکردن فایل وجود ندارد: ';
+$PHPMAILER_LANG['from_failed']          = 'آدرس فرستنده اشتباه است: ';
+$PHPMAILER_LANG['instantiate']          = 'امکان معرفی تابع ایمیل وجود ندارد.';
+$PHPMAILER_LANG['invalid_address']      = 'آدرس ایمیل معتبر نیست: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer پشتیبانی نمی‌شود.';
+$PHPMAILER_LANG['provide_address']      = 'باید حداقل یک آدرس گیرنده وارد کنید.';
+$PHPMAILER_LANG['recipients_failed']    = 'خطای SMTP: ارسال به آدرس گیرنده با خطا مواجه شد: ';
+$PHPMAILER_LANG['signing']              = 'خطا در امضا: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'خطا در اتصال به SMTP.';
+$PHPMAILER_LANG['smtp_error']           = 'خطا در SMTP Server: ';
+$PHPMAILER_LANG['variable_set']         = 'امکان ارسال یا ارسال مجدد متغیر‌ها وجود ندارد: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fi.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fi.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fi.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Finnish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Jyry Kuukanen
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-virhe: käyttäjätunnistus epäonnistui.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-virhe: yhteys palvelimeen ei onnistu.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-virhe: data on virheellinen.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
+$PHPMAILER_LANG['execute']              = 'Suoritus epäonnistui: ';
+$PHPMAILER_LANG['file_access']          = 'Seuraavaan tiedostoon ei ole oikeuksia: ';
+$PHPMAILER_LANG['file_open']            = 'Tiedostovirhe: Ei voida avata tiedostoa: ';
+$PHPMAILER_LANG['from_failed']          = 'Seuraava lähettäjän osoite on virheellinen: ';
+$PHPMAILER_LANG['instantiate']          = 'mail-funktion luonti epäonnistui.';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
+$PHPMAILER_LANG['provide_address']      = 'Aseta vähintään yksi vastaanottajan sähköpostiosoite.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fo.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fo.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fo.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Faroese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Dávur Sørensen <http://www.profo-webdesign.dk>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP feilur: Kundi ikki góðkenna.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP feilur: Kundi ikki knýta samband við SMTP vert.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP feilur: Data ikki góðkent.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Ókend encoding: ';
+$PHPMAILER_LANG['execute']              = 'Kundi ikki útføra: ';
+$PHPMAILER_LANG['file_access']          = 'Kundi ikki tilganga fílu: ';
+$PHPMAILER_LANG['file_open']            = 'Fílu feilur: Kundi ikki opna fílu: ';
+$PHPMAILER_LANG['from_failed']          = 'fylgjandi Frá/From adressa miseydnaðist: ';
+$PHPMAILER_LANG['instantiate']          = 'Kuni ikki instantiera mail funktión.';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' er ikki supporterað.';
+$PHPMAILER_LANG['provide_address']      = 'Tú skal uppgeva minst móttakara-emailadressu(r).';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feilur: Fylgjandi móttakarar miseydnaðust: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fr.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fr.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-fr.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * French PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
+ * for example before a colon or exclamation mark.
+ * There is one of these characters between these quotes: " "
+ * @see http://unicode.org/udhr/n/notes_fra.html
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l\'authentification.';
+$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
+$PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
+$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l\'exécution : ';
+$PHPMAILER_LANG['file_access']          = 'Impossible d\'accéder au fichier : ';
+$PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
+$PHPMAILER_LANG['from_failed']          = 'L\'adresse d\'expéditeur suivante a échoué : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d\'instancier la fonction mail.';
+$PHPMAILER_LANG['invalid_address']      = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
+$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
+$PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Échec de la connexion SMTP.';
+$PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Impossible d\'initialiser ou de réinitialiser une variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-gl.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-gl.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-gl.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Galician PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author by Donato Rouco <donatorouco at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro SMTP: Non puido ser autentificado.';
+$PHPMAILER_LANG['connect_host']         = 'Erro SMTP: Non puido conectar co servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro SMTP: Datos non aceptados.';
+$PHPMAILER_LANG['empty_message']        = 'Corpo da mensaxe vacía';
+$PHPMAILER_LANG['encoding']             = 'Codificación descoñecida: ';
+$PHPMAILER_LANG['execute']              = 'Non puido ser executado: ';
+$PHPMAILER_LANG['file_access']          = 'Nob puido acceder ó arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: No puido abrir o arquivo: ';
+$PHPMAILER_LANG['from_failed']          = 'A(s) seguinte(s) dirección(s) de remitente(s) deron erro: ';
+$PHPMAILER_LANG['instantiate']          = 'Non puido crear unha instancia da función Mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Non puido envia-lo correo: dirección de email inválida: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer non está soportado.';
+$PHPMAILER_LANG['provide_address']      = 'Debe engadir polo menos unha dirección de email coma destino.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro SMTP: Os seguintes destinos fallaron: ';
+$PHPMAILER_LANG['signing']              = 'Erro ó firmar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro do servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Non puidemos axustar ou reaxustar a variábel: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-he.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-he.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-he.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hebrew PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ronny Sherer <ronny at hoojima.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'שגיאת SMTP: פעולת האימות נכשלה.';
+$PHPMAILER_LANG['connect_host']         = 'שגיאת SMTP: לא הצלחתי להתחבר לשרת SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'שגיאת SMTP: מידע לא התקבל.';
+$PHPMAILER_LANG['empty_message']        = 'גוף ההודעה ריק';
+$PHPMAILER_LANG['invalid_address']      = 'כתובת שגויה: ';
+$PHPMAILER_LANG['encoding']             = 'קידוד לא מוכר: ';
+$PHPMAILER_LANG['execute']              = 'לא הצלחתי להפעיל את: ';
+$PHPMAILER_LANG['file_access']          = 'לא ניתן לגשת לקובץ: ';
+$PHPMAILER_LANG['file_open']            = 'שגיאת קובץ: לא ניתן לגשת לקובץ: ';
+$PHPMAILER_LANG['from_failed']          = 'כתובות הנמענים הבאות נכשלו: ';
+$PHPMAILER_LANG['instantiate']          = 'לא הצלחתי להפעיל את פונקציית המייל.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' אינה נתמכת.';
+$PHPMAILER_LANG['provide_address']      = 'חובה לספק לפחות כתובת אחת של מקבל המייל.';
+$PHPMAILER_LANG['recipients_failed']    = 'שגיאת SMTP: הנמענים הבאים נכשלו: ';
+$PHPMAILER_LANG['signing']              = 'שגיאת חתימה: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+$PHPMAILER_LANG['smtp_error']           = 'שגיאת שרת SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'לא ניתן לקבוע או לשנות את המשתנה: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hr.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hr.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hr.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Croatian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Hrvoj3e <hrvoj3e at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Greška: Neuspjela autentikacija.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Greška: Ne mogu se spojiti na SMTP poslužitelj.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Greška: Podatci nisu prihvaćeni.';
+$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznati encoding: ';
+$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
+$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
+$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP Greška: Slanje s navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Greška: Slanje na navedenih e-mail adresa nije uspjelo: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne mogu pokrenuti mail funkcionalnost.';
+$PHPMAILER_LANG['invalid_address']      = 'E-mail nije poslan. Neispravna e-mail adresa: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nije podržan.';
+$PHPMAILER_LANG['provide_address']      = 'Definirajte barem jednu adresu primatelja.';
+$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP poslužitelj nije uspjelo.';
+$PHPMAILER_LANG['smtp_error']           = 'Greška SMTP poslužitelja: ';
+$PHPMAILER_LANG['variable_set']         = 'Ne mogu postaviti varijablu niti ju vratiti nazad: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje proširenje: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hu.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hu.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-hu.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hungarian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author @dominicus-75
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP hiba: az azonosítás sikertelen.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP hiba: nem lehet kapcsolódni az SMTP-szerverhez.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP hiba: adatok visszautasítva.';
+$PHPMAILER_LANG['empty_message']        = 'Üres az üzenettörzs.';
+$PHPMAILER_LANG['encoding']             = 'Ismeretlen kódolás: ';
+$PHPMAILER_LANG['execute']              = 'Nem lehet végrehajtani: ';
+$PHPMAILER_LANG['file_access']          = 'A következő fájl nem elérhető: ';
+$PHPMAILER_LANG['file_open']            = 'Fájl hiba: a következő fájlt nem lehet megnyitni: ';
+$PHPMAILER_LANG['from_failed']          = 'A feladóként megadott következő cím hibás: ';
+$PHPMAILER_LANG['instantiate']          = 'A PHP mail() függvényt nem sikerült végrehajtani.';
+$PHPMAILER_LANG['invalid_address']      = 'Érvénytelen cím: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' a mailer-osztály nem támogatott.';
+$PHPMAILER_LANG['provide_address']      = 'Legalább egy címzettet fel kell tüntetni.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP hiba: a címzettként megadott következő címek hibásak: ';
+$PHPMAILER_LANG['signing']              = 'Hibás aláírás: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Hiba az SMTP-kapcsolatban.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-szerver hiba: ';
+$PHPMAILER_LANG['variable_set']         = 'A következő változók beállítása nem sikerült: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-id.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-id.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-id.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Indonesian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Cecep Prawiro <cecep.prawiro at gmail.com>
+ * @author @januridp
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Kesalahan SMTP: Tidak dapat mengotentikasi.';
+$PHPMAILER_LANG['connect_host']         = 'Kesalahan SMTP: Tidak dapat terhubung ke host SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Kesalahan SMTP: Data tidak diterima peladen.';
+$PHPMAILER_LANG['empty_message']        = 'Isi pesan kosong';
+$PHPMAILER_LANG['encoding']             = 'Pengkodean karakter tidak dikenali: ';
+$PHPMAILER_LANG['execute']              = 'Tidak dapat menjalankan proses : ';
+$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses berkas : ';
+$PHPMAILER_LANG['file_open']            = 'Kesalahan File: Berkas tidak bisa dibuka : ';
+$PHPMAILER_LANG['from_failed']          = 'Alamat pengirim berikut mengakibatkan kesalahan : ';
+$PHPMAILER_LANG['instantiate']          = 'Tidak dapat menginisialisasi fungsi surel';
+$PHPMAILER_LANG['invalid_address']      = 'Gagal terkirim, alamat surel tidak benar : ';
+$PHPMAILER_LANG['provide_address']      = 'Harus disediakan minimal satu alamat tujuan';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Pengirim tidak didukung';
+$PHPMAILER_LANG['recipients_failed']    = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan kesalahan : ';
+$PHPMAILER_LANG['signing']              = 'Kesalahan dalam tanda tangan : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() gagal.';
+$PHPMAILER_LANG['smtp_error']           = 'Kesalahan pada pelayan SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Tidak berhasil mengatur atau mengatur ulang variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Ekstensi hilang: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-it.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-it.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-it.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Italian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Ilias Bartolini <brain79 at inwind.it>
+ * @author Stefano Sabatini <sabas88 at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Impossibile autenticarsi.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Impossibile connettersi all\'host SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Dati non accettati dal server.';
+$PHPMAILER_LANG['empty_message']        = 'Il corpo del messaggio è vuoto';
+$PHPMAILER_LANG['encoding']             = 'Codifica dei caratteri sconosciuta: ';
+$PHPMAILER_LANG['execute']              = 'Impossibile eseguire l\'operazione: ';
+$PHPMAILER_LANG['file_access']          = 'Impossibile accedere al file: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Impossibile aprire il file: ';
+$PHPMAILER_LANG['from_failed']          = 'I seguenti indirizzi mittenti hanno generato errore: ';
+$PHPMAILER_LANG['instantiate']          = 'Impossibile istanziare la funzione mail';
+$PHPMAILER_LANG['invalid_address']      = 'Impossibile inviare, l\'indirizzo email non è valido: ';
+$PHPMAILER_LANG['provide_address']      = 'Deve essere fornito almeno un indirizzo ricevente';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Mailer non supportato';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: I seguenti indirizzi destinatari hanno generato un errore: ';
+$PHPMAILER_LANG['signing']              = 'Errore nella firma: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallita.';
+$PHPMAILER_LANG['smtp_error']           = 'Errore del server SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Impossibile impostare o resettare la variabile: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ja.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ja.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ja.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Japanese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mitsuhiro Yoshida <http://mitstek.com/>
+ * @author Yoshi Sakai <http://bluemooninc.jp/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
+$PHPMAILER_LANG['execute']              = '実行できませんでした: ';
+$PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
+$PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
+$PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
+$PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ka.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ka.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ka.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Georgian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Avtandil Kikabidze aka LONGMAN <akalongman at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP შეცდომა: ავტორიზაცია შეუძლებელია.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP შეცდომა: SMTP სერვერთან დაკავშირება შეუძლებელია.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP შეცდომა: მონაცემები არ იქნა მიღებული.';
+$PHPMAILER_LANG['encoding']             = 'კოდირების უცნობი ტიპი: ';
+$PHPMAILER_LANG['execute']              = 'შეუძლებელია შემდეგი ბრძანების შესრულება: ';
+$PHPMAILER_LANG['file_access']          = 'შეუძლებელია წვდომა ფაილთან: ';
+$PHPMAILER_LANG['file_open']            = 'ფაილური სისტემის შეცდომა: არ იხსნება ფაილი: ';
+$PHPMAILER_LANG['from_failed']          = 'გამგზავნის არასწორი მისამართი: ';
+$PHPMAILER_LANG['instantiate']          = 'mail ფუნქციის გაშვება ვერ ხერხდება.';
+$PHPMAILER_LANG['provide_address']      = 'გთხოვთ მიუთითოთ ერთი ადრესატის e-mail მისამართი მაინც.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - საფოსტო სერვერის მხარდაჭერა არ არის.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP შეცდომა: შემდეგ მისამართებზე გაგზავნა ვერ მოხერხდა: ';
+$PHPMAILER_LANG['empty_message']        = 'შეტყობინება ცარიელია';
+$PHPMAILER_LANG['invalid_address']      = 'არ გაიგზავნა, e-mail მისამართის არასწორი ფორმატი: ';
+$PHPMAILER_LANG['signing']              = 'ხელმოწერის შეცდომა: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'შეცდომა SMTP სერვერთან დაკავშირებისას';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP სერვერის შეცდომა: ';
+$PHPMAILER_LANG['variable_set']         = 'შეუძლებელია შემდეგი ცვლადის შექმნა ან შეცვლა: ';
+$PHPMAILER_LANG['extension_missing']    = 'ბიბლიოთეკა არ არსებობს: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ko.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ko.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ko.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Korean PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author ChalkPE <amato0617 at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 오류: 인증할 수 없습니다.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 오류: SMTP 호스트에 접속할 수 없습니다.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 오류: 데이터가 받아들여지지 않았습니다.';
+$PHPMAILER_LANG['empty_message']        = '메세지 내용이 없습니다';
+$PHPMAILER_LANG['encoding']             = '알 수 없는 인코딩: ';
+$PHPMAILER_LANG['execute']              = '실행 불가: ';
+$PHPMAILER_LANG['file_access']          = '파일 접근 불가: ';
+$PHPMAILER_LANG['file_open']            = '파일 오류: 파일을 열 수 없습니다: ';
+$PHPMAILER_LANG['from_failed']          = '다음 From 주소에서 오류가 발생했습니다: ';
+$PHPMAILER_LANG['instantiate']          = 'mail 함수를 인스턴스화할 수 없습니다';
+$PHPMAILER_LANG['invalid_address']      = '잘못된 주소: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 메일러는 지원되지 않습니다.';
+$PHPMAILER_LANG['provide_address']      = '적어도 한 개 이상의 수신자 메일 주소를 제공해야 합니다.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 오류: 다음 수신자에서 오류가 발생했습니다: ';
+$PHPMAILER_LANG['signing']              = '서명 오류: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP 연결을 실패하였습니다.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP 서버 오류: ';
+$PHPMAILER_LANG['variable_set']         = '변수 설정 및 초기화 불가: ';
+$PHPMAILER_LANG['extension_missing']    = '확장자 없음: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lt.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lt.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lt.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Lithuanian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Dainius Kaupaitis <dk at sum.lt>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP klaida: autentifikacija nepavyko.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP klaida: nepavyksta prisijungti prie SMTP stoties.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP klaida: duomenys nepriimti.';
+$PHPMAILER_LANG['empty_message']        = 'Laiško turinys tuščias';
+$PHPMAILER_LANG['encoding']             = 'Neatpažinta koduotė: ';
+$PHPMAILER_LANG['execute']              = 'Nepavyko įvykdyti komandos: ';
+$PHPMAILER_LANG['file_access']          = 'Byla nepasiekiama: ';
+$PHPMAILER_LANG['file_open']            = 'Bylos klaida: Nepavyksta atidaryti: ';
+$PHPMAILER_LANG['from_failed']          = 'Neteisingas siuntėjo adresas: ';
+$PHPMAILER_LANG['instantiate']          = 'Nepavyko paleisti mail funkcijos.';
+$PHPMAILER_LANG['invalid_address']      = 'Neteisingas adresas: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' pašto stotis nepalaikoma.';
+$PHPMAILER_LANG['provide_address']      = 'Nurodykite bent vieną gavėjo adresą.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP klaida: nepavyko išsiųsti šiems gavėjams: ';
+$PHPMAILER_LANG['signing']              = 'Prisijungimo klaida: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP susijungimo klaida';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP stoties klaida: ';
+$PHPMAILER_LANG['variable_set']         = 'Nepavyko priskirti reikšmės kintamajam: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lv.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lv.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-lv.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Latvian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Eduards M. <e at npd.lv>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP kļūda: Autorizācija neizdevās.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Kļūda: Nevar izveidot savienojumu ar SMTP serveri.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Kļūda: Nepieņem informāciju.';
+$PHPMAILER_LANG['empty_message']        = 'Ziņojuma teksts ir tukšs';
+$PHPMAILER_LANG['encoding']             = 'Neatpazīts kodējums: ';
+$PHPMAILER_LANG['execute']              = 'Neizdevās izpildīt komandu: ';
+$PHPMAILER_LANG['file_access']          = 'Fails nav pieejams: ';
+$PHPMAILER_LANG['file_open']            = 'Faila kļūda: Nevar atvērt failu: ';
+$PHPMAILER_LANG['from_failed']          = 'Nepareiza sūtītāja adrese: ';
+$PHPMAILER_LANG['instantiate']          = 'Nevar palaist sūtīšanas funkciju.';
+$PHPMAILER_LANG['invalid_address']      = 'Nepareiza adrese: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sūtītājs netiek atbalstīts.';
+$PHPMAILER_LANG['provide_address']      = 'Lūdzu, norādiet vismaz vienu adresātu.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP kļūda: neizdevās nosūtīt šādiem saņēmējiem: ';
+$PHPMAILER_LANG['signing']              = 'Autorizācijas kļūda: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP savienojuma kļūda';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP servera kļūda: ';
+$PHPMAILER_LANG['variable_set']         = 'Nevar piešķirt mainīgā vērtību: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ms.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ms.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ms.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Malaysian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Nawawi Jamili <nawawi at rutweb.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ralat SMTP: Tidak dapat pengesahan.';
+$PHPMAILER_LANG['connect_host']         = 'Ralat SMTP: Tidak dapat menghubungi hos pelayan SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ralat SMTP: Data tidak diterima oleh pelayan.';
+$PHPMAILER_LANG['empty_message']        = 'Tiada isi untuk mesej';
+$PHPMAILER_LANG['encoding']             = 'Pengekodan tidak diketahui: ';
+$PHPMAILER_LANG['execute']              = 'Tidak dapat melaksanakan: ';
+$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses fail: ';
+$PHPMAILER_LANG['file_open']            = 'Ralat Fail: Tidak dapat membuka fail: ';
+$PHPMAILER_LANG['from_failed']          = 'Berikut merupakan ralat dari alamat e-mel: ';
+$PHPMAILER_LANG['instantiate']          = 'Tidak dapat memberi contoh fungsi e-mel.';
+$PHPMAILER_LANG['invalid_address']      = 'Alamat emel tidak sah: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' jenis penghantar emel tidak disokong.';
+$PHPMAILER_LANG['provide_address']      = 'Anda perlu menyediakan sekurang-kurangnya satu alamat e-mel penerima.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ralat SMTP: Penerima e-mel berikut telah gagal: ';
+$PHPMAILER_LANG['signing']              = 'Ralat pada tanda tangan: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() telah gagal.';
+$PHPMAILER_LANG['smtp_error']           = 'Ralat pada pelayan SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Tidak boleh menetapkan atau menetapkan semula pembolehubah: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nb.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nb.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nb.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.';
+$PHPMAILER_LANG['empty_message']        = 'Melding kropp tomt';
+$PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
+$PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: ';
+$PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.';
+$PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
+$PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
+$PHPMAILER_LANG['signing']              = 'Signering Feil: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nl.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nl.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-nl.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
+ * @package PHPMailer
+ * @author Tuxion <team at tuxion.nl>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';
+$PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';
+$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
+$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';
+$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';
+$PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';
+$PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG['provide_address']      = 'Er moet minstens één ontvanger worden opgegeven.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';
+$PHPMAILER_LANG['signing']              = 'Signeerfout: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pl.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pl.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pl.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Polish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzić uwierzytelnienia.';
+$PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
+$PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
+$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
+$PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
+$PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, '.
+    'następujący adres Odbiorcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
+$PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Portuguese (European) PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Jonadabe <jonadabe at hotmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro do SMTP: Não foi possível realizar a autenticação.';
+$PHPMAILER_LANG['connect_host']         = 'Erro do SMTP: Não foi possível realizar ligação com o servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro do SMTP: Os dados foram rejeitados.';
+$PHPMAILER_LANG['empty_message']        = 'A mensagem no e-mail está vazia.';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível aceder o ficheiro: ';
+$PHPMAILER_LANG['file_open']            = 'Abertura do ficheiro: Não foi possível abrir o ficheiro: ';
+$PHPMAILER_LANG['from_failed']          = 'Ocorreram falhas nos endereços dos seguintes remententes: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível iniciar uma instância da função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Não foi enviado nenhum e-mail para o endereço de e-mail inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Tem de fornecer pelo menos um endereço como destinatário do e-mail.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro do SMTP: O endereço do seguinte destinatário falhou: ';
+$PHPMAILER_LANG['signing']              = 'Erro ao assinar: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão em falta: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt_br.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt_br.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-pt_br.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Paulo Henrique Garcia <paulo at controllerweb.com.br>
+ * @author Lucas Guimarães <lucas at lucasguimaraes.com>
+ * @author Phelipe Alves <phelipealvesdesouza at gmail.com>
+ * @author Fabio Beneditto <fabiobeneditto at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados rejeitados.';
+$PHPMAILER_LANG['empty_message']        = 'Mensagem vazia';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
+$PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Você deve informar pelo menos um destinatário.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os seguintes destinatários falharam: ';
+$PHPMAILER_LANG['signing']              = 'Erro de Assinatura: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão ausente: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ro.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ro.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ro.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Romanian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alex Florea <alecz.fia at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Autentificarea a eșuat.';
+$PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Datele nu au fost acceptate.';
+$PHPMAILER_LANG['empty_message']        = 'Mesajul este gol.';
+$PHPMAILER_LANG['encoding']             = 'Encodare necunoscută: ';
+$PHPMAILER_LANG['execute']              = 'Nu se poate executa următoarea comandă:  ';
+$PHPMAILER_LANG['file_access']          = 'Nu se poate accesa următorul fișier: ';
+$PHPMAILER_LANG['file_open']            = 'Eroare fișier: Nu se poate deschide următorul fișier: ';
+$PHPMAILER_LANG['from_failed']          = 'Următoarele adrese From au dat eroare: ';
+$PHPMAILER_LANG['instantiate']          = 'Funcția mail nu a putut fi inițializată.';
+$PHPMAILER_LANG['invalid_address']      = 'Adresa de email nu este validă: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
+$PHPMAILER_LANG['provide_address']      = 'Trebuie să adăugați cel puțin o adresă de email.';
+$PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Următoarele adrese de email au eșuat: ';
+$PHPMAILER_LANG['signing']              = 'A aparut o problemă la semnarea emailului. ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['smtp_error']           = 'Eroare server SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
+$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-rs.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-rs.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-rs.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Serbian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Александар Јевремовић <ajevremovic at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: аутентификација није успела.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: није могуће повезивање са SMTP сервером.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: подаци нису прихваћени.';
+$PHPMAILER_LANG['empty_message']        = 'Садржај поруке је празан.';
+$PHPMAILER_LANG['encoding']             = 'Непознато кодовање: ';
+$PHPMAILER_LANG['execute']              = 'Није могуће извршити наредбу: ';
+$PHPMAILER_LANG['file_access']          = 'Није могуће приступити датотеци: ';
+$PHPMAILER_LANG['file_open']            = 'Није могуће отворити датотеку: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP грешка: слање са следећих адреса није успело: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: слање на следеће адресе није успело: ';
+$PHPMAILER_LANG['instantiate']          = 'Није могуће покренути mail функцију.';
+$PHPMAILER_LANG['invalid_address']      = 'Порука није послата због неисправне адресе: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' мејлер није подржан.';
+$PHPMAILER_LANG['provide_address']      = 'Потребно је задати најмање једну адресу.';
+$PHPMAILER_LANG['signing']              = 'Грешка приликом пријављивања: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.';
+$PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: ';
+$PHPMAILER_LANG['extension_missing']    = 'Недостаје проширење: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ru.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ru.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-ru.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Russian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alexey Chumakov <alex at chumakov.ru>
+ * @author Foster Snowhill <i18n at forstwoof.ru>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['encoding']             = 'Неизвестный вид кодировки: ';
+$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удается открыть файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
+$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail.';
+$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: ';
+$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
+$PHPMAILER_LANG['invalid_address']      = 'Не отослано, неправильный формат email адреса: ';
+$PHPMAILER_LANG['signing']              = 'Ошибка подписи: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
+$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Невозможно установить или переустановить переменную: ';
+$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sk.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sk.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sk.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Slovak PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Michal Tinka <michaltinka at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Chyba autentifikácie.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Nebolo možné nadviazať spojenie so SMTP serverom.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Dáta neboli prijaté';
+$PHPMAILER_LANG['empty_message']        = 'Prázdne telo správy.';
+$PHPMAILER_LANG['encoding']             = 'Neznáme kódovanie: ';
+$PHPMAILER_LANG['execute']              = 'Nedá sa vykonať: ';
+$PHPMAILER_LANG['file_access']          = 'Súbor nebol nájdený: ';
+$PHPMAILER_LANG['file_open']            = 'File Error: Súbor sa otvoriť pre čítanie: ';
+$PHPMAILER_LANG['from_failed']          = 'Následujúca adresa From je nesprávna: ';
+$PHPMAILER_LANG['instantiate']          = 'Nedá sa vytvoriť inštancia emailovej funkcie.';
+$PHPMAILER_LANG['invalid_address']      = 'Neodoslané, emailová adresa je nesprávna: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' emailový klient nieje podporovaný.';
+$PHPMAILER_LANG['provide_address']      = 'Musíte zadať aspoň jednu emailovú adresu príjemcu.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Adresy príjemcov niesu správne ';
+$PHPMAILER_LANG['signing']              = 'Chyba prihlasovania: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zlyhalo.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP chyba serveru: ';
+$PHPMAILER_LANG['variable_set']         = 'Nemožno nastaviť alebo resetovať premennú: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sl.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sl.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sl.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Slovene PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Klemen Tušar <techouse at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP napaka: Avtentikacija ni uspela.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP napaka: Ne morem vzpostaviti povezave s SMTP gostiteljem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP napaka: Strežnik zavrača podatke.';
+$PHPMAILER_LANG['empty_message']        = 'E-poštno sporočilo nima vsebine.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznan tip kodiranja: ';
+$PHPMAILER_LANG['execute']              = 'Operacija ni uspela: ';
+$PHPMAILER_LANG['file_access']          = 'Nimam dostopa do datoteke: ';
+$PHPMAILER_LANG['file_open']            = 'Ne morem odpreti datoteke: ';
+$PHPMAILER_LANG['from_failed']          = 'Neveljaven e-naslov pošiljatelja: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne morem inicializirati mail funkcije.';
+$PHPMAILER_LANG['invalid_address']      = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
+$PHPMAILER_LANG['provide_address']      = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
+$PHPMAILER_LANG['signing']              = 'Napaka pri podpisovanju: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
+$PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
+$PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sv.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sv.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-sv.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Swedish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Johan Linnér <johan at linner.biz>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP fel: Kunde inte autentisera.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fel: Kunde inte ansluta till SMTP-server.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fel: Data accepterades inte.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Okänt encode-format: ';
+$PHPMAILER_LANG['execute']              = 'Kunde inte köra: ';
+$PHPMAILER_LANG['file_access']          = 'Ingen åtkomst till fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fel: Kunde inte öppna fil: ';
+$PHPMAILER_LANG['from_failed']          = 'Följande avsändaradress är felaktig: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunde inte initiera e-postfunktion.';
+$PHPMAILER_LANG['invalid_address']      = 'Felaktig adress: ';
+$PHPMAILER_LANG['provide_address']      = 'Du måste ange minst en mottagares e-postadress.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fel: Följande mottagare är felaktig: ';
+$PHPMAILER_LANG['signing']              = 'Signerings fel: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() misslyckades.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server fel: ';
+$PHPMAILER_LANG['variable_set']         = 'Kunde inte definiera eller återställa variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Tillägg ej tillgängligt: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-tr.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-tr.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-tr.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Turkish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Elçin Özel
+ * @author Can Yılmaz
+ * @author Mehmet Benlioğlu
+ * @author @yasinaydin
+ * @author Ogün Karakuş
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Hatası: Oturum açılamadı.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Hatası: SMTP sunucusuna bağlanılamadı.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Hatası: Veri kabul edilmedi.';
+$PHPMAILER_LANG['empty_message']        = 'Mesajın içeriği boş';
+$PHPMAILER_LANG['encoding']             = 'Bilinmeyen karakter kodlama: ';
+$PHPMAILER_LANG['execute']              = 'Çalıştırılamadı: ';
+$PHPMAILER_LANG['file_access']          = 'Dosyaya erişilemedi: ';
+$PHPMAILER_LANG['file_open']            = 'Dosya Hatası: Dosya açılamadı: ';
+$PHPMAILER_LANG['from_failed']          = 'Belirtilen adreslere gönderme başarısız: ';
+$PHPMAILER_LANG['instantiate']          = 'Örnek e-posta fonksiyonu oluşturulamadı.';
+$PHPMAILER_LANG['invalid_address']      = 'Geçersiz e-posta adresi: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' e-posta kütüphanesi desteklenmiyor.';
+$PHPMAILER_LANG['provide_address']      = 'En az bir alıcı e-posta adresi belirtmelisiniz.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Hatası: Belirtilen alıcılara ulaşılamadı: ';
+$PHPMAILER_LANG['signing']              = 'İmzalama hatası: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() fonksiyonu başarısız.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP sunucu hatası: ';
+$PHPMAILER_LANG['variable_set']         = 'Değişken ayarlanamadı ya da sıfırlanamadı: ';
+$PHPMAILER_LANG['extension_missing']    = 'Eklenti bulunamadı: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-uk.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-uk.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-uk.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Ukrainian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Yuriy Rudyy <yrudyy at prs.net.ua>
+ * @fixed by Boris Yurchenko <boris at yurchenko.pp.ua>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Помилка SMTP: помилка авторизації.';
+$PHPMAILER_LANG['connect_host']         = 'Помилка SMTP: не вдається під\'єднатися до серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Помилка SMTP: дані не прийняті.';
+$PHPMAILER_LANG['encoding']             = 'Невідомий тип кодування: ';
+$PHPMAILER_LANG['execute']              = 'Неможливо виконати команду: ';
+$PHPMAILER_LANG['file_access']          = 'Немає доступу до файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
+$PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail.';
+$PHPMAILER_LANG['provide_address']      = 'Будь-ласка, введіть хоча б одну адресу e-mail отримувача.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
+$PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: відправлення наступним отримувачам не вдалося: ';
+$PHPMAILER_LANG['empty_message']        = 'Пусте тіло повідомлення';
+$PHPMAILER_LANG['invalid_address']      = 'Не відправлено, невірний формат адреси e-mail: ';
+$PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднання із SMTP-сервером';
+$PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Неможливо встановити або перевстановити змінну: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-vi.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-vi.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-vi.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list.
+ * @package PHPMailer
+ * @author VINADES.,JSC <contact at vinades.vn>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Lỗi SMTP: Không thể xác thực.';
+$PHPMAILER_LANG['connect_host']         = 'Lỗi SMTP: Không thể kết nối máy chủ SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Lỗi SMTP: Dữ liệu không được chấp nhận.';
+$PHPMAILER_LANG['empty_message']        = 'Không có nội dung';
+$PHPMAILER_LANG['encoding']             = 'Mã hóa không xác định: ';
+$PHPMAILER_LANG['execute']              = 'Không thực hiện được: ';
+$PHPMAILER_LANG['file_access']          = 'Không thể truy cập tệp tin ';
+$PHPMAILER_LANG['file_open']            = 'Lỗi Tập tin: Không thể mở tệp tin: ';
+$PHPMAILER_LANG['from_failed']          = 'Lỗi địa chỉ gửi đi: ';
+$PHPMAILER_LANG['instantiate']          = 'Không dùng được các hàm gửi thư.';
+$PHPMAILER_LANG['invalid_address']      = 'Đại chỉ emai không đúng: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' trình gửi thư không được hỗ trợ.';
+$PHPMAILER_LANG['provide_address']      = 'Bạn phải cung cấp ít nhất một địa chỉ người nhận.';
+$PHPMAILER_LANG['recipients_failed']    = 'Lỗi SMTP: lỗi địa chỉ người nhận: ';
+$PHPMAILER_LANG['signing']              = 'Lỗi đăng nhập: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Lỗi kết nối với SMTP';
+$PHPMAILER_LANG['smtp_error']           = 'Lỗi máy chủ smtp ';
+$PHPMAILER_LANG['variable_set']         = 'Không thể thiết lập hoặc thiết lập lại biến: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Traditional Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author liqwei <liqwei at liqwei.com>
+ * @author Peter Dave Hello <@PeterDaveHello/>
+ * @author Jason Chiang <xcojad at gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 錯誤:登入失敗。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 錯誤:無法連線到 SMTP 主機。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 錯誤:無法接受的資料。';
+$PHPMAILER_LANG['empty_message']        = '郵件內容為空';
+$PHPMAILER_LANG['encoding']             = '未知編碼: ';
+$PHPMAILER_LANG['execute']              = '無法執行:';
+$PHPMAILER_LANG['file_access']          = '無法存取檔案:';
+$PHPMAILER_LANG['file_open']            = '檔案錯誤:無法開啟檔案:';
+$PHPMAILER_LANG['from_failed']          = '發送地址錯誤:';
+$PHPMAILER_LANG['instantiate']          = '未知函數呼叫。';
+$PHPMAILER_LANG['invalid_address']      = '因為電子郵件地址無效,無法傳送: ';
+$PHPMAILER_LANG['mailer_not_supported'] = '不支援的發信客戶端。';
+$PHPMAILER_LANG['provide_address']      = '必須提供至少一個收件人地址。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 錯誤:以下收件人地址錯誤:';
+$PHPMAILER_LANG['signing']              = '電子簽章錯誤: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP 連線失敗';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP 伺服器錯誤: ';
+$PHPMAILER_LANG['variable_set']         = '無法設定或重設變數: ';
+$PHPMAILER_LANG['extension_missing']    = '遺失模組 Extension: ';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh_cn.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh_cn.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/language/phpmailer.lang-zh_cn.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Simplified Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author liqwei <liqwei at liqwei.com>
+ * @author young <masxy at foxmail.com>
+ * @author Teddysun <i at teddysun.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误:登录失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误:无法连接到 SMTP 主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误:数据不被接受。';
+$PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
+$PHPMAILER_LANG['encoding']             = '未知编码:';
+$PHPMAILER_LANG['execute']              = '无法执行:';
+$PHPMAILER_LANG['file_access']          = '无法访问文件:';
+$PHPMAILER_LANG['file_open']            = '文件错误:无法打开文件:';
+$PHPMAILER_LANG['from_failed']          = '发送地址错误:';
+$PHPMAILER_LANG['instantiate']          = '未知函数调用。';
+$PHPMAILER_LANG['invalid_address']      = '发送失败,电子邮箱地址是无效的:';
+$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
+$PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地址。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误:收件人地址错误:';
+$PHPMAILER_LANG['signing']              = '登录失败:';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错:';
+$PHPMAILER_LANG['variable_set']         = '无法设置或重置变量:';
+$PHPMAILER_LANG['extension_missing']    = '丢失模块 Extension:';

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/phpdoc.dist.xml
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/phpdoc.dist.xml	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/phpdoc.dist.xml	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<phpdoc>
+    <title>PHPMailer</title>
+    <parser>
+        <target>docs</target>
+        <encoding>utf8</encoding>
+        <markers>
+            <item>TODO</item>
+        </markers>
+    </parser>
+    <transformer>
+        <target>docs</target>
+    </transformer>
+    <transformations>
+        <template name="clean"/>
+    </transformations>
+    <files>
+        <directory>src</directory>
+    </files>
+</phpdoc>

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/src/Exception.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/Exception.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/Exception.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * PHPMailer Exception class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer exception handler.
+ *
+ * @author  Marcus Bointon <phpmailer at synchromedia.co.uk>
+ */
+class Exception extends \Exception
+{
+    /**
+     * Prettify error message output.
+     *
+     * @return string
+     */
+    public function errorMessage()
+    {
+        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/src/OAuth.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/OAuth.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/OAuth.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,138 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2015 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+use League\OAuth2\Client\Grant\RefreshToken;
+use League\OAuth2\Client\Provider\AbstractProvider;
+use League\OAuth2\Client\Token\AccessToken;
+
+/**
+ * OAuth - OAuth2 authentication wrapper class.
+ * Uses the oauth2-client package from the League of Extraordinary Packages.
+ *
+ * @see     http://oauth2-client.thephpleague.com
+ *
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ */
+class OAuth
+{
+    /**
+     * An instance of the League OAuth Client Provider.
+     *
+     * @var AbstractProvider
+     */
+    protected $provider;
+
+    /**
+     * The current OAuth access token.
+     *
+     * @var AccessToken
+     */
+    protected $oauthToken;
+
+    /**
+     * The user's email address, usually used as the login ID
+     * and also the from address when sending email.
+     *
+     * @var string
+     */
+    protected $oauthUserEmail = '';
+
+    /**
+     * The client secret, generated in the app definition of the service you're connecting to.
+     *
+     * @var string
+     */
+    protected $oauthClientSecret = '';
+
+    /**
+     * The client ID, generated in the app definition of the service you're connecting to.
+     *
+     * @var string
+     */
+    protected $oauthClientId = '';
+
+    /**
+     * The refresh token, used to obtain new AccessTokens.
+     *
+     * @var string
+     */
+    protected $oauthRefreshToken = '';
+
+    /**
+     * OAuth constructor.
+     *
+     * @param array $options Associative array containing
+     *                       `provider`, `userName`, `clientSecret`, `clientId` and `refreshToken` elements
+     */
+    public function __construct($options)
+    {
+        $this->provider = $options['provider'];
+        $this->oauthUserEmail = $options['userName'];
+        $this->oauthClientSecret = $options['clientSecret'];
+        $this->oauthClientId = $options['clientId'];
+        $this->oauthRefreshToken = $options['refreshToken'];
+    }
+
+    /**
+     * Get a new RefreshToken.
+     *
+     * @return RefreshToken
+     */
+    protected function getGrant()
+    {
+        return new RefreshToken();
+    }
+
+    /**
+     * Get a new AccessToken.
+     *
+     * @return AccessToken
+     */
+    protected function getToken()
+    {
+        return $this->provider->getAccessToken(
+            $this->getGrant(),
+            ['refresh_token' => $this->oauthRefreshToken]
+        );
+    }
+
+    /**
+     * Generate a base64-encoded OAuth token.
+     *
+     * @return string
+     */
+    public function getOauth64()
+    {
+        // Get a new token if it's not available or has expired
+        if (null === $this->oauthToken or $this->oauthToken->hasExpired()) {
+            $this->oauthToken = $this->getToken();
+        }
+
+        return base64_encode(
+            'user=' .
+            $this->oauthUserEmail .
+            "\001auth=Bearer " .
+            $this->oauthToken .
+            "\001\001"
+        );
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/PHPMailer.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,4405 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ *
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author  Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author  Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author  Brent R. Matzelle (original founder)
+ */
+class PHPMailer
+{
+    /**
+     * Email priority.
+     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+     * When null, the header is not set at all.
+     *
+     * @var int
+     */
+    public $Priority;
+
+    /**
+     * The character set of the message.
+     *
+     * @var string
+     */
+    public $CharSet = 'iso-8859-1';
+
+    /**
+     * The MIME Content-type of the message.
+     *
+     * @var string
+     */
+    public $ContentType = 'text/plain';
+
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     *
+     * @var string
+     */
+    public $Encoding = '8bit';
+
+    /**
+     * Holds the most recent mailer error message.
+     *
+     * @var string
+     */
+    public $ErrorInfo = '';
+
+    /**
+     * The From email address for the message.
+     *
+     * @var string
+     */
+    public $From = 'root at localhost';
+
+    /**
+     * The From name of the message.
+     *
+     * @var string
+     */
+    public $FromName = 'Root User';
+
+    /**
+     * The envelope sender of the message.
+     * This will usually be turned into a Return-Path header by the receiver,
+     * and is the address that bounces will be sent to.
+     * If not empty, will be passed via `-f` to sendmail or as the 'MAIL FROM' value over SMTP.
+     *
+     * @var string
+     */
+    public $Sender = '';
+
+    /**
+     * The Subject of the message.
+     *
+     * @var string
+     */
+    public $Subject = '';
+
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     *
+     * @var string
+     */
+    public $Body = '';
+
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     *
+     * @var string
+     */
+    public $AltBody = '';
+
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
+     *
+     * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @see http://kigkonsult.se/iCalcreator/
+     *
+     * @var string
+     */
+    public $Ical = '';
+
+    /**
+     * The complete compiled MIME message body.
+     *
+     * @var string
+     */
+    protected $MIMEBody = '';
+
+    /**
+     * The complete compiled MIME message headers.
+     *
+     * @var string
+     */
+    protected $MIMEHeader = '';
+
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     *
+     * @var string
+     */
+    protected $mailHeader = '';
+
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     *
+     * @see static::STD_LINE_LENGTH
+     *
+     * @var int
+     */
+    public $WordWrap = 0;
+
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     *
+     * @var string
+     */
+    public $Mailer = 'mail';
+
+    /**
+     * The path to the sendmail program.
+     *
+     * @var string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
+
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     *
+     * @var bool
+     */
+    public $UseSendmailOptions = true;
+
+    /**
+     * The email address that a reading confirmation should be sent to, also known as read receipt.
+     *
+     * @var string
+     */
+    public $ConfirmReadingTo = '';
+
+    /**
+     * The hostname to use in the Message-ID header and as default HELO string.
+     * If empty, PHPMailer attempts to find one with, in order,
+     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+     * 'localhost.localdomain'.
+     *
+     * @var string
+     */
+    public $Hostname = '';
+
+    /**
+     * An ID to be used in the Message-ID header.
+     * If empty, a unique id will be generated.
+     * You can set your own, but it must be in the format "<id at domain>",
+     * as defined in RFC5322 section 3.6.4 or it will be ignored.
+     *
+     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     *
+     * @var string
+     */
+    public $MessageID = '';
+
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     *
+     * @var string
+     */
+    public $MessageDate = '';
+
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     *
+     * @var string
+     */
+    public $Host = 'localhost';
+
+    /**
+     * The default SMTP server port.
+     *
+     * @var int
+     */
+    public $Port = 25;
+
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+     * one with the same method described above for $Hostname.
+     *
+     * @see PHPMailer::$Hostname
+     *
+     * @var string
+     */
+    public $Helo = '';
+
+    /**
+     * What kind of encryption to use on the SMTP connection.
+     * Options: '', 'ssl' or 'tls'.
+     *
+     * @var string
+     */
+    public $SMTPSecure = '';
+
+    /**
+     * Whether to enable TLS encryption automatically if a server supports it,
+     * even if `SMTPSecure` is not set to 'tls'.
+     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+     *
+     * @var bool
+     */
+    public $SMTPAutoTLS = true;
+
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     *
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     *
+     * @var bool
+     */
+    public $SMTPAuth = false;
+
+    /**
+     * Options array passed to stream_context_create when connecting via SMTP.
+     *
+     * @var array
+     */
+    public $SMTPOptions = [];
+
+    /**
+     * SMTP username.
+     *
+     * @var string
+     */
+    public $Username = '';
+
+    /**
+     * SMTP password.
+     *
+     * @var string
+     */
+    public $Password = '';
+
+    /**
+     * SMTP auth type.
+     * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
+     *
+     * @var string
+     */
+    public $AuthType = '';
+
+    /**
+     * An instance of the PHPMailer OAuth class.
+     *
+     * @var OAuth
+     */
+    protected $oauth;
+
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
+     *
+     * @var int
+     */
+    public $Timeout = 300;
+
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output.
+     *
+     * @see SMTP::$do_debug
+     *
+     * @var int
+     */
+    public $SMTPDebug = 0;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     * By default PHPMailer will use `echo` if run from a `cli` or `cli-server` SAPI, `html` otherwise.
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     *
+     * ```php
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * ```
+     *
+     * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
+     * level output is used:
+     *
+     * ```php
+     * $mail->Debugoutput = new myPsr3Logger;
+     * ```
+     *
+     * @see SMTP::$Debugoutput
+     *
+     * @var string|callable|\Psr\Log\LoggerInterface
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     *
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * Only supported in `mail` and `sendmail` transports, not in SMTP.
+     *
+     * @var bool
+     */
+    public $SingleTo = false;
+
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     *
+     * @var array
+     */
+    protected $SingleToArray = [];
+
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     *
+     * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @see http://www.postfix.org/VERP_README.html Postfix VERP info
+     *
+     * @var bool
+     */
+    public $do_verp = false;
+
+    /**
+     * Whether to allow sending messages with an empty body.
+     *
+     * @var bool
+     */
+    public $AllowEmpty = false;
+
+    /**
+     * DKIM selector.
+     *
+     * @var string
+     */
+    public $DKIM_selector = '';
+
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email.
+     *
+     * @var string
+     */
+    public $DKIM_identity = '';
+
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     *
+     * @var string
+     */
+    public $DKIM_passphrase = '';
+
+    /**
+     * DKIM signing domain name.
+     *
+     * @example 'example.com'
+     *
+     * @var string
+     */
+    public $DKIM_domain = '';
+
+    /**
+     * DKIM private key file path.
+     *
+     * @var string
+     */
+    public $DKIM_private = '';
+
+    /**
+     * DKIM private key string.
+     *
+     * If set, takes precedence over `$DKIM_private`.
+     *
+     * @var string
+     */
+    public $DKIM_private_string = '';
+
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   bool $result        result of the send action
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     *   string  $extra         extra information of possible use
+     *                          "smtp_transaction_id' => last smtp transaction id
+     *
+     * @var string
+     */
+    public $action_function = '';
+
+    /**
+     * What to put in the X-Mailer header.
+     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use.
+     *
+     * @var string
+     */
+    public $XMailer = '';
+
+    /**
+     * Which validator to use by default when validating email addresses.
+     * May be a callable to inject your own validator, but there are several built-in validators.
+     * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
+     *
+     * @see PHPMailer::validateAddress()
+     *
+     * @var string|callable
+     */
+    public static $validator = 'php';
+
+    /**
+     * An instance of the SMTP sender class.
+     *
+     * @var SMTP
+     */
+    protected $smtp;
+
+    /**
+     * The array of 'to' names and addresses.
+     *
+     * @var array
+     */
+    protected $to = [];
+
+    /**
+     * The array of 'cc' names and addresses.
+     *
+     * @var array
+     */
+    protected $cc = [];
+
+    /**
+     * The array of 'bcc' names and addresses.
+     *
+     * @var array
+     */
+    protected $bcc = [];
+
+    /**
+     * The array of reply-to names and addresses.
+     *
+     * @var array
+     */
+    protected $ReplyTo = [];
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc.
+     *
+     * @see PHPMailer::$to
+     * @see PHPMailer::$cc
+     * @see PHPMailer::$bcc
+     *
+     * @var array
+     */
+    protected $all_recipients = [];
+
+    /**
+     * An array of names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $all_recipients
+     * and one of $to, $cc, or $bcc.
+     * This array is used only for addresses with IDN.
+     *
+     * @see PHPMailer::$to
+     * @see PHPMailer::$cc
+     * @see PHPMailer::$bcc
+     * @see PHPMailer::$all_recipients
+     *
+     * @var array
+     */
+    protected $RecipientsQueue = [];
+
+    /**
+     * An array of reply-to names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $ReplyTo.
+     * This array is used only for addresses with IDN.
+     *
+     * @see PHPMailer::$ReplyTo
+     *
+     * @var array
+     */
+    protected $ReplyToQueue = [];
+
+    /**
+     * The array of attachments.
+     *
+     * @var array
+     */
+    protected $attachment = [];
+
+    /**
+     * The array of custom headers.
+     *
+     * @var array
+     */
+    protected $CustomHeader = [];
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     *
+     * @var string
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     *
+     * @var string
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     *
+     * @var array
+     */
+    protected $boundary = [];
+
+    /**
+     * The array of available languages.
+     *
+     * @var array
+     */
+    protected $language = [];
+
+    /**
+     * The number of errors encountered.
+     *
+     * @var int
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     *
+     * @var string
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     *
+     * @var string
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The optional S/MIME extra certificates ("CA Chain") file path.
+     *
+     * @var string
+     */
+    protected $sign_extracerts_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     *
+     * @var string
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     *
+     * @var bool
+     */
+    protected $exceptions = false;
+
+    /**
+     * Unique ID used for message ID and boundaries.
+     *
+     * @var string
+     */
+    protected $uniqueid = '';
+
+    /**
+     * The PHPMailer Version number.
+     *
+     * @var string
+     */
+    const VERSION = '6.0.2';
+
+    /**
+     * Error severity: message only, continue processing.
+     *
+     * @var int
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     *
+     * @var int
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     *
+     * @var int
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     *
+     * @var string
+     */
+    protected static $LE = "\r\n";
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1.
+     *
+     * @var int
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * The lower maximum line length allowed by RFC 2822 section 2.1.1.
+     * This length does NOT include the line break
+     * 76 means that lines will be 77 or 78 chars depending on whether
+     * the line break format is LF or CRLF; both are valid.
+     *
+     * @var int
+     */
+    const STD_LINE_LENGTH = 76;
+
+    /**
+     * Constructor.
+     *
+     * @param bool $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = null)
+    {
+        if (null !== $exceptions) {
+            $this->exceptions = (bool) $exceptions;
+        }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        //Close any open SMTP connection nicely
+        $this->smtpClose();
+    }
+
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do).
+     *
+     * @param string      $to      To
+     * @param string      $subject Subject
+     * @param string      $body    Message Body
+     * @param string      $header  Additional Header(s)
+     * @param string|null $params  Params
+     *
+     * @return bool
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
+        //Calling mail() with null params breaks
+        if (!$this->UseSendmailOptions or null === $params) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     *
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     *
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Is this a PSR-3 logger?
+        if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
+            $this->Debugoutput->debug($str);
+
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ), "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n|\r/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s'),
+                "\t",
+                    //Trim trailing space
+                trim(
+                //Indent for readability, except for trailing break
+                    str_replace(
+                        "\n",
+                        "\n                   \t                  ",
+                        trim($str)
+                    )
+                ),
+                "\n";
+        }
+    }
+
+    /**
+     * Sets message type to HTML or plain.
+     *
+     * @param bool $isHtml True for HTML mode
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = 'text/html';
+        } else {
+            $this->ContentType = 'text/plain';
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (false === stripos($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (false === stripos($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-To" address.
+     *
+     * @param string $address The email address to reply to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
+     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
+     * be modified after calling this function), addition of such addresses is delayed until send().
+     * Addresses that have been added already return false, but do not throw exceptions.
+     *
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     *
+     * @throws Exception
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    protected function addOrEnqueueAnAddress($kind, $address, $name)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        $pos = strrpos($address, '@');
+        if (false === $pos) {
+            // At-sign is missing.
+            $error_message = sprintf('%s (%s): %s',
+                $this->lang('invalid_address'),
+                $kind,
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        $params = [$kind, $address, $name];
+        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        if ($this->has8bitChars(substr($address, ++$pos)) and static::idnSupported()) {
+            if ('Reply-To' != $kind) {
+                if (!array_key_exists($address, $this->RecipientsQueue)) {
+                    $this->RecipientsQueue[$address] = $params;
+
+                    return true;
+                }
+            } else {
+                if (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        // Immediately add standard addresses without IDN.
+        return call_user_func_array([$this, 'addAnAddress'], $params);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array.
+     * Addresses that have been added already return false, but do not throw exceptions.
+     *
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     *
+     * @throws Exception
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
+            $error_message = sprintf('%s: %s',
+                $this->lang('Invalid recipient kind'),
+                $kind);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        if (!static::validateAddress($address)) {
+            $error_message = sprintf('%s (%s): %s',
+                $this->lang('invalid_address'),
+                $kind,
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        if ('Reply-To' != $kind) {
+            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
+                $this->{$kind}[] = [$address, $name];
+                $this->all_recipients[strtolower($address)] = true;
+
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = [$address, $name];
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
+     * of the form "display name <address>" into an array of name/address pairs.
+     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
+     * Note that quotes in the name part are removed.
+     *
+     * @see    http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     *
+     * @param string $addrstr The address list string
+     * @param bool   $useimap Whether to use the IMAP extension to parse the list
+     *
+     * @return array
+     */
+    public static function parseAddresses($addrstr, $useimap = true)
+    {
+        $addresses = [];
+        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
+            //Use this built-in parser if it's available
+            $list = imap_rfc822_parse_adrlist($addrstr, '');
+            foreach ($list as $address) {
+                if ('.SYNTAX-ERROR.' != $address->host) {
+                    if (static::validateAddress($address->mailbox . '@' . $address->host)) {
+                        $addresses[] = [
+                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
+                            'address' => $address->mailbox . '@' . $address->host,
+                        ];
+                    }
+                }
+            }
+        } else {
+            //Use this simpler parser
+            $list = explode(',', $addrstr);
+            foreach ($list as $address) {
+                $address = trim($address);
+                //Is there a separate name part?
+                if (strpos($address, '<') === false) {
+                    //No separate name, just use the whole thing
+                    if (static::validateAddress($address)) {
+                        $addresses[] = [
+                            'name' => '',
+                            'address' => $address,
+                        ];
+                    }
+                } else {
+                    list($name, $email) = explode('<', $address);
+                    $email = trim(str_replace('>', '', $email));
+                    if (static::validateAddress($email)) {
+                        $addresses[] = [
+                            'name' => trim(str_replace(['"', "'"], '', $name)),
+                            'address' => $email,
+                        ];
+                    }
+                }
+            }
+        }
+
+        return $addresses;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     *
+     * @param string $address
+     * @param string $name
+     * @param bool   $auto    Whether to also set the Sender address, defaults to true
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        // Don't validate now addresses with IDN. Will be done in send().
+        $pos = strrpos($address, '@');
+        if (false === $pos or
+            (!$this->has8bitChars(substr($address, ++$pos)) or !static::idnSupported()) and
+            !static::validateAddress($address)) {
+            $error_message = sprintf('%s (From): %s',
+                $this->lang('invalid_address'),
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     *
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * Validation patterns supported:
+     * * `auto` Pick best pattern automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * Alternatively you may pass in a callable to inject your own validator, for example:
+     *
+     * ```php
+     * PHPMailer::validateAddress('user at example.com', function($address) {
+     *     return (strpos($address, '@') !== false);
+     * });
+     * ```
+     *
+     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
+     *
+     * @param string          $address       The email address to check
+     * @param string|callable $patternselect Which pattern to use
+     *
+     * @return bool
+     */
+    public static function validateAddress($address, $patternselect = null)
+    {
+        if (null === $patternselect) {
+            $patternselect = static::$validator;
+        }
+        if (is_callable($patternselect)) {
+            return call_user_func($patternselect, $address);
+        }
+        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
+        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
+            return false;
+        }
+        switch ($patternselect) {
+            case 'pcre': //Kept for BC
+            case 'pcre8':
+                /*
+                 * A more complex and more permissive version of the RFC5322 regex on which FILTER_VALIDATE_EMAIL
+                 * is based.
+                 * In addition to the addresses allowed by filter_var, also permits:
+                 *  * dotless domains: `a at b`
+                 *  * comments: `1234 @ local(blah) .machine .example`
+                 *  * quoted elements: `'"test blah"@example.org'`
+                 *  * numeric TLDs: `a at b.123`
+                 *  * unbracketed IPv4 literals: `a at 192.168.0.1`
+                 *  * IPv6 literals: 'first.last@[IPv6:a1::]'
+                 * Not all of these will necessarily work for sending!
+                 *
+                 * @see       http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (bool) preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'html5':
+                /*
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 *
+                 * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (bool) preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'php':
+            default:
+                return (bool) filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
+     * `intl` and `mbstring` PHP extensions.
+     *
+     * @return bool `true` if required functions for IDN support are present
+     */
+    public static function idnSupported()
+    {
+        return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
+    }
+
+    /**
+     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
+     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
+     * This function silently returns unmodified address if:
+     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
+     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
+     *   or fails for any reason (e.g. domain contains characters not allowed in an IDN).
+     *
+     * @see    PHPMailer::$CharSet
+     *
+     * @param string $address The email address to convert
+     *
+     * @return string The encoded address in ASCII form
+     */
+    public function punyencodeAddress($address)
+    {
+        // Verify we have required functions, CharSet, and at-sign.
+        $pos = strrpos($address, '@');
+        if (static::idnSupported() and
+            !empty($this->CharSet) and
+            false !== $pos
+        ) {
+            $domain = substr($address, ++$pos);
+            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
+                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                //Ignore IDE complaints about this line - method signature changed in PHP 5.4
+                $errorcode = 0;
+                $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
+                if (false !== $punycode) {
+                    return substr($address, 0, $pos) . $punycode;
+                }
+            }
+        }
+
+        return $address;
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     *
+     * @throws Exception
+     *
+     * @return bool false on error - See the ErrorInfo property for details of the error
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+
+            return $this->postSend();
+        } catch (Exception $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function preSend()
+    {
+        if ('smtp' == $this->Mailer or
+            ('mail' == $this->Mailer and stripos(PHP_OS, 'WIN') === 0)
+        ) {
+            //SMTP mandates RFC-compliant line endings
+            //and it's also used with mail() on Windows
+            static::setLE("\r\n");
+        } else {
+            //Maintain backward compatibility with legacy Linux command line mailers
+            static::setLE(PHP_EOL);
+        }
+        //Check for buggy PHP versions that add a header with an incorrect line break
+        if (ini_get('mail.add_x_header') == 1
+            and 'mail' == $this->Mailer
+            and stripos(PHP_OS, 'WIN') === 0
+            and ((version_compare(PHP_VERSION, '7.0.0', '>=')
+                    and version_compare(PHP_VERSION, '7.0.17', '<'))
+                or (version_compare(PHP_VERSION, '7.1.0', '>=')
+                    and version_compare(PHP_VERSION, '7.1.3', '<')))
+        ) {
+            trigger_error(
+                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
+                E_USER_WARNING
+            );
+        }
+
+        try {
+            $this->error_count = 0; // Reset errors
+            $this->mailHeader = '';
+
+            // Dequeue recipient and Reply-To addresses with IDN
+            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
+                $params[1] = $this->punyencodeAddress($params[1]);
+                call_user_func_array([$this, 'addAnAddress'], $params);
+            }
+            if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
+                throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Validate From, Sender, and ConfirmReadingTo addresses
+            foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
+                $this->$address_kind = trim($this->$address_kind);
+                if (empty($this->$address_kind)) {
+                    continue;
+                }
+                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
+                if (!static::validateAddress($this->$address_kind)) {
+                    $error_message = sprintf('%s (%s): %s',
+                        $this->lang('invalid_address'),
+                        $address_kind,
+                        $this->$address_kind);
+                    $this->setError($error_message);
+                    $this->edebug($error_message);
+                    if ($this->exceptions) {
+                        throw new Exception($error_message);
+                    }
+
+                    return false;
+                }
+            }
+
+            // Set whether the message is multipart/alternative
+            if ($this->alternativeExists()) {
+                $this->ContentType = 'multipart/alternative';
+            }
+
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            //Trim subject consistently
+            $this->Subject = trim($this->Subject);
+            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            $this->MIMEHeader = '';
+            $this->MIMEBody = $this->createBody();
+            // createBody may have added some headers, so retain them
+            $tempheaders = $this->MIMEHeader;
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEHeader .= $tempheaders;
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ('mail' == $this->Mailer) {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader($this->Subject))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                and !empty($this->DKIM_selector)
+                and (!empty($this->DKIM_private_string)
+                    or (!empty($this->DKIM_private) and file_exists($this->DKIM_private))
+                )
+            ) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . static::$LE .
+                    static::normalizeBreaks($header_dkim) . static::$LE;
+            }
+
+            return true;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message via the selected mechanism.
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer . 'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     *
+     * @see    PHPMailer::$Sendmail
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function sendmailSend($header, $body)
+    {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
+            if ('qmail' == $this->Mailer) {
+                $sendmailFmt = '%s -f%s';
+            } else {
+                $sendmailFmt = '%s -oi -f%s -t';
+            }
+        } else {
+            if ('qmail' == $this->Mailer) {
+                $sendmailFmt = '%s';
+            } else {
+                $sendmailFmt = '%s -oi -t';
+            }
+        }
+
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                $mail = @popen($sendmail, 'w');
+                if (!$mail) {
+                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fwrite($mail, 'To: ' . $toAddr . "\n");
+                fwrite($mail, $header);
+                fwrite($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    [$toAddr],
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From,
+                    []
+                );
+                if (0 !== $result) {
+                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            $mail = @popen($sendmail, 'w');
+            if (!$mail) {
+                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fwrite($mail, $header);
+            fwrite($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(
+                ($result == 0),
+                $this->to,
+                $this->cc,
+                $this->bcc,
+                $this->Subject,
+                $body,
+                $this->From,
+                []
+            );
+            if (0 !== $result) {
+                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     *
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     *
+     * @param string $string The string to be validated
+     *
+     * @return bool
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     *
+     * @see    http://www.php.net/manual/en/book.mail.php
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = [];
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        $params = null;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        if (!empty($this->Sender) and static::validateAddress($this->Sender)) {
+            //A space after `-f` is optional, but there is a long history of its presence
+            //causing problems, so we don't use one
+            //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+            //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
+            //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+            //Example problem: https://www.drupal.org/node/1057954
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
+        }
+        if (!empty($this->Sender) and static::validateAddress($this->Sender)) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo and count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation,
+     * or set one with setSMTPInstance.
+     *
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP();
+        }
+
+        return $this->smtp;
+    }
+
+    /**
+     * Provide an instance to use for SMTP operations.
+     *
+     * @param SMTP $smtp
+     *
+     * @return SMTP
+     */
+    public function setSMTPInstance(SMTP $smtp)
+    {
+        $this->smtp = $smtp;
+
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     *
+     * @see PHPMailer::setSMTPInstance() to use a different class.
+     *
+     * @uses \PHPMailer\PHPMailer\SMTP
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = [];
+        if (!$this->smtpConnect($this->SMTPOptions)) {
+            throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        //Sender already validated in preSend()
+        if ('' == $this->Sender) {
+            $smtp_from = $this->From;
+        } else {
+            $smtp_from = $this->Sender;
+        }
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        $callbacks = [];
+        // Attempt to send to all recipients
+        foreach ([$this->to, $this->cc, $this->bcc] as $togroup) {
+            foreach ($togroup as $to) {
+                if (!$this->smtp->recipient($to[0])) {
+                    $error = $this->smtp->getError();
+                    $bad_rcpt[] = ['to' => $to[0], 'error' => $error['detail']];
+                    $isSent = false;
+                } else {
+                    $isSent = true;
+                }
+
+                $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
+            }
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+
+        $smtp_transaction_id = $this->smtp->getLastTransactionID();
+
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
+        } else {
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+
+        foreach ($callbacks as $cb) {
+            $this->doCallback(
+                $cb['issent'],
+                [$cb['to']],
+                [],
+                [],
+                $this->Subject,
+                $body,
+                $this->From,
+                ['smtp_transaction_id' => $smtp_transaction_id]
+            );
+        }
+
+        //Create error message for any bad addresses
+        if (count($bad_rcpt) > 0) {
+            $errstr = '';
+            foreach ($bad_rcpt as $bad) {
+                $errstr .= $bad['to'] . ': ' . $bad['error'];
+            }
+            throw new Exception(
+                $this->lang('recipients_failed') . $errstr,
+                self::STOP_CONTINUE
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     *
+     * @param array $options An array of options compatible with stream_context_create()
+     *
+     * @throws Exception
+     *
+     * @uses \PHPMailer\PHPMailer\SMTP
+     *
+     * @return bool
+     */
+    public function smtpConnect($options = null)
+    {
+        if (null === $this->smtp) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        //If no options are provided, use whatever is set in the instance
+        if (null === $options) {
+            $options = $this->SMTPOptions;
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = [];
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
+                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                // Not a valid host entry
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+
+            //Check the host name is a valid name or IP address before trying to use it
+            if (!static::isValidHost($hostinfo[3])) {
+                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                continue;
+            }
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ('tls' == $this->SMTPSecure);
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ('tls' == $hostinfo[2]) {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA256');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (int) $hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and 'ssl' != $secure and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new Exception($this->lang('connect_host'));
+                        }
+                        // We must resend EHLO after TLS negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->oauth
+                        )
+                        ) {
+                            throw new Exception($this->lang('authenticate'));
+                        }
+                    }
+
+                    return true;
+                } catch (Exception $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and null !== $lastexception) {
+            throw $lastexception;
+        }
+
+        return false;
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     */
+    public function smtpClose()
+    {
+        if (null !== $this->smtp) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     *
+     * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     *
+     * @return bool
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Backwards compatibility for renamed language codes
+        $renamed_langcodes = [
+            'br' => 'pt_br',
+            'cz' => 'cs',
+            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
+            'sr' => 'rs',
+        ];
+
+        if (isset($renamed_langcodes[$langcode])) {
+            $langcode = $renamed_langcodes[$langcode];
+        }
+
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = [
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address: ',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: ',
+        ];
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = __DIR__ . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
+        }
+        //Validate $langcode
+        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+            $langcode = 'en';
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        // There is no English translation file
+        if ('en' != $langcode) {
+            // Make sure language file path is readable
+            if (!file_exists($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translation keys.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+
+        return (bool) $foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     *
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     *
+     * @param string $type
+     * @param array  $addr An array of recipients,
+     *                     where each recipient is a 2-element indexed array with element 0 containing an address
+     *                     and element 1 containing a name, like:
+     *                     [['joe at example.com', 'Joe User'], ['zoe at example.com', 'Zoe User']]
+     *
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = [];
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+
+        return $type . ': ' . implode(', ', $addresses) . static::$LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     *
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name like
+     *                    ['joe at example.com', 'Joe User']
+     *
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        }
+
+        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     *
+     * @param string $message The message to wrap
+     * @param int    $length  The line length to wrap to
+     * @param bool   $qp_mode Whether to run in Quoted-Printable mode
+     *
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        if ($qp_mode) {
+            $soft_break = sprintf(' =%s', static::$LE);
+        } else {
+            $soft_break = static::$LE;
+        }
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = 'utf-8' == strtolower($this->CharSet);
+        $lelen = strlen(static::$LE);
+        $crlflen = strlen(static::$LE);
+
+        $message = static::normalizeBreaks($message);
+        //Remove a trailing line break
+        if (substr($message, -$lelen) == static::$LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        //Split message into lines
+        $lines = explode(static::$LE, $message);
+        //Message will be rebuilt in here
+        $message = '';
+        foreach ($lines as $line) {
+            $words = explode(' ', $line);
+            $buf = '';
+            $firstword = true;
+            foreach ($words as $word) {
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if (!$firstword) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif ('=' == substr($word, $len - 1, 1)) {
+                                --$len;
+                            } elseif ('=' == substr($word, $len - 2, 1)) {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', static::$LE);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif ('=' == substr($word, $len - 1, 1)) {
+                            --$len;
+                        } elseif ('=' == substr($word, $len - 2, 1)) {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
+
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', static::$LE);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    if (!$firstword) {
+                        $buf .= ' ';
+                    }
+                    $buf .= $word;
+
+                    if (strlen($buf) > $length and '' != $buf_o) {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+                $firstword = false;
+            }
+            $message .= $buf . static::$LE;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted-printable encoded string.
+     * Original written by Colin Brown.
+     *
+     * @param string $encodedText utf-8 QP text
+     * @param int    $maxLength   Find the last character boundary prior to this length
+     *
+     * @return int
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) {
+                    // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    if ($encodedCharPos > 0) {
+                        $maxLength -= $lookBack - $encodedCharPos;
+                    }
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) {
+                    // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength -= $lookBack - $encodedCharPos;
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) {
+                    // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
+            } else {
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+
+        return $maxLength;
+    }
+
+    /**
+     * Apply word wrapping to the message body.
+     * Wraps the message body to the number of chars set in the WordWrap property.
+     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+     * This is called automatically by createBody(), so you don't need to call it yourself.
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     *
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        $result .= $this->headerLine('Date', '' == $this->MessageDate ? self::rfcDate() : $this->MessageDate);
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ('mail' != $this->Mailer) {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
+            }
+        } else {
+            if (count($this->to) > 0) {
+                if ('mail' != $this->Mailer) {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
+        }
+
+        $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
+
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
+        }
+
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                'sendmail' == $this->Mailer or 'qmail' == $this->Mailer or 'mail' == $this->Mailer
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
+        }
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
+        }
+
+        // mail() sets the subject itself
+        if ('mail' != $this->Mailer) {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
+
+        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        // https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
+            $this->lastMessageID = $this->MessageID;
+        } else {
+            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
+        }
+        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
+        if (null !== $this->Priority) {
+            $result .= $this->headerLine('X-Priority', $this->Priority);
+        }
+        if ('' == $this->XMailer) {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ('' != $this->ConfirmReadingTo) {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+        }
+
+        // Add custom headers
+        foreach ($this->CustomHeader as $header) {
+            $result .= $this->headerLine(
+                trim($header[0]),
+                $this->encodeHeader(trim($header[1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     *
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/related;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', 'multipart/mixed;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ('7bit' != $this->Encoding) {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if ('8bit' == $this->Encoding) {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', '8bit');
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ('mail' != $this->Mailer) {
+            $result .= static::$LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     *
+     * @see PHPMailer::preSend()
+     *
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . static::$LE . static::$LE . $this->MIMEBody;
+    }
+
+    /**
+     * Create a unique ID to use for boundaries.
+     *
+     * @return string
+     */
+    protected function generateId()
+    {
+        $len = 32; //32 bytes = 256 bits
+        if (function_exists('random_bytes')) {
+            $bytes = random_bytes($len);
+        } elseif (function_exists('openssl_random_pseudo_bytes')) {
+            $bytes = openssl_random_pseudo_bytes($len);
+        } else {
+            //Use a hash to force the length to the same as the other methods
+            $bytes = hash('sha256', uniqid((string) mt_rand(), true), true);
+        }
+
+        //We don't care about messing up base64 format here, just want a random string
+        return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
+    }
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     *
+     * @throws Exception
+     *
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
+        $body = '';
+        //Create unique IDs and preset boundaries
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1_' . $this->uniqueid;
+        $this->boundary[2] = 'b2_' . $this->uniqueid;
+        $this->boundary[3] = 'b3_' . $this->uniqueid;
+
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . static::$LE;
+        }
+
+        $this->setWordWrap();
+
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ('8bit' == $bodyEncoding and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $bodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the body part only
+        if ('base64' != $this->Encoding and static::hasLineLongerThanMax($this->Body)) {
+            $bodyEncoding = 'quoted-printable';
+        }
+
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if ('8bit' == $altBodyEncoding and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = '7bit';
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $altBodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the alt body part only
+        if ('base64' != $altBodyEncoding and static::hasLineLongerThanMax($this->AltBody)) {
+            $altBodyEncoding = 'quoted-printable';
+        }
+        //Use this as a preamble in all multipart message types
+        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE;
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= static::$LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[2], '', 'text/calendar; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                }
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', 'multipart/alternative;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, 'text/plain', $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', 'multipart/related;');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, 'text/html', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= static::$LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Reset the `Encoding` property in case we changed it for line length reasons
+                $this->Encoding = $bodyEncoding;
+                $body .= $this->encodeString($this->Body, $this->Encoding);
+                break;
+        }
+
+        if ($this->isError()) {
+            $body = '';
+            if ($this->exceptions) {
+                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new Exception($this->lang('extension_missing') . 'openssl');
+                }
+                // @TODO would be nice to use php://temp streams here
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new Exception($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+                if (empty($this->sign_extracerts_file)) {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        []
+                    );
+                } else {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        [],
+                        PKCS7_DETACHED,
+                        $this->sign_extracerts_file
+                    );
+                }
+                @unlink($file);
+                if ($sign) {
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                    //The message returned by openssl contains both headers and body, so need to split them up
+                    $parts = explode("\n\n", $body, 2);
+                    $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
+                    $body = $parts[1];
+                } else {
+                    @unlink($signed);
+                    throw new Exception($this->lang('signing') . openssl_error_string());
+                }
+            } catch (Exception $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
+        }
+
+        return $body;
+    }
+
+    /**
+     * Return the start of a message boundary.
+     *
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     *
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ('' == $charSet) {
+            $charSet = $this->CharSet;
+        }
+        if ('' == $contentType) {
+            $contentType = $this->ContentType;
+        }
+        if ('' == $encoding) {
+            $encoding = $this->Encoding;
+        }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= static::$LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if ('7bit' != $encoding) {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= static::$LE;
+
+        return $result;
+    }
+
+    /**
+     * Return the end of a message boundary.
+     *
+     * @param string $boundary
+     *
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return static::$LE . '--' . $boundary . '--' . static::$LE;
+    }
+
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
+     */
+    protected function setMessageType()
+    {
+        $type = [];
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ('' == $this->message_type) {
+            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
+            $this->message_type = 'plain';
+        }
+    }
+
+    /**
+     * Format a header line.
+     *
+     * @param string     $name
+     * @param string|int $value
+     *
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . static::$LE;
+    }
+
+    /**
+     * Return a formatted mail line.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . static::$LE;
+    }
+
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Never use a user-supplied path to a file!
+     * Returns false if the file could not be found or read.
+     *
+     * @param string $path        Path to the attachment
+     * @param string $name        Overrides the attachment name
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File extension (MIME) type
+     * @param string $disposition Disposition to use
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function addAttachment($path, $name = '', $encoding = 'base64', $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!@is_file($path)) {
+                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
+
+            // If a MIME type is not specified, try to work it out from the file name
+            if ('' == $type) {
+                $type = static::filenameToType($path);
+            }
+
+            $filename = basename($path);
+            if ('' == $name) {
+                $name = $filename;
+            }
+
+            $this->attachment[] = [
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => $name,
+            ];
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the array of attachments.
+     *
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     *
+     * @param string $disposition_type
+     * @param string $boundary
+     *
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = [];
+        $cidUniq = [];
+        $incl = [];
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = hash('sha256', serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ('inline' == $disposition and array_key_exists($cid, $cidUniq)) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, static::$LE);
+                //Only include a filename property if we have one
+                if (!empty($name)) {
+                    $mime[] = sprintf(
+                        'Content-Type: %s; name="%s"%s',
+                        $type,
+                        $this->encodeHeader($this->secureHeader($name)),
+                        static::$LE
+                    );
+                } else {
+                    $mime[] = sprintf(
+                        'Content-Type: %s%s',
+                        $type,
+                        static::$LE
+                    );
+                }
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if ('7bit' != $encoding) {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
+                }
+
+                if (!empty($cid)) {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, static::$LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            static::$LE . static::$LE
+                        );
+                    } else {
+                        if (!empty($encoded_name)) {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s; filename=%s%s',
+                                $disposition,
+                                $encoded_name,
+                                static::$LE . static::$LE
+                            );
+                        } else {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s%s',
+                                $disposition,
+                                static::$LE . static::$LE
+                            );
+                        }
+                    }
+                } else {
+                    $mime[] = static::$LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                }
+                if ($this->isError()) {
+                    return '';
+                }
+                $mime[] = static::$LE;
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, static::$LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     *
+     * @param string $path     The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = 'base64')
+    {
+        try {
+            if (!file_exists($path)) {
+                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $file_buffer = file_get_contents($path);
+            if (false === $file_buffer) {
+                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     *
+     * @param string $str      The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable
+     *
+     * @return string
+     */
+    public function encodeString($str, $encoding = 'base64')
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case 'base64':
+                $encoded = chunk_split(
+                    base64_encode($str),
+                    static::STD_LINE_LENGTH,
+                    static::$LE
+                );
+                break;
+            case '7bit':
+            case '8bit':
+                $encoded = static::normalizeBreaks($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen(static::$LE))) != static::$LE) {
+                    $encoded .= static::$LE;
+                }
+                break;
+            case 'binary':
+                $encoded = $str;
+                break;
+            case 'quoted-printable':
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+
+        return $encoded;
+    }
+
+    /**
+     * Encode a header value (not including its label) optimally.
+     * Picks shortest of Q, B, or none. Result includes folding if needed.
+     * See RFC822 definitions for phrase, comment and text positions.
+     *
+     * @param string $str      The header value to encode
+     * @param string $position What context the string will be used in
+     *
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) and !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return $encoded;
+                    }
+
+                    return "\"$encoded\"";
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /* @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+            //fallthrough
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        //RFCs specify a maximum line length of 78 chars, however mail() will sometimes
+        //corrupt messages with headers longer than 65 chars. See #818
+        $lengthsub = 'mail' == $this->Mailer ? 13 : 0;
+        $maxlen = static::STD_LINE_LENGTH - $lengthsub;
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            //This calculation is:
+            // max line length
+            // - shorten to avoid mail() corruption
+            // - Q/B encoding char overhead ("` =?<charset>?[QB]?<content>?=`")
+            // - charset name length
+            $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
+            if ($this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        } elseif ($matchcount > 0) {
+            //1 or more chars need encoding, use Q-encode
+            $encoding = 'Q';
+            //Recalc max line length for Q encoding - see comments on B encode
+            $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        } elseif (strlen($str) > $maxlen) {
+            //No chars need encoding, but line is too long, so fold it
+            $encoded = trim($this->wrapText($str, $maxlen, false));
+            if ($str == $encoded) {
+                //Wrapping nicely didn't work, wrap hard instead
+                $encoded = trim(chunk_split($str, static::STD_LINE_LENGTH, static::$LE));
+            }
+            $encoded = str_replace(static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' \\1', $encoded);
+        } else {
+            //No reformatting needed
+            return $str;
+        }
+
+        return trim(static::normalizeBreaks($encoded));
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     *
+     * @param string $str multi-byte text to wrap encode
+     *
+     * @return bool
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return strlen($str) > mb_strlen($str, $this->CharSet);
+        }
+
+        // Assume no multibytes (we can't handle without mbstring functions anyway)
+        return false;
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     *
+     * @param string $text
+     *
+     * @return bool
+     */
+    public function has8bitChars($text)
+    {
+        return (bool) preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid.
+     *
+     * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     *
+     * @param string $str       multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     *
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if (null === $linebreak) {
+            $linebreak = static::$LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                ++$lookBack;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        return substr($encoded, 0, -strlen($linebreak));
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     *
+     * @param string $string The text to encode
+     *
+     * @return string
+     */
+    public function encodeQP($string)
+    {
+        return static::normalizeBreaks(quoted_printable_encode($string));
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     *
+     * @see http://tools.ietf.org/html/rfc2047#section-4.2
+     *
+     * @param string $str      the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     *
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(["\r", "\n"], '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /*
+             * RFC 2047 section 5.2.
+             * Build $pattern without including delimiters and []
+             */
+            /* @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $pattern = '\(\)"';
+            /* Intentional fall through */
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                /** @noinspection SuspiciousAssignmentsInspection */
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = [];
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace spaces with _ (more readable than =20)
+        // RFC 2047 section 4.2(2)
+        return str_replace(' ', '_', $encoded);
+    }
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     *
+     * @param string $string      String attachment data
+     * @param string $filename    Name of the attachment
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File extension (MIME) type
+     * @param string $disposition Disposition to use
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ('' == $type) {
+            $type = static::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0,
+        ];
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * Never use a user-supplied path to a file!
+     *
+     * @param string $path        Path to the attachment
+     * @param string $cid         Content ID of the attachment; Use this to reference
+     *                            the content when using an embedded image in HTML
+     * @param string $name        Overrides the attachment name
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File MIME type
+     * @param string $disposition Disposition to use
+     *
+     * @return bool True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = 'base64', $type = '', $disposition = 'inline')
+    {
+        if (!@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ('' == $type) {
+            $type = static::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ('' == $name) {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid,
+        ];
+
+        return true;
+    }
+
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * If your filename doesn't contain an extension, be sure to set the $type to an appropriate MIME type.
+     *
+     * @param string $string      The attachment binary data
+     * @param string $cid         Content ID of the attachment; Use this to reference
+     *                            the content when using an embedded image in HTML
+     * @param string $name        A filename for the attachment. If this contains an extension,
+     *                            PHPMailer will attempt to set a MIME type for the attachment.
+     *                            For example 'file.jpg' would get an 'image/jpeg' MIME type.
+     * @param string $encoding    File encoding (see $Encoding), defaults to 'base64'
+     * @param string $type        MIME type - will be used in preference to any automatically derived type
+     * @param string $disposition Disposition to use
+     *
+     * @return bool True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = 'base64',
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ('' == $type and !empty($name)) {
+            $type = static::filenameToType($name);
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid,
+        ];
+
+        return true;
+    }
+
+    /**
+     * Check if an embedded attachment is present with this cid.
+     *
+     * @param string $cid
+     *
+     * @return bool
+     */
+    protected function cidExists($cid)
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('inline' == $attachment[6] and $cid == $attachment[7]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if an inline attachment is present.
+     *
+     * @return bool
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('inline' == $attachment[6]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if an attachment (non-inline) is present.
+     *
+     * @return bool
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('attachment' == $attachment[6]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if this message has an alternative body set.
+     *
+     * @return bool
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
+    }
+
+    /**
+     * Clear queued addresses of given kind.
+     *
+     * @param string $kind 'to', 'cc', or 'bcc'
+     */
+    public function clearQueuedAddresses($kind)
+    {
+        $this->RecipientsQueue = array_filter(
+            $this->RecipientsQueue,
+            function ($params) use ($kind) {
+                return $params[0] != $kind;
+            }
+        );
+    }
+
+    /**
+     * Clear all To recipients.
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = [];
+        $this->clearQueuedAddresses('to');
+    }
+
+    /**
+     * Clear all CC recipients.
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = [];
+        $this->clearQueuedAddresses('cc');
+    }
+
+    /**
+     * Clear all BCC recipients.
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = [];
+        $this->clearQueuedAddresses('bcc');
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = [];
+        $this->ReplyToQueue = [];
+    }
+
+    /**
+     * Clear all recipient types.
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = [];
+        $this->cc = [];
+        $this->bcc = [];
+        $this->all_recipients = [];
+        $this->RecipientsQueue = [];
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = [];
+    }
+
+    /**
+     * Clear all custom headers.
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = [];
+    }
+
+    /**
+     * Add an error message to the error container.
+     *
+     * @param string $msg
+     */
+    protected function setError($msg)
+    {
+        ++$this->error_count;
+        if ('smtp' == $this->Mailer and null !== $this->smtp) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                if (!empty($lasterror['detail'])) {
+                    $msg .= ' Detail: ' . $lasterror['detail'];
+                }
+                if (!empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                }
+                if (!empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                }
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     *
+     * @return string
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     *
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = '';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER)) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') and gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        if (!static::isValidHost($result)) {
+            return 'localhost.localdomain';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate whether a string contains a valid value to use as a hostname or IP address.
+     * IPv6 addresses must include [], e.g. `[::1]`, not just `::1`.
+     *
+     * @param string $host The host name or IP address to check
+     *
+     * @return bool
+     */
+    public static function isValidHost($host)
+    {
+        //Simple syntax limits
+        if (empty($host)
+            or !is_string($host)
+            or strlen($host) > 256
+        ) {
+            return false;
+        }
+        //Looks like a bracketed IPv6 address
+        if (trim($host, '[]') != $host) {
+            return (bool) filter_var(trim($host, '[]'), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+        }
+        //If removing all the dots results in a numeric string, it must be an IPv4 address.
+        //Need to check this first because otherwise things like `999.0.0.0` are considered valid host names
+        if (is_numeric(str_replace('.', '', $host))) {
+            //Is it a valid IPv4 address?
+            return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+        }
+        if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
+            //Is it a syntactically valid hostname?
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get an error message in the current language.
+     *
+     * @param string $key
+     *
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (array_key_exists($key, $this->language)) {
+            if ('smtp_connect_failed' == $key) {
+                //Include a link to troubleshooting docs on SMTP connection failure
+                //this is by far the biggest cause of support questions
+                //but it's usually not PHPMailer's fault.
+                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+            }
+
+            return $this->language[$key];
+        }
+
+        //Return the key as a fallback
+        return $key;
+    }
+
+    /**
+     * Check if an error occurred.
+     *
+     * @return bool True if an error did occur
+     */
+    public function isError()
+    {
+        return $this->error_count > 0;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value).
+     *
+     * @param string      $name  Custom header name
+     * @param string|null $value Header value
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if (null === $value) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = [$name, $value];
+        }
+    }
+
+    /**
+     * Returns all custom headers.
+     *
+     * @return array
+     */
+    public function getCustomHeaders()
+    {
+        return $this->CustomHeader;
+    }
+
+    /**
+     * Create a message body from an HTML string.
+     * Automatically inlines images and creates a plain-text version by converting the HTML,
+     * overwriting any existing values in Body and AltBody.
+     * Do not source $message content from user input!
+     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
+     * will look for an image file in $basedir/images/a.png and convert it to inline.
+     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+     * Converts data-uri images into embedded attachments.
+     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
+     *
+     * @param string        $message  HTML message string
+     * @param string        $basedir  Absolute path to a base directory to prepend to relative paths to images
+     * @param bool|callable $advanced Whether to use the internal HTML to text converter
+     *                                or your own custom converter @see PHPMailer::html2text()
+     *
+     * @return string $message The transformed message Body
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (array_key_exists(2, $images)) {
+            if (strlen($basedir) > 1 && '/' != substr($basedir, -1)) {
+                // Ensure $basedir has a trailing /
+                $basedir .= '/';
+            }
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+                if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
+                    if (count($match) == 4 and 'base64' == $match[2]) {
+                        $data = base64_decode($match[3]);
+                    } elseif ('' == $match[2]) {
+                        $data = rawurldecode($match[3]);
+                    } else {
+                        //Not recognised so leave it alone
+                        continue;
+                    }
+                    //Hash the decoded data, not the URL so that the same data-URI image used in multiple places
+                    //will only be embedded once, even if it used a different encoding
+                    $cid = hash('sha256', $data) . '@phpmailer.0'; // RFC2392 S 2
+
+                    if (!$this->cidExists($cid)) {
+                        $this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, 'base64', $match[1]);
+                    }
+                    $message = str_replace(
+                        $images[0][$imgindex],
+                        $images[1][$imgindex] . '="cid:' . $cid . '"',
+                        $message
+                    );
+                    continue;
+                }
+                if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                    !empty($basedir)
+                    // Ignore URLs containing parent dir traversal (..)
+                    and (strpos($url, '..') === false)
+                    // Do not change urls that are already inline images
+                    and 0 !== strpos($url, 'cid:')
+                    // Do not change absolute URLs, including anonymous protocol
+                    and !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+                ) {
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ('.' == $directory) {
+                        $directory = '';
+                    }
+                    $cid = hash('sha256', $url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($basedir) > 1 and '/' != substr($basedir, -1)) {
+                        $basedir .= '/';
+                    }
+                    if (strlen($directory) > 1 and '/' != substr($directory, -1)) {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        'base64',
+                        static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to LE, makes quoted-printable encoding work much better
+        $this->Body = static::normalizeBreaks($message);
+        $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
+        if (!$this->alternativeExists()) {
+            $this->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'
+                . static::$LE;
+        }
+
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * This is used by msgHTML().
+     * Note - older versions of this function used a bundled advanced converter
+     * which was removed for license reasons in #232.
+     * Example usage:
+     *
+     * ```php
+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     * ```
+     *
+     * @param string        $html     The HTML text to convert
+     * @param bool|callable $advanced Any boolean value to use the internal converter,
+     *                                or provide your own callable for custom conversion
+     *
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if (is_callable($advanced)) {
+            return call_user_func($advanced, $html);
+        }
+
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     *
+     * @param string $ext File extension
+     *
+     * @return string MIME type of file
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = [
+            'xl' => 'application/excel',
+            'js' => 'application/javascript',
+            'hqx' => 'application/mac-binhex40',
+            'cpt' => 'application/mac-compactpro',
+            'bin' => 'application/macbinary',
+            'doc' => 'application/msword',
+            'word' => 'application/msword',
+            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+            'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+            'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+            'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+            'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+            'class' => 'application/octet-stream',
+            'dll' => 'application/octet-stream',
+            'dms' => 'application/octet-stream',
+            'exe' => 'application/octet-stream',
+            'lha' => 'application/octet-stream',
+            'lzh' => 'application/octet-stream',
+            'psd' => 'application/octet-stream',
+            'sea' => 'application/octet-stream',
+            'so' => 'application/octet-stream',
+            'oda' => 'application/oda',
+            'pdf' => 'application/pdf',
+            'ai' => 'application/postscript',
+            'eps' => 'application/postscript',
+            'ps' => 'application/postscript',
+            'smi' => 'application/smil',
+            'smil' => 'application/smil',
+            'mif' => 'application/vnd.mif',
+            'xls' => 'application/vnd.ms-excel',
+            'ppt' => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc' => 'application/vnd.wap.wmlc',
+            'dcr' => 'application/x-director',
+            'dir' => 'application/x-director',
+            'dxr' => 'application/x-director',
+            'dvi' => 'application/x-dvi',
+            'gtar' => 'application/x-gtar',
+            'php3' => 'application/x-httpd-php',
+            'php4' => 'application/x-httpd-php',
+            'php' => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps' => 'application/x-httpd-php-source',
+            'swf' => 'application/x-shockwave-flash',
+            'sit' => 'application/x-stuffit',
+            'tar' => 'application/x-tar',
+            'tgz' => 'application/x-tar',
+            'xht' => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip' => 'application/zip',
+            'mid' => 'audio/midi',
+            'midi' => 'audio/midi',
+            'mp2' => 'audio/mpeg',
+            'mp3' => 'audio/mpeg',
+            'mpga' => 'audio/mpeg',
+            'aif' => 'audio/x-aiff',
+            'aifc' => 'audio/x-aiff',
+            'aiff' => 'audio/x-aiff',
+            'ram' => 'audio/x-pn-realaudio',
+            'rm' => 'audio/x-pn-realaudio',
+            'rpm' => 'audio/x-pn-realaudio-plugin',
+            'ra' => 'audio/x-realaudio',
+            'wav' => 'audio/x-wav',
+            'bmp' => 'image/bmp',
+            'gif' => 'image/gif',
+            'jpeg' => 'image/jpeg',
+            'jpe' => 'image/jpeg',
+            'jpg' => 'image/jpeg',
+            'png' => 'image/png',
+            'tiff' => 'image/tiff',
+            'tif' => 'image/tiff',
+            'eml' => 'message/rfc822',
+            'css' => 'text/css',
+            'html' => 'text/html',
+            'htm' => 'text/html',
+            'shtml' => 'text/html',
+            'log' => 'text/plain',
+            'text' => 'text/plain',
+            'txt' => 'text/plain',
+            'rtx' => 'text/richtext',
+            'rtf' => 'text/rtf',
+            'vcf' => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'ics' => 'text/calendar',
+            'xml' => 'text/xml',
+            'xsl' => 'text/xml',
+            'mpeg' => 'video/mpeg',
+            'mpe' => 'video/mpeg',
+            'mpg' => 'video/mpeg',
+            'mov' => 'video/quicktime',
+            'qt' => 'video/quicktime',
+            'rv' => 'video/vnd.rn-realvideo',
+            'avi' => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie',
+        ];
+        if (array_key_exists(strtolower($ext), $mimes)) {
+            return $mimes[strtolower($ext)];
+        }
+
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     *
+     * @param string $filename A file name or full path, does not need to exist as a file
+     *
+     * @return string
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $ext = static::mb_pathinfo($filename, PATHINFO_EXTENSION);
+
+        return static::_mime_types($ext);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
+     *
+     * @see    http://www.php.net/manual/en/function.pathinfo.php#107461
+     *
+     * @param string     $path    A filename or path, does not need to exist as a file
+     * @param int|string $options Either a PATHINFO_* constant,
+     *                            or a string name to return only the specified piece
+     *
+     * @return string|array
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = ['dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''];
+        $pathinfo = [];
+        if (preg_match('#^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$#im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     * You should avoid this function - it's more verbose, less efficient, more error-prone and
+     * harder to debug than setting properties directly.
+     * Usage Example:
+     * `$mail->set('SMTPSecure', 'tls');`
+     *   is the same as:
+     * `$mail->SMTPSecure = 'tls';`.
+     *
+     * @param string $name  The property name to set
+     * @param mixed  $value The value to set the property to
+     *
+     * @return bool
+     */
+    public function set($name, $value = '')
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+
+            return true;
+        }
+        $this->setError($this->lang('variable_set') . $name);
+
+        return false;
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     *
+     * @param string $str
+     *
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(["\r", "\n"], '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     *
+     * @param string $text
+     * @param string $breaktype What kind of line break to use; defaults to static::$LE
+     *
+     * @return string
+     */
+    public static function normalizeBreaks($text, $breaktype = null)
+    {
+        if (null === $breaktype) {
+            $breaktype = static::$LE;
+        }
+        // Normalise to \n
+        $text = str_replace(["\r\n", "\r"], "\n", $text);
+        // Now convert LE as needed
+        if ("\n" !== static::$LE) {
+            $text = str_replace("\n", $breaktype, $text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Return the current line break format string.
+     *
+     * @return string
+     */
+    public static function getLE()
+    {
+        return static::$LE;
+    }
+
+    /**
+     * Set the line break format string, e.g. "\r\n".
+     *
+     * @param string $le
+     */
+    protected static function setLE($le)
+    {
+        static::$LE = $le;
+    }
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     *
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass            Password for private key
+     * @param string $extracerts_filename Optional path to chain certificate
+     */
+    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+        $this->sign_extracerts_file = $extracerts_filename;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     *
+     * @param string $txt
+     *
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        $len = strlen($txt);
+        for ($i = 0; $i < $len; ++$i) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) and ($ord <= 0x3A)) or $ord == 0x3C or ((0x3E <= $ord) and ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     *
+     * @param string $signHeader
+     *
+     * @throws Exception
+     *
+     * @return string The DKIM signature value
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new Exception($this->lang('extension_missing') . 'openssl');
+            }
+
+            return '';
+        }
+        $privKeyStr = !empty($this->DKIM_private_string) ?
+            $this->DKIM_private_string :
+            file_get_contents($this->DKIM_private);
+        if ('' != $this->DKIM_passphrase) {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = openssl_pkey_get_private($privKeyStr);
+        }
+        if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+            openssl_pkey_free($privKey);
+
+            return base64_encode($signature);
+        }
+        openssl_pkey_free($privKey);
+
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
+     *
+     * @see    https://tools.ietf.org/html/rfc6376#section-3.4.2
+     *
+     * @param string $signHeader Header
+     *
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        //Unfold all header continuation lines
+        //Also collapses folded whitespace.
+        //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
+        //@see https://tools.ietf.org/html/rfc5322#section-2.2
+        //That means this may break if you do something daft like put vertical tabs in your headers.
+        $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            //If the header is missing a :, skip it as it's invalid
+            //This is likely to happen because the explode() above will also split
+            //on the trailing LE, leaving an empty line
+            if (strpos($line, ':') === false) {
+                continue;
+            }
+            list($heading, $value) = explode(':', $line, 2);
+            //Lower-case header name
+            $heading = strtolower($heading);
+            //Collapse white space within the value
+            $value = preg_replace('/[ \t]{2,}/', ' ', $value);
+            //RFC6376 is slightly unclear here - it says to delete space at the *end* of each value
+            //But then says to delete space before and after the colon.
+            //Net result is the same as trimming both ends of the value.
+            //by elimination, the same applies to the field name
+            $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
+        }
+
+        return implode(static::$LE, $lines);
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
+     *
+     * @see    https://tools.ietf.org/html/rfc6376#section-3.4.3
+     *
+     * @param string $body Message Body
+     *
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if (empty($body)) {
+            return static::$LE;
+        }
+        // Normalize line endings
+        $body = static::normalizeBreaks($body);
+
+        //Reduce multiple trailing line breaks to a single one
+        return rtrim($body, "\r\n") . static::$LE;
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     *
+     * @param string $headers_line Header lines
+     * @param string $subject      Subject
+     * @param string $body         Body
+     *
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode(static::$LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $date_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } elseif (strpos($header, 'Date:') === 0) {
+                $date_header = $header;
+                $current = 'date_header';
+            } else {
+                if (!empty($$current) and strpos($header, ' =?') === 0) {
+                    $$current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        if ('' == $this->DKIM_identity) {
+            $ident = '';
+        } else {
+            $ident = ' i=' . $this->DKIM_identity . ';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Date:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$date\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" .
+            $to_header . "\r\n" .
+            $date_header . "\r\n" .
+            $subject_header . "\r\n" .
+            $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+
+        return static::normalizeBreaks($dkimhdrs . $signed) . static::$LE;
+    }
+
+    /**
+     * Detect if a string contains a line longer than the maximum line length
+     * allowed by RFC 2822 section 2.1.1.
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    public static function hasLineLongerThanMax($str)
+    {
+        return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     *
+     * @param bool   $isSent
+     * @param array  $to
+     * @param array  $cc
+     * @param array  $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     * @param array  $extra
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $extra)
+    {
+        if (!empty($this->action_function) and is_callable($this->action_function)) {
+            call_user_func($this->action_function, $isSent, $to, $cc, $bcc, $subject, $body, $from, $extra);
+        }
+    }
+
+    /**
+     * Get the OAuth instance.
+     *
+     * @return OAuth
+     */
+    public function getOAuth()
+    {
+        return $this->oauth;
+    }
+
+    /**
+     * Set an OAuth instance.
+     *
+     * @param OAuth $oauth
+     */
+    public function setOAuth(OAuth $oauth)
+    {
+        $this->oauth = $oauth;
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/src/POP3.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/POP3.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/POP3.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,419 @@
+<?php
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer POP-Before-SMTP Authentication Class.
+ * Specifically for PHPMailer to use for RFC1939 POP-before-SMTP authentication.
+ * 1) This class does not support APOP authentication.
+ * 2) Opening and closing lots of POP3 connections can be quite slow. If you need
+ *   to send a batch of emails then just perform the authentication once at the start,
+ *   and then loop through your mail sending script. Providing this process doesn't
+ *   take longer than the verification period lasts on your POP3 server, you should be fine.
+ * 3) This is really ancient technology; you should only need to use it to talk to very old systems.
+ * 4) This POP3 class is deliberately lightweight and incomplete, and implements just
+ *   enough to do authentication.
+ *   If you want a more complete class there are other POP3 classes for PHP available.
+ *
+ * @author  Richard Davey (original author) <rich at corephp.co.uk>
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author  Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author  Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ */
+class POP3
+{
+    /**
+     * The POP3 PHPMailer Version number.
+     *
+     * @var string
+     */
+    const VERSION = '6.0.2';
+
+    /**
+     * Default POP3 port number.
+     *
+     * @var int
+     */
+    const DEFAULT_PORT = 110;
+
+    /**
+     * Default timeout in seconds.
+     *
+     * @var int
+     */
+    const DEFAULT_TIMEOUT = 30;
+
+    /**
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes.
+     *
+     * @var int
+     */
+    public $do_debug = 0;
+
+    /**
+     * POP3 mail server hostname.
+     *
+     * @var string
+     */
+    public $host;
+
+    /**
+     * POP3 port number.
+     *
+     * @var int
+     */
+    public $port;
+
+    /**
+     * POP3 Timeout Value in seconds.
+     *
+     * @var int
+     */
+    public $tval;
+
+    /**
+     * POP3 username.
+     *
+     * @var string
+     */
+    public $username;
+
+    /**
+     * POP3 password.
+     *
+     * @var string
+     */
+    public $password;
+
+    /**
+     * Resource handle for the POP3 connection socket.
+     *
+     * @var resource
+     */
+    protected $pop_conn;
+
+    /**
+     * Are we connected?
+     *
+     * @var bool
+     */
+    protected $connected = false;
+
+    /**
+     * Error container.
+     *
+     * @var array
+     */
+    protected $errors = [];
+
+    /**
+     * Line break constant.
+     */
+    const LE = "\r\n";
+
+    /**
+     * Simple static wrapper for all-in-one POP before SMTP.
+     *
+     * @param string   $host        The hostname to connect to
+     * @param int|bool $port        The port number to connect to
+     * @param int|bool $timeout     The timeout value
+     * @param string   $username
+     * @param string   $password
+     * @param int      $debug_level
+     *
+     * @return bool
+     */
+    public static function popBeforeSmtp(
+        $host,
+        $port = false,
+        $timeout = false,
+        $username = '',
+        $password = '',
+        $debug_level = 0
+    ) {
+        $pop = new self();
+
+        return $pop->authorise($host, $port, $timeout, $username, $password, $debug_level);
+    }
+
+    /**
+     * Authenticate with a POP3 server.
+     * A connect, login, disconnect sequence
+     * appropriate for POP-before SMTP authorisation.
+     *
+     * @param string   $host        The hostname to connect to
+     * @param int|bool $port        The port number to connect to
+     * @param int|bool $timeout     The timeout value
+     * @param string   $username
+     * @param string   $password
+     * @param int      $debug_level
+     *
+     * @return bool
+     */
+    public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
+    {
+        $this->host = $host;
+        // If no port value provided, use default
+        if (false === $port) {
+            $this->port = static::DEFAULT_PORT;
+        } else {
+            $this->port = (int) $port;
+        }
+        // If no timeout value provided, use default
+        if (false === $timeout) {
+            $this->tval = static::DEFAULT_TIMEOUT;
+        } else {
+            $this->tval = (int) $timeout;
+        }
+        $this->do_debug = $debug_level;
+        $this->username = $username;
+        $this->password = $password;
+        //  Reset the error log
+        $this->errors = [];
+        //  connect
+        $result = $this->connect($this->host, $this->port, $this->tval);
+        if ($result) {
+            $login_result = $this->login($this->username, $this->password);
+            if ($login_result) {
+                $this->disconnect();
+
+                return true;
+            }
+        }
+        // We need to disconnect regardless of whether the login succeeded
+        $this->disconnect();
+
+        return false;
+    }
+
+    /**
+     * Connect to a POP3 server.
+     *
+     * @param string   $host
+     * @param int|bool $port
+     * @param int      $tval
+     *
+     * @return bool
+     */
+    public function connect($host, $port = false, $tval = 30)
+    {
+        //  Are we already connected?
+        if ($this->connected) {
+            return true;
+        }
+
+        //On Windows this will raise a PHP Warning error if the hostname doesn't exist.
+        //Rather than suppress it with @fsockopen, capture it cleanly instead
+        set_error_handler([$this, 'catchWarning']);
+
+        if (false === $port) {
+            $port = static::DEFAULT_PORT;
+        }
+
+        //  connect to the POP3 server
+        $this->pop_conn = fsockopen(
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
+            $tval
+        ); //  Timeout (seconds)
+        //  Restore the error handler
+        restore_error_handler();
+
+        //  Did we connect?
+        if (false === $this->pop_conn) {
+            //  It would appear not...
+            $this->setError(
+                "Failed to connect to server $host on port $port. errno: $errno; errstr: $errstr"
+            );
+
+            return false;
+        }
+
+        //  Increase the stream time-out
+        stream_set_timeout($this->pop_conn, $tval, 0);
+
+        //  Get the POP3 server response
+        $pop3_response = $this->getResponse();
+        //  Check for the +OK
+        if ($this->checkResponse($pop3_response)) {
+            //  The connection is established and the POP3 server is talking
+            $this->connected = true;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Log in to the POP3 server.
+     * Does not support APOP (RFC 2828, 4949).
+     *
+     * @param string $username
+     * @param string $password
+     *
+     * @return bool
+     */
+    public function login($username = '', $password = '')
+    {
+        if (!$this->connected) {
+            $this->setError('Not connected to POP3 server');
+        }
+        if (empty($username)) {
+            $username = $this->username;
+        }
+        if (empty($password)) {
+            $password = $this->password;
+        }
+
+        // Send the Username
+        $this->sendString("USER $username" . static::LE);
+        $pop3_response = $this->getResponse();
+        if ($this->checkResponse($pop3_response)) {
+            // Send the Password
+            $this->sendString("PASS $password" . static::LE);
+            $pop3_response = $this->getResponse();
+            if ($this->checkResponse($pop3_response)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Disconnect from the POP3 server.
+     */
+    public function disconnect()
+    {
+        $this->sendString('QUIT');
+        //The QUIT command may cause the daemon to exit, which will kill our connection
+        //So ignore errors here
+        try {
+            @fclose($this->pop_conn);
+        } catch (Exception $e) {
+            //Do nothing
+        }
+    }
+
+    /**
+     * Get a response from the POP3 server.
+     *
+     * @param int $size The maximum number of bytes to retrieve
+     *
+     * @return string
+     */
+    protected function getResponse($size = 128)
+    {
+        $response = fgets($this->pop_conn, $size);
+        if ($this->do_debug >= 1) {
+            echo 'Server -> Client: ', $response;
+        }
+
+        return $response;
+    }
+
+    /**
+     * Send raw data to the POP3 server.
+     *
+     * @param string $string
+     *
+     * @return int
+     */
+    protected function sendString($string)
+    {
+        if ($this->pop_conn) {
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
+                echo 'Client -> Server: ', $string;
+            }
+
+            return fwrite($this->pop_conn, $string, strlen($string));
+        }
+
+        return 0;
+    }
+
+    /**
+     * Checks the POP3 server response.
+     * Looks for for +OK or -ERR.
+     *
+     * @param string $string
+     *
+     * @return bool
+     */
+    protected function checkResponse($string)
+    {
+        if (substr($string, 0, 3) !== '+OK') {
+            $this->setError("Server reported an error: $string");
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Add an error to the internal error store.
+     * Also display debug output if it's enabled.
+     *
+     * @param string $error
+     */
+    protected function setError($error)
+    {
+        $this->errors[] = $error;
+        if ($this->do_debug >= 1) {
+            echo '<pre>';
+            foreach ($this->errors as $e) {
+                print_r($e);
+            }
+            echo '</pre>';
+        }
+    }
+
+    /**
+     * Get an array of error messages, if any.
+     *
+     * @return array
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * POP3 connection error handler.
+     *
+     * @param int    $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int    $errline
+     */
+    protected function catchWarning($errno, $errstr, $errfile, $errline)
+    {
+        $this->setError(
+            'Connecting to the POP3 server raised a PHP warning:' .
+            "errno: $errno errstr: $errstr; errfile: $errfile; errline: $errline"
+        );
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/src/SMTP.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/src/SMTP.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/src/SMTP.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,1325 @@
+<?php
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer at synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag at gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech at users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer RFC821 SMTP email transport class.
+ * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
+ *
+ * @author  Chris Ryan
+ * @author  Marcus Bointon <phpmailer at synchromedia.co.uk>
+ */
+class SMTP
+{
+    /**
+     * The PHPMailer SMTP version number.
+     *
+     * @var string
+     */
+    const VERSION = '6.0.2';
+
+    /**
+     * SMTP line break constant.
+     *
+     * @var string
+     */
+    const LE = "\r\n";
+
+    /**
+     * The SMTP port to use if one is not specified.
+     *
+     * @var int
+     */
+    const DEFAULT_PORT = 25;
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1.
+     *
+     * @var int
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * Debug level for no output.
+     */
+    const DEBUG_OFF = 0;
+
+    /**
+     * Debug level to show client -> server messages.
+     */
+    const DEBUG_CLIENT = 1;
+
+    /**
+     * Debug level to show client -> server and server -> client messages.
+     */
+    const DEBUG_SERVER = 2;
+
+    /**
+     * Debug level to show connection status, client -> server and server -> client messages.
+     */
+    const DEBUG_CONNECTION = 3;
+
+    /**
+     * Debug level to show all messages.
+     */
+    const DEBUG_LOWLEVEL = 4;
+
+    /**
+     * Debug output level.
+     * Options:
+     * * self::DEBUG_OFF (`0`) No debug output, default
+     * * self::DEBUG_CLIENT (`1`) Client commands
+     * * self::DEBUG_SERVER (`2`) Client commands and server responses
+     * * self::DEBUG_CONNECTION (`3`) As DEBUG_SERVER plus connection status
+     * * self::DEBUG_LOWLEVEL (`4`) Low-level data output, all messages.
+     *
+     * @var int
+     */
+    public $do_debug = self::DEBUG_OFF;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     *
+     * ```php
+     * $smtp->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * ```
+     *
+     * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
+     * level output is used:
+     *
+     * ```php
+     * $mail->Debugoutput = new myPsr3Logger;
+     * ```
+     *
+     * @var string|callable|\Psr\Log\LoggerInterface
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to use VERP.
+     *
+     * @see http://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @see http://www.postfix.org/VERP_README.html Info on VERP
+     *
+     * @var bool
+     */
+    public $do_verp = false;
+
+    /**
+     * The timeout value for connection, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
+     * This needs to be quite high to function correctly with hosts using greetdelay as an anti-spam measure.
+     *
+     * @see http://tools.ietf.org/html/rfc2821#section-4.5.3.2
+     *
+     * @var int
+     */
+    public $Timeout = 300;
+
+    /**
+     * How long to wait for commands to complete, in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
+     *
+     * @var int
+     */
+    public $Timelimit = 300;
+
+    /**
+     * Patterns to extract an SMTP transaction id from reply to a DATA command.
+     * The first capture group in each regex will be used as the ID.
+     * MS ESMTP returns the message ID, which may not be correct for internal tracking.
+     *
+     * @var string[]
+     */
+    protected $smtp_transaction_id_patterns = [
+        'exim' => '/[0-9]{3} OK id=(.*)/',
+        'sendmail' => '/[0-9]{3} 2.0.0 (.*) Message/',
+        'postfix' => '/[0-9]{3} 2.0.0 Ok: queued as (.*)/',
+        'Microsoft_ESMTP' => '/[0-9]{3} 2.[0-9].0 (.*)@(?:.*) Queued mail for delivery/',
+        'Amazon_SES' => '/[0-9]{3} Ok (.*)/',
+        'SendGrid' => '/[0-9]{3} Ok: queued as (.*)/',
+    ];
+
+    /**
+     * The last transaction ID issued in response to a DATA command,
+     * if one was detected.
+     *
+     * @var string|bool|null
+     */
+    protected $last_smtp_transaction_id;
+
+    /**
+     * The socket for the server connection.
+     *
+     * @var ?resource
+     */
+    protected $smtp_conn;
+
+    /**
+     * Error information, if any, for the last SMTP command.
+     *
+     * @var array
+     */
+    protected $error = [
+        'error' => '',
+        'detail' => '',
+        'smtp_code' => '',
+        'smtp_code_ex' => '',
+    ];
+
+    /**
+     * The reply the server sent to us for HELO.
+     * If null, no HELO string has yet been received.
+     *
+     * @var string|null
+     */
+    protected $helo_rply = null;
+
+    /**
+     * The set of SMTP extensions sent in reply to EHLO command.
+     * Indexes of the array are extension names.
+     * Value at index 'HELO' or 'EHLO' (according to command that was sent)
+     * represents the server name. In case of HELO it is the only element of the array.
+     * Other values can be boolean TRUE or an array containing extension options.
+     * If null, no HELO/EHLO string has yet been received.
+     *
+     * @var array|null
+     */
+    protected $server_caps = null;
+
+    /**
+     * The most recent reply received from the server.
+     *
+     * @var string
+     */
+    protected $last_reply = '';
+
+    /**
+     * Output debugging info via a user-selected method.
+     *
+     * @param string $str   Debug string to output
+     * @param int    $level The debug level of this message; see DEBUG_* constants
+     *
+     * @see SMTP::$Debugoutput
+     * @see SMTP::$do_debug
+     */
+    protected function edebug($str, $level = 0)
+    {
+        if ($level > $this->do_debug) {
+            return;
+        }
+        //Is this a PSR-3 logger?
+        if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
+            $this->Debugoutput->debug($str);
+
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $level);
+
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo gmdate('Y-m-d H:i:s'), ' ', htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ), "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n|\r/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s'),
+                "\t",
+                    //Trim trailing space
+                trim(
+                //Indent for readability, except for trailing break
+                    str_replace(
+                        "\n",
+                        "\n                   \t                  ",
+                        trim($str)
+                    )
+                ),
+                "\n";
+        }
+    }
+
+    /**
+     * Connect to an SMTP server.
+     *
+     * @param string $host    SMTP server IP or host name
+     * @param int    $port    The port number to connect to
+     * @param int    $timeout How long to wait for the connection to open
+     * @param array  $options An array of options for stream_context_create()
+     *
+     * @return bool
+     */
+    public function connect($host, $port = null, $timeout = 30, $options = [])
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (null === $streamok) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
+        $this->setError('');
+        // Make sure we are __not__ connected
+        if ($this->connected()) {
+            // Already connected, generate error
+            $this->setError('Already connected to a server');
+
+            return false;
+        }
+        if (empty($port)) {
+            $port = self::DEFAULT_PORT;
+        }
+        // Connect to the SMTP server
+        $this->edebug(
+            "Connection: opening to $host:$port, timeout=$timeout, options=" .
+            (count($options) > 0 ? var_export($options, true) : 'array()'),
+            self::DEBUG_CONNECTION
+        );
+        $errno = 0;
+        $errstr = '';
+        if ($streamok) {
+            $socket_context = stream_context_create($options);
+            set_error_handler([$this, 'errorHandler']);
+            $this->smtp_conn = stream_socket_client(
+                $host . ':' . $port,
+                $errno,
+                $errstr,
+                $timeout,
+                STREAM_CLIENT_CONNECT,
+                $socket_context
+            );
+            restore_error_handler();
+        } else {
+            //Fall back to fsockopen which should work in more places, but is missing some features
+            $this->edebug(
+                'Connection: stream_socket_client not available, falling back to fsockopen',
+                self::DEBUG_CONNECTION
+            );
+            set_error_handler([$this, 'errorHandler']);
+            $this->smtp_conn = fsockopen(
+                $host,
+                $port,
+                $errno,
+                $errstr,
+                $timeout
+            );
+            restore_error_handler();
+        }
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
+            $this->setError(
+                'Failed to connect to server',
+                '',
+                (string) $errno,
+                (string) $errstr
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error']
+                . ": $errstr ($errno)",
+                self::DEBUG_CLIENT
+            );
+
+            return false;
+        }
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            // Don't bother if unlimited
+            if (0 != $max and $timeout > $max) {
+                @set_time_limit($timeout);
+            }
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
+        }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
+
+        return true;
+    }
+
+    /**
+     * Initiate a TLS (encrypted) session.
+     *
+     * @return bool
+     */
+    public function startTLS()
+    {
+        if (!$this->sendCommand('STARTTLS', 'STARTTLS', 220)) {
+            return false;
+        }
+
+        //Allow the best TLS version(s) we can
+        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+        //PHP 5.6.7 dropped inclusion of TLS 1.1 and 1.2 in STREAM_CRYPTO_METHOD_TLS_CLIENT
+        //so add them back in manually if we can
+        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+        }
+
+        // Begin encrypted connection
+        set_error_handler([$this, 'errorHandler']);
+        $crypto_ok = stream_socket_enable_crypto(
+            $this->smtp_conn,
+            true,
+            $crypto_method
+        );
+        restore_error_handler();
+
+        return (bool) $crypto_ok;
+    }
+
+    /**
+     * Perform SMTP authentication.
+     * Must be run after hello().
+     *
+     * @see    hello()
+     *
+     * @param string $username The user name
+     * @param string $password The password
+     * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
+     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
+     *
+     * @return bool True if successfully authenticated
+     */
+    public function authenticate(
+        $username,
+        $password,
+        $authtype = null,
+        $OAuth = null
+    ) {
+        if (!$this->server_caps) {
+            $this->setError('Authentication is not allowed before HELO/EHLO');
+
+            return false;
+        }
+
+        if (array_key_exists('EHLO', $this->server_caps)) {
+            // SMTP extensions are available; try to find a proper authentication method
+            if (!array_key_exists('AUTH', $this->server_caps)) {
+                $this->setError('Authentication is not allowed at this stage');
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
+
+                return false;
+            }
+
+            $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNKNOWN'), self::DEBUG_LOWLEVEL);
+            $this->edebug(
+                'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
+                self::DEBUG_LOWLEVEL
+            );
+
+            //If we have requested a specific auth type, check the server supports it before trying others
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
+                $authtype = null;
+            }
+
+            if (empty($authtype)) {
+                //If no auth mechanism is specified, attempt to use these, in this order
+                //Try CRAM-MD5 first as it's more secure than the others
+                foreach (['CRAM-MD5', 'LOGIN', 'PLAIN', 'XOAUTH2'] as $method) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
+                        $authtype = $method;
+                        break;
+                    }
+                }
+                if (empty($authtype)) {
+                    $this->setError('No supported authentication methods found');
+
+                    return false;
+                }
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+            }
+
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
+                $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
+
+                return false;
+            }
+        } elseif (empty($authtype)) {
+            $authtype = 'LOGIN';
+        }
+        switch ($authtype) {
+            case 'PLAIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
+                    return false;
+                }
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
+                ) {
+                    return false;
+                }
+                break;
+            case 'LOGIN':
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand('Username', base64_encode($username), 334)) {
+                    return false;
+                }
+                if (!$this->sendCommand('Password', base64_encode($password), 235)) {
+                    return false;
+                }
+                break;
+            case 'CRAM-MD5':
+                // Start authentication
+                if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
+                    return false;
+                }
+                // Get the challenge
+                $challenge = base64_decode(substr($this->last_reply, 4));
+
+                // Build the response
+                $response = $username . ' ' . $this->hmac($challenge, $password);
+
+                // send encoded credentials
+                return $this->sendCommand('Username', base64_encode($response), 235);
+            case 'XOAUTH2':
+                //The OAuth instance must be set up prior to requesting auth.
+                if (null === $OAuth) {
+                    return false;
+                }
+                $oauth = $OAuth->getOauth64();
+
+                // Start authentication
+                if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
+                    return false;
+                }
+                break;
+            default:
+                $this->setError("Authentication method \"$authtype\" is not supported");
+
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Calculate an MD5 HMAC hash.
+     * Works like hash_hmac('md5', $data, $key)
+     * in case that function is not available.
+     *
+     * @param string $data The data to hash
+     * @param string $key  The key to hash with
+     *
+     * @return string
+     */
+    protected function hmac($data, $key)
+    {
+        if (function_exists('hash_hmac')) {
+            return hash_hmac('md5', $data, $key);
+        }
+
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
+
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
+
+        $bytelen = 64; // byte length for md5
+        if (strlen($key) > $bytelen) {
+            $key = pack('H*', md5($key));
+        }
+        $key = str_pad($key, $bytelen, chr(0x00));
+        $ipad = str_pad('', $bytelen, chr(0x36));
+        $opad = str_pad('', $bytelen, chr(0x5c));
+        $k_ipad = $key ^ $ipad;
+        $k_opad = $key ^ $opad;
+
+        return md5($k_opad . pack('H*', md5($k_ipad . $data)));
+    }
+
+    /**
+     * Check connection state.
+     *
+     * @return bool True if connected
+     */
+    public function connected()
+    {
+        if (is_resource($this->smtp_conn)) {
+            $sock_status = stream_get_meta_data($this->smtp_conn);
+            if ($sock_status['eof']) {
+                // The socket is valid but we are not connected
+                $this->edebug(
+                    'SMTP NOTICE: EOF caught while checking if connected',
+                    self::DEBUG_CLIENT
+                );
+                $this->close();
+
+                return false;
+            }
+
+            return true; // everything looks good
+        }
+
+        return false;
+    }
+
+    /**
+     * Close the socket and clean up the state of the class.
+     * Don't use this function without first trying to use QUIT.
+     *
+     * @see quit()
+     */
+    public function close()
+    {
+        $this->setError('');
+        $this->server_caps = null;
+        $this->helo_rply = null;
+        if (is_resource($this->smtp_conn)) {
+            // close the connection and cleanup
+            fclose($this->smtp_conn);
+            $this->smtp_conn = null; //Makes for cleaner serialization
+            $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
+        }
+    }
+
+    /**
+     * Send an SMTP DATA command.
+     * Issues a data command and sends the msg_data to the server,
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
+     * on a single line followed by a <CRLF> with the message headers
+     * and the message body being separated by an additional <CRLF>.
+     * Implements RFC 821: DATA <CRLF>.
+     *
+     * @param string $msg_data Message data to send
+     *
+     * @return bool
+     */
+    public function data($msg_data)
+    {
+        //This will use the standard timelimit
+        if (!$this->sendCommand('DATA', 'DATA', 354)) {
+            return false;
+        }
+
+        /* The server is ready to accept data!
+         * According to rfc821 we should not send more than 1000 characters on a single line (including the LE)
+         * so we will break the data up into lines by \r and/or \n then if needed we will break each of those into
+         * smaller lines to fit within the limit.
+         * We will also look for lines that start with a '.' and prepend an additional '.'.
+         * NOTE: this does not count towards line-length limit.
+         */
+
+        // Normalize line breaks before exploding
+        $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
+
+        /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
+         * process all lines before a blank line as headers.
+         */
+
+        $field = substr($lines[0], 0, strpos($lines[0], ':'));
+        $in_headers = false;
+        if (!empty($field) and strpos($field, ' ') === false) {
+            $in_headers = true;
+        }
+
+        foreach ($lines as $line) {
+            $lines_out = [];
+            if ($in_headers and $line == '') {
+                $in_headers = false;
+            }
+            //Break this line up into several smaller lines if it's too long
+            //Micro-optimisation: isset($str[$len]) is faster than (strlen($str) > $len),
+            while (isset($line[self::MAX_LINE_LENGTH])) {
+                //Working backwards, try to find a space within the last MAX_LINE_LENGTH chars of the line to break on
+                //so as to avoid breaking in the middle of a word
+                $pos = strrpos(substr($line, 0, self::MAX_LINE_LENGTH), ' ');
+                //Deliberately matches both false and 0
+                if (!$pos) {
+                    //No nice break found, add a hard break
+                    $pos = self::MAX_LINE_LENGTH - 1;
+                    $lines_out[] = substr($line, 0, $pos);
+                    $line = substr($line, $pos);
+                } else {
+                    //Break at the found point
+                    $lines_out[] = substr($line, 0, $pos);
+                    //Move along by the amount we dealt with
+                    $line = substr($line, $pos + 1);
+                }
+                //If processing headers add a LWSP-char to the front of new line RFC822 section 3.1.1
+                if ($in_headers) {
+                    $line = "\t" . $line;
+                }
+            }
+            $lines_out[] = $line;
+
+            //Send the lines to the server
+            foreach ($lines_out as $line_out) {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
+                    $line_out = '.' . $line_out;
+                }
+                $this->client_send($line_out . static::LE, 'DATA');
+            }
+        }
+
+        //Message data has been sent, complete the command
+        //Increase timelimit for end of DATA command
+        $savetimelimit = $this->Timelimit;
+        $this->Timelimit = $this->Timelimit * 2;
+        $result = $this->sendCommand('DATA END', '.', 250);
+        $this->recordLastTransactionID();
+        //Restore timelimit
+        $this->Timelimit = $savetimelimit;
+
+        return $result;
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Used to identify the sending server to the receiving server.
+     * This makes sure that client and server are in a known state.
+     * Implements RFC 821: HELO <SP> <domain> <CRLF>
+     * and RFC 2821 EHLO.
+     *
+     * @param string $host The host name or IP to connect to
+     *
+     * @return bool
+     */
+    public function hello($host = '')
+    {
+        //Try extended hello first (RFC 2821)
+        return (bool) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
+    }
+
+    /**
+     * Send an SMTP HELO or EHLO command.
+     * Low-level implementation used by hello().
+     *
+     * @param string $hello The HELO string
+     * @param string $host  The hostname to say we are
+     *
+     * @return bool
+     *
+     * @see    hello()
+     */
+    protected function sendHello($hello, $host)
+    {
+        $noerror = $this->sendCommand($hello, $hello . ' ' . $host, 250);
+        $this->helo_rply = $this->last_reply;
+        if ($noerror) {
+            $this->parseHelloFields($hello);
+        } else {
+            $this->server_caps = null;
+        }
+
+        return $noerror;
+    }
+
+    /**
+     * Parse a reply to HELO/EHLO command to discover server extensions.
+     * In case of HELO, the only parameter that can be discovered is a server name.
+     *
+     * @param string $type `HELO` or `EHLO`
+     */
+    protected function parseHelloFields($type)
+    {
+        $this->server_caps = [];
+        $lines = explode("\n", $this->helo_rply);
+
+        foreach ($lines as $n => $s) {
+            //First 4 chars contain response code followed by - or space
+            $s = trim(substr($s, 4));
+            if (empty($s)) {
+                continue;
+            }
+            $fields = explode(' ', $s);
+            if (!empty($fields)) {
+                if (!$n) {
+                    $name = $type;
+                    $fields = $fields[0];
+                } else {
+                    $name = array_shift($fields);
+                    switch ($name) {
+                        case 'SIZE':
+                            $fields = ($fields ? $fields[0] : 0);
+                            break;
+                        case 'AUTH':
+                            if (!is_array($fields)) {
+                                $fields = [];
+                            }
+                            break;
+                        default:
+                            $fields = true;
+                    }
+                }
+                $this->server_caps[$name] = $fields;
+            }
+        }
+    }
+
+    /**
+     * Send an SMTP MAIL command.
+     * Starts a mail transaction from the email address specified in
+     * $from. Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command.
+     * Implements RFC 821: MAIL <SP> FROM:<reverse-path> <CRLF>.
+     *
+     * @param string $from Source address of this message
+     *
+     * @return bool
+     */
+    public function mail($from)
+    {
+        $useVerp = ($this->do_verp ? ' XVERP' : '');
+
+        return $this->sendCommand(
+            'MAIL FROM',
+            'MAIL FROM:<' . $from . '>' . $useVerp,
+            250
+        );
+    }
+
+    /**
+     * Send an SMTP QUIT command.
+     * Closes the socket if there is no error or the $close_on_error argument is true.
+     * Implements from RFC 821: QUIT <CRLF>.
+     *
+     * @param bool $close_on_error Should the connection close if an error occurs?
+     *
+     * @return bool
+     */
+    public function quit($close_on_error = true)
+    {
+        $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
+        $err = $this->error; //Save any error
+        if ($noerror or $close_on_error) {
+            $this->close();
+            $this->error = $err; //Restore any error from the quit command
+        }
+
+        return $noerror;
+    }
+
+    /**
+     * Send an SMTP RCPT command.
+     * Sets the TO argument to $toaddr.
+     * Returns true if the recipient was accepted false if it was rejected.
+     * Implements from RFC 821: RCPT <SP> TO:<forward-path> <CRLF>.
+     *
+     * @param string $address The address the message is being sent to
+     *
+     * @return bool
+     */
+    public function recipient($address)
+    {
+        return $this->sendCommand(
+            'RCPT TO',
+            'RCPT TO:<' . $address . '>',
+            [250, 251]
+        );
+    }
+
+    /**
+     * Send an SMTP RSET command.
+     * Abort any transaction that is currently in progress.
+     * Implements RFC 821: RSET <CRLF>.
+     *
+     * @return bool True on success
+     */
+    public function reset()
+    {
+        return $this->sendCommand('RSET', 'RSET', 250);
+    }
+
+    /**
+     * Send a command to an SMTP server and check its return code.
+     *
+     * @param string    $command       The command name - not sent to the server
+     * @param string    $commandstring The actual command to send
+     * @param int|array $expect        One or more expected integer success codes
+     *
+     * @return bool True on success
+     */
+    protected function sendCommand($command, $commandstring, $expect)
+    {
+        if (!$this->connected()) {
+            $this->setError("Called $command without being connected");
+
+            return false;
+        }
+        //Reject line breaks in all commands
+        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
+            $this->setError("Command '$command' contained line breaks");
+
+            return false;
+        }
+        $this->client_send($commandstring . static::LE, $command);
+
+        $this->last_reply = $this->get_lines();
+        // Fetch SMTP code and possible error code explanation
+        $matches = [];
+        if (preg_match('/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/', $this->last_reply, $matches)) {
+            $code = $matches[1];
+            $code_ex = (count($matches) > 2 ? $matches[2] : null);
+            // Cut off error code from each response line
+            $detail = preg_replace(
+                "/{$code}[ -]" .
+                ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
+                '',
+                $this->last_reply
+            );
+        } else {
+            // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
+            $code_ex = null;
+            $detail = substr($this->last_reply, 4);
+        }
+
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+
+        if (!in_array($code, (array) $expect)) {
+            $this->setError(
+                "$command command failed",
+                $detail,
+                $code,
+                $code_ex
+            );
+            $this->edebug(
+                'SMTP ERROR: ' . $this->error['error'] . ': ' . $this->last_reply,
+                self::DEBUG_CLIENT
+            );
+
+            return false;
+        }
+
+        $this->setError('');
+
+        return true;
+    }
+
+    /**
+     * Send an SMTP SAML command.
+     * Starts a mail transaction from the email address specified in $from.
+     * Returns true if successful or false otherwise. If True
+     * the mail transaction is started and then one or more recipient
+     * commands may be called followed by a data command. This command
+     * will send the message to the users terminal if they are logged
+     * in and send them an email.
+     * Implements RFC 821: SAML <SP> FROM:<reverse-path> <CRLF>.
+     *
+     * @param string $from The address the message is from
+     *
+     * @return bool
+     */
+    public function sendAndMail($from)
+    {
+        return $this->sendCommand('SAML', "SAML FROM:$from", 250);
+    }
+
+    /**
+     * Send an SMTP VRFY command.
+     *
+     * @param string $name The name to verify
+     *
+     * @return bool
+     */
+    public function verify($name)
+    {
+        return $this->sendCommand('VRFY', "VRFY $name", [250, 251]);
+    }
+
+    /**
+     * Send an SMTP NOOP command.
+     * Used to keep keep-alives alive, doesn't actually do anything.
+     *
+     * @return bool
+     */
+    public function noop()
+    {
+        return $this->sendCommand('NOOP', 'NOOP', 250);
+    }
+
+    /**
+     * Send an SMTP TURN command.
+     * This is an optional command for SMTP that this class does not support.
+     * This method is here to make the RFC821 Definition complete for this class
+     * and _may_ be implemented in future.
+     * Implements from RFC 821: TURN <CRLF>.
+     *
+     * @return bool
+     */
+    public function turn()
+    {
+        $this->setError('The SMTP TURN command is not implemented');
+        $this->edebug('SMTP NOTICE: ' . $this->error['error'], self::DEBUG_CLIENT);
+
+        return false;
+    }
+
+    /**
+     * Send raw data to the server.
+     *
+     * @param string $data    The data to send
+     * @param string $command Optionally, the command this is part of, used only for controlling debug output
+     *
+     * @return int|bool The number of bytes sent to the server or false on error
+     */
+    public function client_send($data, $command = '')
+    {
+        //If SMTP transcripts are left enabled, or debug output is posted online
+        //it can leak credentials, so hide credentials in all but lowest level
+        if (self::DEBUG_LOWLEVEL > $this->do_debug and
+            in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+            $this->edebug('CLIENT -> SERVER: <credentials hidden>', self::DEBUG_CLIENT);
+        } else {
+            $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
+        }
+        set_error_handler([$this, 'errorHandler']);
+        $result = fwrite($this->smtp_conn, $data);
+        restore_error_handler();
+
+        return $result;
+    }
+
+    /**
+     * Get the latest error.
+     *
+     * @return array
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Get SMTP extensions available on the server.
+     *
+     * @return array|null
+     */
+    public function getServerExtList()
+    {
+        return $this->server_caps;
+    }
+
+    /**
+     * Get metadata about the SMTP server from its HELO/EHLO response.
+     * The method works in three ways, dependent on argument value and current state:
+     *   1. HELO/EHLO has not been sent - returns null and populates $this->error.
+     *   2. HELO has been sent -
+     *     $name == 'HELO': returns server name
+     *     $name == 'EHLO': returns boolean false
+     *     $name == any other string: returns null and populates $this->error
+     *   3. EHLO has been sent -
+     *     $name == 'HELO'|'EHLO': returns the server name
+     *     $name == any other string: if extension $name exists, returns True
+     *       or its options (e.g. AUTH mechanisms supported). Otherwise returns False.
+     *
+     * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
+     *
+     * @return mixed
+     */
+    public function getServerExt($name)
+    {
+        if (!$this->server_caps) {
+            $this->setError('No HELO/EHLO was sent');
+
+            return;
+        }
+
+        if (!array_key_exists($name, $this->server_caps)) {
+            if ('HELO' == $name) {
+                return $this->server_caps['EHLO'];
+            }
+            if ('EHLO' == $name || array_key_exists('EHLO', $this->server_caps)) {
+                return false;
+            }
+            $this->setError('HELO handshake was used; No information about server extensions available');
+
+            return;
+        }
+
+        return $this->server_caps[$name];
+    }
+
+    /**
+     * Get the last reply from the server.
+     *
+     * @return string
+     */
+    public function getLastReply()
+    {
+        return $this->last_reply;
+    }
+
+    /**
+     * Read the SMTP server's response.
+     * Either before eof or socket timeout occurs on the operation.
+     * With SMTP we can tell if we have more lines to read if the
+     * 4th character is '-' symbol. If it is a space then we don't
+     * need to read anything else.
+     *
+     * @return string
+     */
+    protected function get_lines()
+    {
+        // If the connection is bad, give up straight away
+        if (!is_resource($this->smtp_conn)) {
+            return '';
+        }
+        $data = '';
+        $endtime = 0;
+        stream_set_timeout($this->smtp_conn, $this->Timeout);
+        if ($this->Timelimit > 0) {
+            $endtime = time() + $this->Timelimit;
+        }
+        $selR = [$this->smtp_conn];
+        $selW = null;
+        while (is_resource($this->smtp_conn) and !feof($this->smtp_conn)) {
+            //Must pass vars in here as params are by reference
+            if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            //Deliberate noise suppression - errors are handled afterwards
+            $str = @fgets($this->smtp_conn, 515);
+            $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
+            $data .= $str;
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
+                break;
+            }
+            // Timed-out? Log and break
+            $info = stream_get_meta_data($this->smtp_conn);
+            if ($info['timed_out']) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
+                $this->edebug(
+                    'SMTP -> get_lines(): timelimit reached (' .
+                    $this->Timelimit . ' sec)',
+                    self::DEBUG_LOWLEVEL
+                );
+                break;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * Enable or disable VERP address generation.
+     *
+     * @param bool $enabled
+     */
+    public function setVerp($enabled = false)
+    {
+        $this->do_verp = $enabled;
+    }
+
+    /**
+     * Get VERP address generation mode.
+     *
+     * @return bool
+     */
+    public function getVerp()
+    {
+        return $this->do_verp;
+    }
+
+    /**
+     * Set error messages and codes.
+     *
+     * @param string $message      The error message
+     * @param string $detail       Further detail on the error
+     * @param string $smtp_code    An associated SMTP error code
+     * @param string $smtp_code_ex Extended SMTP code
+     */
+    protected function setError($message, $detail = '', $smtp_code = '', $smtp_code_ex = '')
+    {
+        $this->error = [
+            'error' => $message,
+            'detail' => $detail,
+            'smtp_code' => $smtp_code,
+            'smtp_code_ex' => $smtp_code_ex,
+        ];
+    }
+
+    /**
+     * Set debug output method.
+     *
+     * @param string|callable $method The name of the mechanism to use for debugging output, or a callable to handle it
+     */
+    public function setDebugOutput($method = 'echo')
+    {
+        $this->Debugoutput = $method;
+    }
+
+    /**
+     * Get debug output method.
+     *
+     * @return string
+     */
+    public function getDebugOutput()
+    {
+        return $this->Debugoutput;
+    }
+
+    /**
+     * Set debug output level.
+     *
+     * @param int $level
+     */
+    public function setDebugLevel($level = 0)
+    {
+        $this->do_debug = $level;
+    }
+
+    /**
+     * Get debug output level.
+     *
+     * @return int
+     */
+    public function getDebugLevel()
+    {
+        return $this->do_debug;
+    }
+
+    /**
+     * Set SMTP timeout.
+     *
+     * @param int $timeout The timeout duration in seconds
+     */
+    public function setTimeout($timeout = 0)
+    {
+        $this->Timeout = $timeout;
+    }
+
+    /**
+     * Get SMTP timeout.
+     *
+     * @return int
+     */
+    public function getTimeout()
+    {
+        return $this->Timeout;
+    }
+
+    /**
+     * Reports an error number and string.
+     *
+     * @param int    $errno   The error number returned by PHP
+     * @param string $errmsg  The error message returned by PHP
+     * @param string $errfile The file the error occurred in
+     * @param int    $errline The line number the error occurred on
+     */
+    protected function errorHandler($errno, $errmsg, $errfile = '', $errline = 0)
+    {
+        $notice = 'Connection failed.';
+        $this->setError(
+            $notice,
+            $errmsg,
+            (string) $errno
+        );
+        $this->edebug(
+            "$notice Error #$errno: $errmsg [$errfile line $errline]",
+            self::DEBUG_CONNECTION
+        );
+    }
+
+    /**
+     * Extract and return the ID of the last SMTP transaction based on
+     * a list of patterns provided in SMTP::$smtp_transaction_id_patterns.
+     * Relies on the host providing the ID in response to a DATA command.
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     *
+     * @return bool|null|string
+     */
+    protected function recordLastTransactionID()
+    {
+        $reply = $this->getLastReply();
+
+        if (empty($reply)) {
+            $this->last_smtp_transaction_id = null;
+        } else {
+            $this->last_smtp_transaction_id = false;
+            foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
+                if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
+                    $this->last_smtp_transaction_id = trim($matches[1]);
+                    break;
+                }
+            }
+        }
+
+        return $this->last_smtp_transaction_id;
+    }
+
+    /**
+     * Get the queue/transaction ID of the last SMTP transaction
+     * If no reply has been received yet, it will return null.
+     * If no pattern was matched, it will return false.
+     *
+     * @return bool|null|string
+     *
+     * @see recordLastTransactionID()
+     */
+    public function getLastTransactionID()
+    {
+        return $this->last_smtp_transaction_id;
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/DebugLogTestListener.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/DebugLogTestListener.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/DebugLogTestListener.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,39 @@
+<?php
+/**
+ * PHPMailer - language file tests.
+ *
+ * PHP version 5.5.
+ *
+ * @author    Marcus Bointon <phpmailer at synchromedia.co.uk>
+ * @author    Andy Prevost
+ * @copyright 2010 - 2017 Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace PHPMailer\Test;
+
+class DebugLogTestListener extends \PHPUnit_Framework_BaseTestListener
+{
+    private static $debugLog = '';
+
+    public function addError(\PHPUnit_Framework_Test $test, \Exception $e, $time)
+    {
+        echo self::$debugLog;
+    }
+
+    public function addFailure(\PHPUnit_Framework_Test $test, \PHPUnit_Framework_AssertionFailedError $e, $time)
+    {
+        echo self::$debugLog;
+    }
+
+    public function startTest(\PHPUnit_Framework_Test $test)
+    {
+        self::$debugLog = '';
+    }
+
+    public static function debugLog($str)
+    {
+        self::$debugLog .= $str . PHP_EOL;
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerLangTest.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerLangTest.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerLangTest.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,72 @@
+<?php
+/**
+ * PHPMailer - language file tests.
+ *
+ * PHP version 5.5.
+ *
+ * @author    Marcus Bointon <phpmailer at synchromedia.co.uk>
+ * @author    Andy Prevost
+ * @copyright 2010 - 2017 Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace PHPMailer\Test;
+
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Check language files for missing or excess translations.
+ */
+final class PHPMailerLangTest extends TestCase
+{
+    /**
+     * Holds a PHPMailer instance.
+     *
+     * @var PHPMailer
+     */
+    private $Mail;
+
+    /**
+     * Run before each test is started.
+     */
+    protected function setUp()
+    {
+        $this->Mail = new PHPMailer();
+    }
+
+    /**
+     * Test language files for missing and excess translations.
+     * All languages are compared with English.
+     *
+     * @group languages
+     */
+    public function testTranslations()
+    {
+        $this->Mail->setLanguage('en');
+        $definedStrings = $this->Mail->getTranslations();
+        $err = '';
+        foreach (new \DirectoryIterator('../language') as $fileInfo) {
+            if ($fileInfo->isDot()) {
+                continue;
+            }
+            $matches = [];
+            //Only look at language files, ignore anything else in there
+            if (preg_match('/^phpmailer\.lang-([a-z_]{2,})\.php$/', $fileInfo->getFilename(), $matches)) {
+                $lang = $matches[1]; //Extract language code
+                $PHPMAILER_LANG = []; //Language strings get put in here
+                include $fileInfo->getPathname(); //Get language strings
+                $missing = array_diff(array_keys($definedStrings), array_keys($PHPMAILER_LANG));
+                $extra = array_diff(array_keys($PHPMAILER_LANG), array_keys($definedStrings));
+                if (!empty($missing)) {
+                    $err .= "\nMissing translations in $lang: " . implode(', ', $missing);
+                }
+                if (!empty($extra)) {
+                    $err .= "\nExtra translations in $lang: " . implode(', ', $extra);
+                }
+            }
+        }
+        $this->assertEmpty($err, $err);
+    }
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerTest.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerTest.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/PHPMailerTest.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,2415 @@
+<?php
+/**
+ * PHPMailer - PHP email transport unit tests.
+ * PHP version 5.5.
+ *
+ * @author    Marcus Bointon <phpmailer at synchromedia.co.uk>
+ * @author    Andy Prevost
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ */
+
+namespace PHPMailer\Test;
+
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\POP3;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * PHPMailer - PHP email transport unit test class.
+ */
+final class PHPMailerTest extends TestCase
+{
+    /**
+     * Holds the PHPMailer instance.
+     *
+     * @var PHPMailer
+     */
+    private $Mail;
+
+    /**
+     * Holds the SMTP mail host.
+     *
+     * @var string
+     */
+    private $Host = '';
+
+    /**
+     * Holds the change log.
+     *
+     * @var string[]
+     */
+    private $ChangeLog = [];
+
+    /**
+     * Holds the note log.
+     *
+     * @var string[]
+     */
+    private $NoteLog = [];
+
+    /**
+     * Default include path.
+     *
+     * @var string
+     */
+    private $INCLUDE_DIR = '..';
+
+    /**
+     * PIDs of any processes we need to kill.
+     *
+     * @var array
+     */
+    private $pids = [];
+
+    /**
+     * Run before each test is started.
+     */
+    protected function setUp()
+    {
+        $this->INCLUDE_DIR = dirname(__DIR__); //Default to the dir above the test dir, i.e. the project home dir
+        if (file_exists($this->INCLUDE_DIR . '/test/testbootstrap.php')) {
+            include $this->INCLUDE_DIR . '/test/testbootstrap.php'; //Overrides go in here
+        }
+        $this->Mail = new PHPMailer();
+        $this->Mail->SMTPDebug = 3; //Full debug output
+        $this->Mail->Debugoutput = ['PHPMailer\Test\DebugLogTestListener', 'debugLog'];
+        $this->Mail->Priority = 3;
+        $this->Mail->Encoding = '8bit';
+        $this->Mail->CharSet = 'iso-8859-1';
+        if (array_key_exists('mail_from', $_REQUEST)) {
+            $this->Mail->From = $_REQUEST['mail_from'];
+        } else {
+            $this->Mail->From = 'unit_test at phpmailer.example.com';
+        }
+        $this->Mail->FromName = 'Unit Tester';
+        $this->Mail->Sender = '';
+        $this->Mail->Subject = 'Unit Test';
+        $this->Mail->Body = '';
+        $this->Mail->AltBody = '';
+        $this->Mail->WordWrap = 0;
+        if (array_key_exists('mail_host', $_REQUEST)) {
+            $this->Mail->Host = $_REQUEST['mail_host'];
+        } else {
+            $this->Mail->Host = 'mail.example.com';
+        }
+        if (array_key_exists('mail_port', $_REQUEST)) {
+            $this->Mail->Port = $_REQUEST['mail_port'];
+        } else {
+            $this->Mail->Port = 25;
+        }
+        $this->Mail->Helo = 'localhost.localdomain';
+        $this->Mail->SMTPAuth = false;
+        $this->Mail->Username = '';
+        $this->Mail->Password = '';
+        $this->Mail->addReplyTo('no_reply at phpmailer.example.com', 'Reply Guy');
+        $this->Mail->Sender = 'unit_test at phpmailer.example.com';
+        if (strlen($this->Mail->Host) > 0) {
+            $this->Mail->isSMTP();
+        } else {
+            $this->Mail->isMail();
+        }
+        if (array_key_exists('mail_to', $_REQUEST)) {
+            $this->setAddress($_REQUEST['mail_to'], 'Test User', 'to');
+        }
+        if (array_key_exists('mail_cc', $_REQUEST) and strlen($_REQUEST['mail_cc']) > 0) {
+            $this->setAddress($_REQUEST['mail_cc'], 'Carbon User', 'cc');
+        }
+    }
+
+    /**
+     * Run after each test is completed.
+     */
+    protected function tearDown()
+    {
+        // Clean global variables
+        $this->Mail = null;
+        $this->ChangeLog = [];
+        $this->NoteLog = [];
+
+        foreach ($this->pids as $pid) {
+            $p = escapeshellarg($pid);
+            shell_exec("ps $p && kill -TERM $p");
+        }
+    }
+
+    /**
+     * Build the body of the message in the appropriate format.
+     */
+    private function buildBody()
+    {
+        $this->checkChanges();
+
+        // Determine line endings for message
+        if ('text/html' == $this->Mail->ContentType || strlen($this->Mail->AltBody) > 0) {
+            $eol = "<br>\r\n";
+            $bullet_start = '<li>';
+            $bullet_end = "</li>\r\n";
+            $list_start = "<ul>\r\n";
+            $list_end = "</ul>\r\n";
+        } else {
+            $eol = "\r\n";
+            $bullet_start = ' - ';
+            $bullet_end = "\r\n";
+            $list_start = '';
+            $list_end = '';
+        }
+
+        $ReportBody = '';
+
+        $ReportBody .= '---------------------' . $eol;
+        $ReportBody .= 'Unit Test Information' . $eol;
+        $ReportBody .= '---------------------' . $eol;
+        $ReportBody .= 'phpmailer version: ' . PHPMailer::VERSION . $eol;
+        $ReportBody .= 'Content Type: ' . $this->Mail->ContentType . $eol;
+        $ReportBody .= 'CharSet: ' . $this->Mail->CharSet . $eol;
+
+        if (strlen($this->Mail->Host) > 0) {
+            $ReportBody .= 'Host: ' . $this->Mail->Host . $eol;
+        }
+
+        // If attachments then create an attachment list
+        $attachments = $this->Mail->getAttachments();
+        if (count($attachments) > 0) {
+            $ReportBody .= 'Attachments:' . $eol;
+            $ReportBody .= $list_start;
+            foreach ($attachments as $attachment) {
+                $ReportBody .= $bullet_start . 'Name: ' . $attachment[1] . ', ';
+                $ReportBody .= 'Encoding: ' . $attachment[3] . ', ';
+                $ReportBody .= 'Type: ' . $attachment[4] . $bullet_end;
+            }
+            $ReportBody .= $list_end . $eol;
+        }
+
+        // If there are changes then list them
+        if (count($this->ChangeLog) > 0) {
+            $ReportBody .= 'Changes' . $eol;
+            $ReportBody .= '-------' . $eol;
+
+            $ReportBody .= $list_start;
+            for ($i = 0; $i < count($this->ChangeLog); ++$i) {
+                $ReportBody .= $bullet_start . $this->ChangeLog[$i][0] . ' was changed to [' .
+                    $this->ChangeLog[$i][1] . ']' . $bullet_end;
+            }
+            $ReportBody .= $list_end . $eol . $eol;
+        }
+
+        // If there are notes then list them
+        if (count($this->NoteLog) > 0) {
+            $ReportBody .= 'Notes' . $eol;
+            $ReportBody .= '-----' . $eol;
+
+            $ReportBody .= $list_start;
+            for ($i = 0; $i < count($this->NoteLog); ++$i) {
+                $ReportBody .= $bullet_start . $this->NoteLog[$i] . $bullet_end;
+            }
+            $ReportBody .= $list_end;
+        }
+
+        // Re-attach the original body
+        $this->Mail->Body .= $eol . $ReportBody;
+    }
+
+    /**
+     * Check which default settings have been changed for the report.
+     */
+    private function checkChanges()
+    {
+        if (3 != $this->Mail->Priority) {
+            $this->addChange('Priority', $this->Mail->Priority);
+        }
+        if ('8bit' != $this->Mail->Encoding) {
+            $this->addChange('Encoding', $this->Mail->Encoding);
+        }
+        if ('iso-8859-1' != $this->Mail->CharSet) {
+            $this->addChange('CharSet', $this->Mail->CharSet);
+        }
+        if ('' != $this->Mail->Sender) {
+            $this->addChange('Sender', $this->Mail->Sender);
+        }
+        if (0 != $this->Mail->WordWrap) {
+            $this->addChange('WordWrap', $this->Mail->WordWrap);
+        }
+        if ('mail' != $this->Mail->Mailer) {
+            $this->addChange('Mailer', $this->Mail->Mailer);
+        }
+        if (25 != $this->Mail->Port) {
+            $this->addChange('Port', $this->Mail->Port);
+        }
+        if ('localhost.localdomain' != $this->Mail->Helo) {
+            $this->addChange('Helo', $this->Mail->Helo);
+        }
+        if ($this->Mail->SMTPAuth) {
+            $this->addChange('SMTPAuth', 'true');
+        }
+    }
+
+    /**
+     * Add a changelog entry.
+     *
+     * @param string $sName
+     * @param string $sNewValue
+     */
+    private function addChange($sName, $sNewValue)
+    {
+        $this->ChangeLog[] = [$sName, $sNewValue];
+    }
+
+    /**
+     * Adds a simple note to the message.
+     *
+     * @param string $sValue
+     */
+    private function addNote($sValue)
+    {
+        $this->NoteLog[] = $sValue;
+    }
+
+    /**
+     * Adds all of the addresses.
+     *
+     * @param string $sAddress
+     * @param string $sName
+     * @param string $sType
+     *
+     * @return bool
+     */
+    private function setAddress($sAddress, $sName = '', $sType = 'to')
+    {
+        switch ($sType) {
+            case 'to':
+                return $this->Mail->addAddress($sAddress, $sName);
+            case 'cc':
+                return $this->Mail->addCC($sAddress, $sName);
+            case 'bcc':
+                return $this->Mail->addBCC($sAddress, $sName);
+        }
+
+        return false;
+    }
+
+    /**
+     * Check that we have loaded default test params.
+     * Pretty much everything will fail due to unset recipient if this is not done.
+     */
+    public function testBootstrap()
+    {
+        $this->assertFileExists(
+            $this->INCLUDE_DIR . '/test/testbootstrap.php',
+            'Test config params missing - copy testbootstrap.php to testbootstrap-dist.php and change as appropriate'
+        );
+    }
+
+    /**
+     * Test CRAM-MD5 authentication.
+     * Needs a connection to a server that supports this auth mechanism, so commented out by default.
+     */
+    public function testAuthCRAMMD5()
+    {
+        $this->Mail->Host = 'hostname';
+        $this->Mail->Port = 587;
+        $this->Mail->SMTPAuth = true;
+        $this->Mail->SMTPSecure = 'tls';
+        $this->Mail->AuthType = 'CRAM-MD5';
+        $this->Mail->Username = 'username';
+        $this->Mail->Password = 'password';
+        $this->Mail->Body = 'Test body';
+        $this->Mail->Subject .= ': Auth CRAM-MD5';
+        $this->Mail->From = 'from at example.com';
+        $this->Mail->Sender = 'from at example.com';
+        $this->Mail->clearAllRecipients();
+        $this->Mail->addAddress('user at example.com');
+        //$this->assertTrue($this->mail->send(), $this->mail->ErrorInfo);
+    }
+
+    /**
+     * Test email address validation.
+     * Test addresses obtained from http://isemail.info
+     * Some failing cases commented out that are apparently up for debate!
+     */
+    public function testValidate()
+    {
+        $validaddresses = [
+            'first at example.org',
+            'first.last at example.org',
+            '1234567890123456789012345678901234567890123456789012345678901234 at example.org',
+            '"first\"last"@example.org',
+            '"first at last"@example.org',
+            '"first\last"@example.org',
+            'first.last@[12.34.56.78]',
+            'first.last at x23456789012345678901234567890123456789012345678901234567890123.example.org',
+            'first.last at 123.example.org',
+            '"first\last"@example.org',
+            '"Abc\@def"@example.org',
+            '"Fred\ Bloggs"@example.org',
+            '"Joe.\Blow"@example.org',
+            '"Abc at def"@example.org',
+            'user+mailbox at example.org',
+            'customer/department=shipping at example.org',
+            '$A12345 at example.org',
+            '!def!xyz%abc at example.org',
+            '_somename at example.org',
+            'dclo at us.example.com',
+            'peter.piper at example.org',
+            'test at example.org',
+            'TEST at example.org',
+            '1234567890 at example.org',
+            'test+test at example.org',
+            'test-test at example.org',
+            't*est at example.org',
+            '+1~1+ at example.org',
+            '{_test_}@example.org',
+            'test.test at example.org',
+            '"test.test"@example.org',
+            'test."test"@example.org',
+            '"test at test"@example.org',
+            'test at 123.123.123.x123',
+            'test@[123.123.123.123]',
+            'test at example.example.org',
+            'test at example.example.example.org',
+            '"test\test"@example.org',
+            '"test\blah"@example.org',
+            '"test\blah"@example.org',
+            '"test\"blah"@example.org',
+            'customer/department at example.org',
+            '_Yosemite.Sam at example.org',
+            '~@example.org',
+            '"Austin at Powers"@example.org',
+            'Ima.Fool at example.org',
+            '"Ima.Fool"@example.org',
+            '"first"."last"@example.org',
+            '"first".middle."last"@example.org',
+            '"first".last at example.org',
+            'first."last"@example.org',
+            '"first"."middle"."last"@example.org',
+            '"first.middle"."last"@example.org',
+            '"first.middle.last"@example.org',
+            '"first..last"@example.org',
+            '"first\"last"@example.org',
+            'first."mid\dle"."last"@example.org',
+            'name.lastname at example.com',
+            'a at example.com',
+            'aaa@[123.123.123.123]',
+            'a-b at example.com',
+            '+ at b.c',
+            '+ at b.com',
+            'a at b.co-foo.uk',
+            'valid at about.museum',
+            'shaitan at my-domain.thisisminekthx',
+            '"Joe\Blow"@example.org',
+            'user%uucp!path at example.edu',
+            'cdburgess+!#$%&\'*-/=?+_{}|~test at example.com',
+            'test at test.com',
+            'test at xn--example.com',
+            'test at example.com',
+        ];
+        //These are invalid according to PHP's filter_var
+        //which doesn't allow dotless domains, numeric TLDs or unbracketed IPv4 literals
+        $invalidphp = [
+            'a at b',
+            'a at bar',
+            'first.last at com',
+            'test at 123.123.123.123',
+            'foobar at 192.168.0.1',
+            'first.last at example.123',
+        ];
+        //Valid RFC 5322 addresses using quoting and comments
+        //Note that these are *not* all valid for RFC5321
+        $validqandc = [
+            'HM2Kinsists@(that comments are allowed)this.is.ok',
+            '"Doug \"Ace\" L."@example.org',
+            '"[[ test ]]"@example.org',
+            '"Ima Fool"@example.org',
+            '"test blah"@example.org',
+            '(foo)cal(bar)@(baz)example.com(quux)',
+            'cal at example(woo).(yay)com',
+            'cal(woo(yay)hoopla)@example.com',
+            'cal(foo\@bar)@example.com',
+            'cal(foo\)bar)@example.com',
+            'first().last at example.org',
+            'pete(his account)@silly.test(his host)',
+            'c@(Chris\'s host.)public.example',
+            'jdoe at machine(comment). example',
+            '1234 @ local(blah) .machine .example',
+            'first(abc.def).last at example.org',
+            'first(a"bc.def).last at example.org',
+            'first.(")middle.last(")@example.org',
+            'first(abc\(def)@example.org',
+            'first.last at x(1234567890123456789012345678901234567890123456789012345678901234567890).com',
+            'a(a(b(c)d(e(f))g)h(i)j)@example.org',
+            '"hello my name is"@example.com',
+            '"Test \"Fail\" Ing"@example.org',
+            'first.last @example.org',
+        ];
+        //Valid explicit IPv6 numeric addresses
+        $validipv6 = [
+            'first.last@[IPv6:::a2:a3:a4:b1:b2:b3:b4]',
+            'first.last@[IPv6:a1:a2:a3:a4:b1:b2:b3::]',
+            'first.last@[IPv6:::]',
+            'first.last@[IPv6:::b4]',
+            'first.last@[IPv6:::b3:b4]',
+            'first.last@[IPv6:a1::b4]',
+            'first.last@[IPv6:a1::]',
+            'first.last@[IPv6:a1:a2::]',
+            'first.last@[IPv6:0123:4567:89ab:cdef::]',
+            'first.last@[IPv6:0123:4567:89ab:CDEF::]',
+            'first.last@[IPv6:::a3:a4:b1:ffff:11.22.33.44]',
+            'first.last@[IPv6:::a2:a3:a4:b1:ffff:11.22.33.44]',
+            'first.last@[IPv6:a1:a2:a3:a4::11.22.33.44]',
+            'first.last@[IPv6:a1:a2:a3:a4:b1::11.22.33.44]',
+            'first.last@[IPv6:a1::11.22.33.44]',
+            'first.last@[IPv6:a1:a2::11.22.33.44]',
+            'first.last@[IPv6:0123:4567:89ab:cdef::11.22.33.44]',
+            'first.last@[IPv6:0123:4567:89ab:CDEF::11.22.33.44]',
+            'first.last@[IPv6:a1::b2:11.22.33.44]',
+            'first.last@[IPv6:::12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333::4444:12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:12.34.56.78]',
+            'first.last@[IPv6:::1111:2222:3333:4444:5555:6666]',
+            'first.last@[IPv6:1111:2222:3333::4444:5555:6666]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666::]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:7777:8888]',
+            'first.last@[IPv6:1111:2222:3333::4444:5555:12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333::4444:5555:6666:7777]',
+        ];
+        $invalidaddresses = [
+            'first.last at sub.do,com',
+            'first\@last at iana.org',
+            '123456789012345678901234567890123456789012345678901234567890' .
+            '@12345678901234567890123456789012345678901234 [...]',
+            'first.last',
+            '12345678901234567890123456789012345678901234567890123456789012345 at iana.org',
+            '.first.last at iana.org',
+            'first.last. at iana.org',
+            'first..last at iana.org',
+            '"first"last"@iana.org',
+            '"""@iana.org',
+            '"\"@iana.org',
+            //'""@iana.org',
+            'first\@last at iana.org',
+            'first.last@',
+            'x at x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.x23456789.' .
+            'x23456789.x23456789.x23456789.x23 [...]',
+            'first.last@[.12.34.56.78]',
+            'first.last@[12.34.56.789]',
+            'first.last@[::12.34.56.78]',
+            'first.last@[IPv5:::12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:7777:12.34.56.78]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:7777]',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:7777:8888:9999]',
+            'first.last@[IPv6:1111:2222::3333::4444:5555:6666]',
+            'first.last@[IPv6:1111:2222:333x::4444:5555]',
+            'first.last@[IPv6:1111:2222:33333::4444:5555]',
+            'first.last at -xample.com',
+            'first.last at exampl-.com',
+            'first.last at x234567890123456789012345678901234567890123456789012345678901234.iana.org',
+            'abc\@def at iana.org',
+            'abc\@iana.org',
+            'Doug\ \"Ace\"\ Lovell at iana.org',
+            'abc at def@iana.org',
+            'abc\@def at iana.org',
+            'abc\@iana.org',
+            '@iana.org',
+            'doug@',
+            '"qu at iana.org',
+            'ote"@iana.org',
+            '.dot at iana.org',
+            'dot. at iana.org',
+            'two..dot at iana.org',
+            '"Doug "Ace" L."@iana.org',
+            'Doug\ \"Ace\"\ L\. at iana.org',
+            'hello world at iana.org',
+            //'helloworld at iana .org',
+            'gatsby at f.sc.ot.t.f.i.tzg.era.l.d.',
+            'test.iana.org',
+            'test. at iana.org',
+            'test..test at iana.org',
+            '.test at iana.org',
+            'test at test@iana.org',
+            'test@@iana.org',
+            '-- test -- at iana.org',
+            '[test]@iana.org',
+            '"test"test"@iana.org',
+            '()[]\;:,><@iana.org',
+            'test at .',
+            'test at example.',
+            'test at .org',
+            'test at 12345678901234567890123456789012345678901234567890123456789012345678901234567890' .
+            '12345678901234567890 [...]',
+            'test@[123.123.123.123',
+            'test at 123.123.123.123]',
+            'NotAnEmail',
+            '@NotAnEmail',
+            '"test"blah"@iana.org',
+            '.wooly at iana.org',
+            'wo..oly at iana.org',
+            'pootietang. at iana.org',
+            '. at iana.org',
+            'Ima Fool at iana.org',
+            'phil.h\@\@ck at haacked.com',
+            'foo@[\1.2.3.4]',
+            //'first."".last at iana.org',
+            'first\last at iana.org',
+            'Abc\@def at iana.org',
+            'Fred\ Bloggs at iana.org',
+            'Joe.\Blow at iana.org',
+            'first.last@[IPv6:1111:2222:3333:4444:5555:6666:12.34.567.89]',
+            '{^c\@**Dog^}@cartoon.com',
+            //'"foo"(yay)@(hoopla)[1.2.3.4]',
+            'cal(foo(bar)@iamcal.com',
+            'cal(foo)bar)@iamcal.com',
+            'cal(foo\)@iamcal.com',
+            'first(12345678901234567890123456789012345678901234567890)last@(1234567890123456789' .
+            '01234567890123456789012 [...]',
+            'first(middle)last at iana.org',
+            'first(abc("def".ghi).mno)middle(abc("def".ghi).mno).last@(abc("def".ghi).mno)example' .
+            '(abc("def".ghi).mno). [...]',
+            'a(a(b(c)d(e(f))g)(h(i)j)@iana.org',
+            '.@',
+            '@bar.com',
+            '@@bar.com',
+            'aaa.com',
+            'aaa at .com',
+            'aaa at .123',
+            'aaa@[123.123.123.123]a',
+            'aaa@[123.123.123.333]',
+            'a at bar.com.',
+            'a at -b.com',
+            'a at b-.com',
+            '- at ..com',
+            '- at a..com',
+            'invalid at about.museum-',
+            'test at ...........com',
+            '"Unicode NULL' . chr(0) . '"@char.com',
+            'Unicode NULL' . chr(0) . '@char.com',
+            'first.last@[IPv6::]',
+            'first.last@[IPv6::::]',
+            'first.last@[IPv6::b4]',
+            'first.last@[IPv6::::b4]',
+            'first.last@[IPv6::b3:b4]',
+            'first.last@[IPv6::::b3:b4]',
+            'first.last@[IPv6:a1:::b4]',
+            'first.last@[IPv6:a1:]',
+            'first.last@[IPv6:a1:::]',
+            'first.last@[IPv6:a1:a2:]',
+            'first.last@[IPv6:a1:a2:::]',
+            'first.last@[IPv6::11.22.33.44]',
+            'first.last@[IPv6::::11.22.33.44]',
+            'first.last@[IPv6:a1:11.22.33.44]',
+            'first.last@[IPv6:a1:::11.22.33.44]',
+            'first.last@[IPv6:a1:a2:::11.22.33.44]',
+            'first.last@[IPv6:0123:4567:89ab:cdef::11.22.33.xx]',
+            'first.last@[IPv6:0123:4567:89ab:CDEFF::11.22.33.44]',
+            'first.last@[IPv6:a1::a4:b1::b4:11.22.33.44]',
+            'first.last@[IPv6:a1::11.22.33]',
+            'first.last@[IPv6:a1::11.22.33.44.55]',
+            'first.last@[IPv6:a1::b211.22.33.44]',
+            'first.last@[IPv6:a1::b2::11.22.33.44]',
+            'first.last@[IPv6:a1::b3:]',
+            'first.last@[IPv6::a2::b4]',
+            'first.last@[IPv6:a1:a2:a3:a4:b1:b2:b3:]',
+            'first.last@[IPv6::a2:a3:a4:b1:b2:b3:b4]',
+            'first.last@[IPv6:a1:a2:a3:a4::b1:b2:b3:b4]',
+            //This is a valid RFC5322 address, but we don't want to allow it for obvious reasons!
+            "(\r\n RCPT TO:user at example.com\r\n DATA \\\nSubject: spam10\\\n\r\n Hello," .
+            "\r\n this is a spam mail.\\\n.\r\n QUIT\r\n ) a at example.net",
+        ];
+        // IDNs in Unicode and ASCII forms.
+        $unicodeaddresses = [
+            'first.last at bücher.ch',
+            'first.last@кто.рф',
+            'first.last at phplíst.com',
+        ];
+        $asciiaddresses = [
+            'first.last at xn--bcher-kva.ch',
+            'first.last at xn--j1ail.xn--p1ai',
+            'first.last at xn--phplst-6va.com',
+        ];
+        $goodfails = [];
+        foreach (array_merge($validaddresses, $asciiaddresses) as $address) {
+            if (!PHPMailer::validateAddress($address)) {
+                $goodfails[] = $address;
+            }
+        }
+        $badpasses = [];
+        foreach (array_merge($invalidaddresses, $unicodeaddresses) as $address) {
+            if (PHPMailer::validateAddress($address)) {
+                $badpasses[] = $address;
+            }
+        }
+        $err = '';
+        if (count($goodfails) > 0) {
+            $err .= "Good addresses that failed validation:\n";
+            $err .= implode("\n", $goodfails);
+        }
+        if (count($badpasses) > 0) {
+            if (!empty($err)) {
+                $err .= "\n\n";
+            }
+            $err .= "Bad addresses that passed validation:\n";
+            $err .= implode("\n", $badpasses);
+        }
+        $this->assertEmpty($err, $err);
+        //For coverage
+        $this->assertTrue(PHPMailer::validateAddress('test at example.com', 'auto'));
+        $this->assertFalse(PHPMailer::validateAddress('test at example.com.', 'auto'));
+        $this->assertTrue(PHPMailer::validateAddress('test at example.com', 'pcre'));
+        $this->assertFalse(PHPMailer::validateAddress('test at example.com.', 'pcre'));
+        $this->assertTrue(PHPMailer::validateAddress('test at example.com', 'pcre8'));
+        $this->assertFalse(PHPMailer::validateAddress('test at example.com.', 'pcre8'));
+        $this->assertTrue(PHPMailer::validateAddress('test at example.com', 'php'));
+        $this->assertFalse(PHPMailer::validateAddress('test at example.com.', 'php'));
+        $this->assertTrue(PHPMailer::validateAddress('test at example.com', 'noregex'));
+        $this->assertFalse(PHPMailer::validateAddress('bad', 'noregex'));
+    }
+
+    /**
+     * Test injecting a custom validator.
+     */
+    public function testCustomValidator()
+    {
+        //Inject a one-off custom validator
+        $this->assertTrue(
+            PHPMailer::validateAddress(
+                'user at example.com',
+                function ($address) {
+                    return strpos($address, '@') !== false;
+                }
+            ),
+            'Custom validator false negative'
+        );
+        $this->assertFalse(
+            PHPMailer::validateAddress(
+                'userexample.com',
+                function ($address) {
+                    return strpos($address, '@') !== false;
+                }
+            ),
+            'Custom validator false positive'
+        );
+        //Set the default validator to an injected function
+        PHPMailer::$validator = function ($address) {
+            return 'user at example.com' === $address;
+        };
+        $this->assertTrue(
+            $this->Mail->addAddress('user at example.com'),
+            'Custom default validator false negative'
+        );
+        $this->assertFalse(
+        //Need to pick a failing value which would pass all other validators
+        //to be sure we're using our custom one
+            $this->Mail->addAddress('bananas at example.com'),
+            'Custom default validator false positive'
+        );
+        //Set default validator to PHP built-in
+        PHPMailer::$validator = 'php';
+        $this->assertFalse(
+        //This is a valid address that FILTER_VALIDATE_EMAIL thinks is invalid
+            $this->Mail->addAddress('first.last at example.123'),
+            'PHP validator not behaving as expected'
+        );
+    }
+
+    /**
+     * Word-wrap an ASCII message.
+     */
+    public function testWordWrap()
+    {
+        $this->Mail->WordWrap = 40;
+        $my_body = str_repeat(
+            'Here is the main body of this message.  It should ' .
+            'be quite a few lines.  It should be wrapped at ' .
+            '40 characters.  Make sure that it is. ',
+            10
+        );
+        $nBodyLen = strlen($my_body);
+        $my_body .= "\n\nThis is the above body length: " . $nBodyLen;
+
+        $this->Mail->Body = $my_body;
+        $this->Mail->Subject .= ': Wordwrap';
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Word-wrap a multibyte message.
+     */
+    public function testWordWrapMultibyte()
+    {
+        $this->Mail->WordWrap = 40;
+        $my_body = str_repeat(
+            '飛兒樂 團光茫 飛兒樂 團光茫 飛兒樂 團光茫 飛兒樂 團光茫 ' .
+            '飛飛兒樂 團光茫兒樂 團光茫飛兒樂 團光飛兒樂 團光茫飛兒樂 團光茫兒樂 團光茫 ' .
+            '飛兒樂 團光茫飛兒樂 團飛兒樂 團光茫光茫飛兒樂 團光茫. ',
+            10
+        );
+        $nBodyLen = strlen($my_body);
+        $my_body .= "\n\nThis is the above body length: " . $nBodyLen;
+
+        $this->Mail->Body = $my_body;
+        $this->Mail->Subject .= ': Wordwrap multibyte';
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test low priority.
+     */
+    public function testLowPriority()
+    {
+        $this->Mail->Priority = 5;
+        $this->Mail->Body = 'Here is the main body.  There should be ' .
+            'a reply to address in this message.';
+        $this->Mail->Subject .= ': Low Priority';
+        $this->Mail->addReplyTo('nobody at nobody.com', 'Nobody (Unit Test)');
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Simple plain file attachment test.
+     */
+    public function testMultiplePlainFileAttachment()
+    {
+        $this->Mail->Body = 'Here is the text body';
+        $this->Mail->Subject .= ': Plain + Multiple FileAttachments';
+
+        if (!$this->Mail->addAttachment(realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'))) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        if (!$this->Mail->addAttachment(__FILE__, 'test.txt')) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Simple plain string attachment test.
+     */
+    public function testPlainStringAttachment()
+    {
+        $this->Mail->Body = 'Here is the text body';
+        $this->Mail->Subject .= ': Plain + StringAttachment';
+
+        $sAttachment = 'These characters are the content of the ' .
+            "string attachment.\nThis might be taken from a " .
+            'database or some other such thing. ';
+
+        $this->Mail->addStringAttachment($sAttachment, 'string_attach.txt');
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Plain quoted-printable message.
+     */
+    public function testQuotedPrintable()
+    {
+        $this->Mail->Body = 'Here is the main body';
+        $this->Mail->Subject .= ': Plain + Quoted-printable';
+        $this->Mail->Encoding = 'quoted-printable';
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        //Check that a quoted printable encode and decode results in the same as went in
+        $t = file_get_contents(__FILE__); //Use this file as test content
+        //Force line breaks to UNIX-style
+        $t = str_replace(["\r\n", "\r"], "\n", $t);
+        $this->assertEquals(
+            $t,
+            quoted_printable_decode($this->Mail->encodeQP($t)),
+            'Quoted-Printable encoding round-trip failed'
+        );
+        //Force line breaks to Windows-style
+        $t = str_replace("\n", "\r\n", $t);
+        $this->assertEquals(
+            $t,
+            quoted_printable_decode($this->Mail->encodeQP($t)),
+            'Quoted-Printable encoding round-trip failed (Windows line breaks)'
+        );
+    }
+
+    /**
+     * Test header encoding & folding.
+     */
+    public function testHeaderEncoding()
+    {
+        $this->Mail->CharSet = 'UTF-8';
+        //This should select B-encoding automatically and should fold
+        $bencode = str_repeat('é', PHPMailer::STD_LINE_LENGTH + 1);
+        //This should select Q-encoding automatically and should fold
+        $qencode = str_repeat('e', PHPMailer::STD_LINE_LENGTH) . 'é';
+        //This should select B-encoding automatically and should not fold
+        $bencodenofold = str_repeat('é', 10);
+        //This should select Q-encoding automatically and should not fold
+        $qencodenofold = str_repeat('e', 9) . 'é';
+        //This should not encode, but just fold automatically
+        $justfold = str_repeat('e', PHPMailer::STD_LINE_LENGTH + 10);
+        //This should not change
+        $noencode = 'eeeeeeeeee';
+        $this->Mail->isMail();
+        //Expected results
+
+        $bencoderes = '=?UTF-8?B?w6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6k=?=' .
+            PHPMailer::getLE() .
+            ' =?UTF-8?B?w6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6k=?=' .
+            PHPMailer::getLE() .
+            ' =?UTF-8?B?w6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6nDqcOpw6k=?=' .
+            PHPMailer::getLE() .
+            ' =?UTF-8?B?w6nDqcOpw6nDqcOpw6nDqcOpw6nDqQ==?=';
+        $qencoderes = '=?UTF-8?Q?eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee?=' .
+            PHPMailer::getLE() .
+            ' =?UTF-8?Q?eeeeeeeeeeeeeeeeeeeeeeeeee=C3=A9?=';
+        $bencodenofoldres = '=?UTF-8?B?w6nDqcOpw6nDqcOpw6nDqcOpw6k=?=';
+        $qencodenofoldres = '=?UTF-8?Q?eeeeeeeee=C3=A9?=';
+        $justfoldres = 'eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' .
+            PHPMailer::getLE() . ' eeeeeeeeee';
+        $noencoderes = 'eeeeeeeeee';
+        $this->assertEquals(
+            $bencoderes,
+            $this->Mail->encodeHeader($bencode),
+            'Folded B-encoded header value incorrect'
+        );
+        $this->assertEquals(
+            $qencoderes,
+            $this->Mail->encodeHeader($qencode),
+            'Folded Q-encoded header value incorrect'
+        );
+        $this->assertEquals(
+            $bencodenofoldres,
+            $this->Mail->encodeHeader($bencodenofold),
+            'B-encoded header value incorrect'
+        );
+        $this->assertEquals(
+            $qencodenofoldres,
+            $this->Mail->encodeHeader($qencodenofold),
+            'Q-encoded header value incorrect'
+        );
+        $this->assertEquals(
+            $justfoldres,
+            $this->Mail->encodeHeader($justfold),
+            'Folded header value incorrect'
+        );
+        $this->assertEquals(
+            $noencoderes,
+            $this->Mail->encodeHeader($noencode),
+            'Unencoded header value incorrect'
+        );
+    }
+
+    /**
+     * Send an HTML message.
+     */
+    public function testHtml()
+    {
+        $this->Mail->isHTML(true);
+        $this->Mail->Subject .= ': HTML only';
+
+        $this->Mail->Body = <<<'EOT'
+<html>
+    <head>
+        <title>HTML email test</title>
+    </head>
+    <body>
+        <h1>PHPMailer does HTML!</h1>
+        <p>This is a <strong>test message</strong> written in HTML.<br>
+        Go to <a href="https://github.com/PHPMailer/PHPMailer/">https://github.com/PHPMailer/PHPMailer/</a>
+        for new versions of PHPMailer.</p>
+        <p>Thank you!</p>
+    </body>
+</html>
+EOT;
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $msg = $this->Mail->getSentMIMEMessage();
+        $this->assertNotContains("\r\n\r\nMIME-Version:", $msg, 'Incorrect MIME headers');
+    }
+
+    /**
+     * Send a message containing ISO-8859-1 text.
+     */
+    public function testHtmlIso8859()
+    {
+        $this->Mail->isHTML(true);
+        $this->Mail->Subject .= ': ISO-8859-1 HTML';
+        $this->Mail->CharSet = 'iso-8859-1';
+
+        //This file is in ISO-8859-1 charset
+        //Needs to be external because this file is in UTF-8
+        $content = file_get_contents(realpath($this->INCLUDE_DIR . '/examples/contents.html'));
+        // This is the string 'éèîüçÅñæß' in ISO-8859-1, base-64 encoded
+        $check = base64_decode('6eju/OfF8ebf');
+        //Make sure it really is in ISO-8859-1!
+        $this->Mail->msgHTML(
+            mb_convert_encoding(
+                $content,
+                'ISO-8859-1',
+                mb_detect_encoding($content, 'UTF-8, ISO-8859-1, ISO-8859-15', true)
+            ),
+            realpath($this->INCLUDE_DIR . '/examples')
+        );
+        $this->buildBody();
+        $this->assertTrue(
+            strpos($this->Mail->Body, $check) !== false,
+            'ISO message body does not contain expected text'
+        );
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Send a message containing multilingual UTF-8 text.
+     */
+    public function testHtmlUtf8()
+    {
+        $this->Mail->isHTML(true);
+        $this->Mail->Subject .= ': UTF-8 HTML Пустое тело сообщения';
+        $this->Mail->CharSet = 'UTF-8';
+
+        $this->Mail->Body = <<<'EOT'
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <title>HTML email test</title>
+    </head>
+    <body>
+        <p>Chinese text: 郵件內容為空</p>
+        <p>Russian text: Пустое тело сообщения</p>
+        <p>Armenian text: Հաղորդագրությունը դատարկ է</p>
+        <p>Czech text: Prázdné tělo zprávy</p>
+    </body>
+</html>
+EOT;
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $msg = $this->Mail->getSentMIMEMessage();
+        $this->assertNotContains("\r\n\r\nMIME-Version:", $msg, 'Incorrect MIME headers');
+    }
+
+    /**
+     * Send a message containing multilingual UTF-8 text with an embedded image.
+     */
+    public function testUtf8WithEmbeddedImage()
+    {
+        $this->Mail->isHTML(true);
+        $this->Mail->Subject .= ': UTF-8 with embedded image';
+        $this->Mail->CharSet = 'UTF-8';
+
+        $this->Mail->Body = <<<'EOT'
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <title>HTML email test</title>
+    </head>
+    <body>
+        <p>Chinese text: 郵件內容為空</p>
+        <p>Russian text: Пустое тело сообщения</p>
+        <p>Armenian text: Հաղորդագրությունը դատարկ է</p>
+        <p>Czech text: Prázdné tělo zprávy</p>
+        Embedded Image: <img alt="phpmailer" src="cid:my-attach">
+    </body>
+</html>
+EOT;
+        $this->Mail->addEmbeddedImage(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'),
+            'my-attach',
+            'phpmailer.png',
+            'base64',
+            'image/png'
+        );
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Send a message containing multilingual UTF-8 text.
+     */
+    public function testPlainUtf8()
+    {
+        $this->Mail->isHTML(false);
+        $this->Mail->Subject .= ': UTF-8 plain text';
+        $this->Mail->CharSet = 'UTF-8';
+
+        $this->Mail->Body = <<<'EOT'
+Chinese text: 郵件內容為空
+Russian text: Пустое тело сообщения
+Armenian text: Հաղորդագրությունը դատարկ է
+Czech text: Prázdné tělo zprávy
+EOT;
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $msg = $this->Mail->getSentMIMEMessage();
+        $this->assertNotContains("\r\n\r\nMIME-Version:", $msg, 'Incorrect MIME headers');
+    }
+
+    /**
+     * Test simple message builder and html2text converters.
+     */
+    public function testMsgHTML()
+    {
+        $message = file_get_contents(realpath($this->INCLUDE_DIR . '/examples/contentsutf8.html'));
+        $this->Mail->CharSet = 'utf-8';
+        $this->Mail->Body = '';
+        $this->Mail->AltBody = '';
+        //Uses internal HTML to text conversion
+        $this->Mail->msgHTML($message, realpath($this->INCLUDE_DIR . '/examples'));
+        $sub = $this->Mail->Subject . ': msgHTML';
+        $this->Mail->Subject .= $sub;
+
+        $this->assertNotEmpty($this->Mail->Body, 'Body not set by msgHTML');
+        $this->assertNotEmpty($this->Mail->AltBody, 'AltBody not set by msgHTML');
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        //Again, using a custom HTML to text converter
+        $this->Mail->AltBody = '';
+        $this->Mail->msgHTML(
+            $message,
+            realpath($this->INCLUDE_DIR . '/examples'),
+            function ($html) {
+                return strtoupper(strip_tags($html));
+            }
+        );
+        $this->Mail->Subject = $sub . ' + custom html2text';
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        //Test that local paths without a basedir are ignored
+        $this->Mail->msgHTML('<img src="/etc/hostname">test');
+        $this->assertTrue(strpos($this->Mail->Body, 'src="/etc/hostname"') !== false);
+        //Test that local paths with a basedir are not ignored
+        $this->Mail->msgHTML('<img src="composer.json">test', realpath($this->INCLUDE_DIR));
+        $this->assertTrue(strpos($this->Mail->Body, 'src="composer.json"') === false);
+        //Test that local paths with parent traversal are ignored
+        $this->Mail->msgHTML('<img src="../composer.json">test', realpath($this->INCLUDE_DIR));
+        $this->assertTrue(strpos($this->Mail->Body, 'src="composer.json"') === false);
+        //Test that existing embedded URLs are ignored
+        $this->Mail->msgHTML('<img src="cid:5d41402abc4b2a76b9719d911017c592">test');
+        $this->assertTrue(
+            strpos($this->Mail->Body, 'src="cid:5d41402abc4b2a76b9719d911017c592"') !== false
+        );
+        //Test that absolute URLs are ignored
+        $this->Mail->msgHTML('<img src="https://github.com/PHPMailer/PHPMailer/blob/master/composer.json">test');
+        $this->assertTrue(
+            strpos(
+                $this->Mail->Body,
+                'src="https://github.com/PHPMailer/PHPMailer/blob/master/composer.json"'
+            ) !== false
+        );
+        //Test that absolute URLs with anonymous/relative protocol are ignored
+        //Note that such URLs will not work in email anyway because they have no protocol to be relative to
+        $this->Mail->msgHTML('<img src="//github.com/PHPMailer/PHPMailer/blob/master/composer.json">test');
+        $this->assertTrue(
+            strpos(
+                $this->Mail->Body,
+                'src="//github.com/PHPMailer/PHPMailer/blob/master/composer.json"'
+            ) !== false
+        );
+    }
+
+    /**
+     * Simple HTML and attachment test.
+     */
+    public function testHTMLAttachment()
+    {
+        $this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
+        $this->Mail->Subject .= ': HTML + Attachment';
+        $this->Mail->isHTML(true);
+        $this->Mail->CharSet = 'UTF-8';
+
+        if (!$this->Mail->addAttachment(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer_mini.png'),
+            'phpmailer_mini.png'
+        )
+        ) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        //Make sure that trying to attach a nonexistent file fails
+        $this->assertFalse($this->Mail->addAttachment(__FILE__ . md5(microtime()), 'nonexistent_file.txt'));
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test embedded image without a name.
+     */
+    public function testHTMLStringEmbedNoName()
+    {
+        $this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
+        $this->Mail->Subject .= ': HTML + unnamed embedded image';
+        $this->Mail->isHTML(true);
+
+        if (!$this->Mail->addStringEmbeddedImage(
+            file_get_contents(realpath($this->INCLUDE_DIR . '/examples/images/phpmailer_mini.png')),
+            hash('sha256', 'phpmailer_mini.png') . '@phpmailer.0',
+            '', //Intentionally empty name
+            'base64',
+            '', //Intentionally empty MIME type
+            'inline'
+        )) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Simple HTML and multiple attachment test.
+     */
+    public function testHTMLMultiAttachment()
+    {
+        $this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
+        $this->Mail->Subject .= ': HTML + multiple Attachment';
+        $this->Mail->isHTML(true);
+
+        if (!$this->Mail->addAttachment(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer_mini.png'),
+            'phpmailer_mini.png'
+        )
+        ) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        if (!$this->Mail->addAttachment(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'),
+            'phpmailer.png'
+        )
+        ) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * An embedded attachment test.
+     */
+    public function testEmbeddedImage()
+    {
+        $this->Mail->Body = 'Embedded Image: <img alt="phpmailer" src="' .
+            'cid:my-attach">' .
+            'Here is an image!';
+        $this->Mail->Subject .= ': Embedded Image';
+        $this->Mail->isHTML(true);
+
+        if (!$this->Mail->addEmbeddedImage(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'),
+            'my-attach',
+            'phpmailer.png',
+            'base64',
+            'image/png'
+        )
+        ) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        //For code coverage
+        $this->Mail->addEmbeddedImage('thisfiledoesntexist', 'xyz'); //Non-existent file
+        $this->Mail->addEmbeddedImage(__FILE__, '123'); //Missing name
+    }
+
+    /**
+     * An embedded attachment test.
+     */
+    public function testMultiEmbeddedImage()
+    {
+        $this->Mail->Body = 'Embedded Image: <img alt="phpmailer" src="' .
+            'cid:my-attach">' .
+            'Here is an image!</a>';
+        $this->Mail->Subject .= ': Embedded Image + Attachment';
+        $this->Mail->isHTML(true);
+
+        if (!$this->Mail->addEmbeddedImage(
+            realpath($this->INCLUDE_DIR . '/examples/images/phpmailer.png'),
+            'my-attach',
+            'phpmailer.png',
+            'base64',
+            'image/png'
+        )
+        ) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        if (!$this->Mail->addAttachment(__FILE__, 'test.txt')) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Simple multipart/alternative test.
+     */
+    public function testAltBody()
+    {
+        $this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
+        $this->Mail->AltBody = 'Here is the plain text body of this message. ' .
+            'It should be quite a few lines. It should be wrapped at ' .
+            '40 characters.  Make sure that it is.';
+        $this->Mail->WordWrap = 40;
+        $this->addNote('This is a multipart/alternative email');
+        $this->Mail->Subject .= ': AltBody + Word Wrap';
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Simple HTML and attachment test.
+     */
+    public function testAltBodyAttachment()
+    {
+        $this->Mail->Body = 'This is the <strong>HTML</strong> part of the email.';
+        $this->Mail->AltBody = 'This is the text part of the email.';
+        $this->Mail->Subject .= ': AltBody + Attachment';
+        $this->Mail->isHTML(true);
+
+        if (!$this->Mail->addAttachment(__FILE__, 'test_attach.txt')) {
+            $this->assertTrue(false, $this->Mail->ErrorInfo);
+
+            return;
+        }
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test sending multiple messages with separate connections.
+     */
+    public function testMultipleSend()
+    {
+        $this->Mail->Body = 'Sending two messages without keepalive';
+        $this->buildBody();
+        $subject = $this->Mail->Subject;
+
+        $this->Mail->Subject = $subject . ': SMTP 1';
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        $this->Mail->Subject = $subject . ': SMTP 2';
+        $this->Mail->Sender = 'blah at example.com';
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test sending using SendMail.
+     */
+    public function testSendmailSend()
+    {
+        $this->Mail->Body = 'Sending via sendmail';
+        $this->buildBody();
+        $subject = $this->Mail->Subject;
+
+        $this->Mail->Subject = $subject . ': sendmail';
+        $this->Mail->isSendmail();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test sending using Qmail.
+     */
+    public function testQmailSend()
+    {
+        //Only run if we have qmail installed
+        if (file_exists('/var/qmail/bin/qmail-inject')) {
+            $this->Mail->Body = 'Sending via qmail';
+            $this->buildBody();
+            $subject = $this->Mail->Subject;
+
+            $this->Mail->Subject = $subject . ': qmail';
+            $this->Mail->isQmail();
+            $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        } else {
+            $this->markTestSkipped('Qmail is not installed');
+        }
+    }
+
+    /**
+     * Test sending using PHP mail() function.
+     */
+    public function testMailSend()
+    {
+        $sendmail = ini_get('sendmail_path');
+        //No path in sendmail_path
+        if (strpos($sendmail, '/') === false) {
+            ini_set('sendmail_path', '/usr/sbin/sendmail -t -i ');
+        }
+        $this->Mail->Body = 'Sending via mail()';
+        $this->buildBody();
+
+        $this->Mail->Subject = $this->Mail->Subject . ': mail()';
+        $this->Mail->isMail();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $msg = $this->Mail->getSentMIMEMessage();
+        $this->assertNotContains("\r\n\r\nMIME-Version:", $msg, 'Incorrect MIME headers');
+    }
+
+    /**
+     * Test sending an empty body.
+     */
+    public function testEmptyBody()
+    {
+        $this->buildBody();
+        $this->Mail->Body = '';
+        $this->Mail->Subject = $this->Mail->Subject . ': Empty Body';
+        $this->Mail->isMail();
+        $this->Mail->AllowEmpty = true;
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $this->Mail->AllowEmpty = false;
+        $this->assertFalse($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Test constructing a multipart message that contains lines that are too long for RFC compliance.
+     */
+    public function testLongBody()
+    {
+        $oklen = str_repeat(str_repeat('0', PHPMailer::MAX_LINE_LENGTH) . PHPMailer::getLE(), 2);
+        //Use +2 to ensure line length is over limit - LE may only be 1 char
+        $badlen = str_repeat(str_repeat('1', PHPMailer::MAX_LINE_LENGTH + 2) . PHPMailer::getLE(), 2);
+
+        $this->Mail->Body = 'This message contains lines that are too long.' .
+            PHPMailer::getLE() . $oklen . $badlen . $oklen;
+        $this->assertTrue(
+            PHPMailer::hasLineLongerThanMax($this->Mail->Body),
+            'Test content does not contain long lines!'
+        );
+        $this->Mail->isHTML();
+        $this->buildBody();
+        $this->Mail->AltBody = $this->Mail->Body;
+        $this->Mail->Encoding = '8bit';
+        $this->Mail->preSend();
+        $message = $this->Mail->getSentMIMEMessage();
+        $this->assertFalse(
+            PHPMailer::hasLineLongerThanMax($message),
+            'Long line not corrected (Max: ' . (PHPMailer::MAX_LINE_LENGTH + strlen(PHPMailer::getLE())) . ' chars)'
+        );
+        $this->assertContains(
+            'Content-Transfer-Encoding: quoted-printable',
+            $message,
+            'Long line did not cause transfer encoding switch.'
+        );
+    }
+
+    /**
+     * Test constructing a message that does NOT contain lines that are too long for RFC compliance.
+     */
+    public function testShortBody()
+    {
+        $oklen = str_repeat(str_repeat('0', PHPMailer::MAX_LINE_LENGTH) . PHPMailer::getLE(), 10);
+
+        $this->Mail->Body = 'This message does not contain lines that are too long.' .
+            PHPMailer::getLE() . $oklen;
+        $this->assertFalse(
+            PHPMailer::hasLineLongerThanMax($this->Mail->Body),
+            'Test content contains long lines!'
+        );
+        $this->buildBody();
+        $this->Mail->Encoding = '8bit';
+        $this->Mail->preSend();
+        $message = $this->Mail->getSentMIMEMessage();
+        $this->assertFalse(PHPMailer::hasLineLongerThanMax($message), 'Long line not corrected.');
+        $this->assertNotContains(
+            'Content-Transfer-Encoding: quoted-printable',
+            $message,
+            'Short line caused transfer encoding switch.'
+        );
+    }
+
+    /**
+     * Test keepalive (sending multiple messages in a single connection).
+     */
+    public function testSmtpKeepAlive()
+    {
+        $this->Mail->Body = 'SMTP keep-alive test.';
+        $this->buildBody();
+        $subject = $this->Mail->Subject;
+
+        $this->Mail->SMTPKeepAlive = true;
+        $this->Mail->Subject = $subject . ': SMTP keep-alive 1';
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        $this->Mail->Subject = $subject . ': SMTP keep-alive 2';
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $this->Mail->smtpClose();
+    }
+
+    /**
+     * Test this denial of service attack.
+     *
+     * @see http://www.cybsec.com/vuln/PHPMailer-DOS.pdf
+     */
+    public function testDenialOfServiceAttack()
+    {
+        $this->Mail->Body = 'This should no longer cause a denial of service.';
+        $this->buildBody();
+
+        $this->Mail->Subject = substr(str_repeat('0123456789', 100), 0, 998);
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+    }
+
+    /**
+     * Tests this denial of service attack.
+     *
+     * @see https://sourceforge.net/p/phpmailer/bugs/383/
+     * According to the ticket, this should get stuck in a loop, though I can't make it happen.
+     */
+    public function testDenialOfServiceAttack2()
+    {
+        //Encoding name longer than 68 chars
+        $this->Mail->Encoding = '1234567890123456789012345678901234567890123456789012345678901234567890';
+        //Call wrapText with a zero length value
+        $this->Mail->wrapText(str_repeat('This should no longer cause a denial of service. ', 30), 0);
+    }
+
+    /**
+     * Test error handling.
+     */
+    public function testError()
+    {
+        $this->Mail->Subject .= ': Error handling test - this should be sent ok';
+        $this->buildBody();
+        $this->Mail->clearAllRecipients(); // no addresses should cause an error
+        $this->assertTrue($this->Mail->isError() == false, 'Error found');
+        $this->assertTrue($this->Mail->send() == false, 'send succeeded');
+        $this->assertTrue($this->Mail->isError(), 'No error found');
+        $this->assertEquals('You must provide at least one recipient email address.', $this->Mail->ErrorInfo);
+        $this->Mail->addAddress($_REQUEST['mail_to']);
+        $this->assertTrue($this->Mail->send(), 'send failed');
+    }
+
+    /**
+     * Test addressing.
+     */
+    public function testAddressing()
+    {
+        $this->assertFalse($this->Mail->addAddress(''), 'Empty address accepted');
+        $this->assertFalse($this->Mail->addAddress('', 'Nobody'), 'Empty address with name accepted');
+        $this->assertFalse($this->Mail->addAddress('a at example..com'), 'Invalid address accepted');
+        $this->assertTrue($this->Mail->addAddress('a at example.com'), 'Addressing failed');
+        $this->assertFalse($this->Mail->addAddress('a at example.com'), 'Duplicate addressing failed');
+        $this->assertTrue($this->Mail->addCC('b at example.com'), 'CC addressing failed');
+        $this->assertFalse($this->Mail->addCC('b at example.com'), 'CC duplicate addressing failed');
+        $this->assertFalse($this->Mail->addCC('a at example.com'), 'CC duplicate addressing failed (2)');
+        $this->assertTrue($this->Mail->addBCC('c at example.com'), 'BCC addressing failed');
+        $this->assertFalse($this->Mail->addBCC('c at example.com'), 'BCC duplicate addressing failed');
+        $this->assertFalse($this->Mail->addBCC('a at example.com'), 'BCC duplicate addressing failed (2)');
+        $this->assertTrue($this->Mail->addReplyTo('a at example.com'), 'Replyto Addressing failed');
+        $this->assertFalse($this->Mail->addReplyTo('a at example..com'), 'Invalid Replyto address accepted');
+        $this->assertTrue($this->Mail->setFrom('a at example.com', 'some name'), 'setFrom failed');
+        $this->assertFalse($this->Mail->setFrom('a at example.com.', 'some name'), 'setFrom accepted invalid address');
+        $this->Mail->Sender = '';
+        $this->Mail->setFrom('a at example.com', 'some name', true);
+        $this->assertEquals($this->Mail->Sender, 'a at example.com', 'setFrom failed to set sender');
+        $this->Mail->Sender = '';
+        $this->Mail->setFrom('a at example.com', 'some name', false);
+        $this->assertEquals($this->Mail->Sender, '', 'setFrom should not have set sender');
+        $this->Mail->clearCCs();
+        $this->Mail->clearBCCs();
+        $this->Mail->clearReplyTos();
+    }
+
+    /**
+     * Test RFC822 address splitting.
+     */
+    public function testAddressSplitting()
+    {
+        //Test built-in address parser
+        $this->assertCount(
+            2,
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com>, Jill User <jill at example.net>'
+            ),
+            'Failed to recognise address list (IMAP parser)'
+        );
+        $this->assertEquals(
+            [
+                ['name' => 'Joe User', 'address' => 'joe at example.com'],
+                ['name' => 'Jill User', 'address' => 'jill at example.net'],
+                ['name' => '', 'address' => 'frank at example.com'],
+            ],
+            $this->Mail->parseAddresses(
+                'Joe User <joe at example.com>,'
+                . 'Jill User <jill at example.net>,'
+                . 'frank at example.com,'
+            ),
+            'Parsed addresses'
+        );
+        //Test simple address parser
+        $this->assertCount(
+            2,
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com>, Jill User <jill at example.net>',
+                false
+            ),
+            'Failed to recognise address list'
+        );
+        //Test single address
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com>',
+                false
+            ),
+            'Failed to recognise single address'
+        );
+        //Test quoted name IMAP
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'Tim "The Book" O\'Reilly <foo at example.com>'
+            ),
+            'Failed to recognise quoted name (IMAP)'
+        );
+        //Test quoted name
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'Tim "The Book" O\'Reilly <foo at example.com>',
+                false
+            ),
+            'Failed to recognise quoted name'
+        );
+        //Test single address IMAP
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com>'
+            ),
+            'Failed to recognise single address (IMAP)'
+        );
+        //Test unnamed address
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'joe at example.com',
+                false
+            ),
+            'Failed to recognise unnamed address'
+        );
+        //Test unnamed address IMAP
+        $this->assertNotEmpty(
+            PHPMailer::parseAddresses(
+                'joe at example.com'
+            ),
+            'Failed to recognise unnamed address (IMAP)'
+        );
+        //Test invalid addresses
+        $this->assertEmpty(
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com.>, Jill User <jill. at example.net>'
+            ),
+            'Failed to recognise invalid addresses (IMAP)'
+        );
+        //Test invalid addresses
+        $this->assertEmpty(
+            PHPMailer::parseAddresses(
+                'Joe User <joe at example.com.>, Jill User <jill. at example.net>',
+                false
+            ),
+            'Failed to recognise invalid addresses'
+        );
+    }
+
+    /**
+     * Test address escaping.
+     */
+    public function testAddressEscaping()
+    {
+        $this->Mail->Subject .= ': Address escaping';
+        $this->Mail->clearAddresses();
+        $this->Mail->addAddress('foo at example.com', 'Tim "The Book" O\'Reilly');
+        $this->Mail->Body = 'Test correct escaping of quotes in addresses.';
+        $this->buildBody();
+        $this->Mail->preSend();
+        $b = $this->Mail->getSentMIMEMessage();
+        $this->assertTrue((strpos($b, 'To: "Tim \"The Book\" O\'Reilly" <foo at example.com>') !== false));
+    }
+
+    /**
+     * Test MIME structure assembly.
+     */
+    public function testMIMEStructure()
+    {
+        $this->Mail->Subject .= ': MIME structure';
+        $this->Mail->Body = '<h3>MIME structure test.</h3>';
+        $this->Mail->AltBody = 'MIME structure test.';
+        $this->buildBody();
+        $this->Mail->preSend();
+        $this->assertRegExp(
+            "/Content-Transfer-Encoding: 8bit\r\n\r\n" .
+            'This is a multi-part message in MIME format./',
+            $this->Mail->getSentMIMEMessage(),
+            'MIME structure broken'
+        );
+    }
+
+    /**
+     * Test BCC-only addressing.
+     */
+    public function testBCCAddressing()
+    {
+        $this->Mail->Subject .= ': BCC-only addressing';
+        $this->buildBody();
+        $this->Mail->clearAllRecipients();
+        $this->assertTrue($this->Mail->addBCC('a at example.com'), 'BCC addressing failed');
+        $this->assertTrue($this->Mail->send(), 'send failed');
+    }
+
+    /**
+     * Encoding and charset tests.
+     */
+    public function testEncodings()
+    {
+        $this->Mail->CharSet = 'iso-8859-1';
+        $this->assertEquals(
+            '=A1Hola!_Se=F1or!',
+            $this->Mail->encodeQ("\xa1Hola! Se\xf1or!", 'text'),
+            'Q Encoding (text) failed'
+        );
+        $this->assertEquals(
+            '=A1Hola!_Se=F1or!',
+            $this->Mail->encodeQ("\xa1Hola! Se\xf1or!", 'comment'),
+            'Q Encoding (comment) failed'
+        );
+        $this->assertEquals(
+            '=A1Hola!_Se=F1or!',
+            $this->Mail->encodeQ("\xa1Hola! Se\xf1or!", 'phrase'),
+            'Q Encoding (phrase) failed'
+        );
+        $this->Mail->CharSet = 'UTF-8';
+        $this->assertEquals(
+            '=C2=A1Hola!_Se=C3=B1or!',
+            $this->Mail->encodeQ("\xc2\xa1Hola! Se\xc3\xb1or!", 'text'),
+            'Q Encoding (text) failed'
+        );
+        //Strings containing '=' are a special case
+        $this->assertEquals(
+            'Nov=C3=A1=3D',
+            $this->Mail->encodeQ("Nov\xc3\xa1=", 'text'),
+            'Q Encoding (text) failed 2'
+        );
+
+        $this->assertEquals($this->Mail->encodeString('hello', 'binary'), 'hello', 'Binary encoding changed input');
+        $this->Mail->ErrorInfo = '';
+        $this->Mail->encodeString('hello', 'asdfghjkl');
+        $this->assertNotEmpty($this->Mail->ErrorInfo, 'Invalid encoding not detected');
+    }
+
+    /**
+     * Test base-64 encoding.
+     */
+    public function testBase64()
+    {
+        $this->Mail->Subject .= ': Base-64 encoding';
+        $this->Mail->Encoding = 'base64';
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), 'Base64 encoding failed');
+    }
+
+    /**
+     * S/MIME Signing tests (self-signed).
+     *
+     * @requires extension openssl
+     */
+    public function testSigning()
+    {
+        $this->Mail->Subject .= ': S/MIME signing';
+        $this->Mail->Body = 'This message is S/MIME signed.';
+        $this->buildBody();
+
+        $dn = [
+            'countryName' => 'UK',
+            'stateOrProvinceName' => 'Here',
+            'localityName' => 'There',
+            'organizationName' => 'PHP',
+            'organizationalUnitName' => 'PHPMailer',
+            'commonName' => 'PHPMailer Test',
+            'emailAddress' => 'phpmailer at example.com',
+        ];
+        $keyconfig = [
+            'digest_alg' => 'sha256',
+            'private_key_bits' => 2048,
+            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+        ];
+        $password = 'password';
+        $certfile = 'certfile.pem';
+        $keyfile = 'keyfile.pem';
+
+        //Make a new key pair
+        $pk = openssl_pkey_new($keyconfig);
+        //Create a certificate signing request
+        $csr = openssl_csr_new($dn, $pk);
+        //Create a self-signed cert
+        $cert = openssl_csr_sign($csr, null, $pk, 1);
+        //Save the cert
+        openssl_x509_export($cert, $certout);
+        file_put_contents($certfile, $certout);
+        //Save the key
+        openssl_pkey_export($pk, $pkeyout, $password);
+        file_put_contents($keyfile, $pkeyout);
+
+        $this->Mail->sign(
+            $certfile,
+            $keyfile,
+            $password
+        );
+        $this->assertTrue($this->Mail->send(), 'S/MIME signing failed');
+
+        $msg = $this->Mail->getSentMIMEMessage();
+        $this->assertNotContains("\r\n\r\nMIME-Version:", $msg, 'Incorrect MIME headers');
+        unlink($certfile);
+        unlink($keyfile);
+    }
+
+    /**
+     * S/MIME Signing tests using a CA chain cert.
+     * To test that a generated message is signed correctly, save the message in a file called `signed.eml`
+     * and use openssl along with the certs generated by this script:
+     * `openssl smime -verify -in signed.eml -signer certfile.pem -CAfile cacertfile.pem`.
+     *
+     * @requires extension openssl
+     */
+    public function testSigningWithCA()
+    {
+        $this->Mail->Subject .= ': S/MIME signing with CA';
+        $this->Mail->Body = 'This message is S/MIME signed with an extra CA cert.';
+        $this->buildBody();
+
+        $certprops = [
+            'countryName' => 'UK',
+            'stateOrProvinceName' => 'Here',
+            'localityName' => 'There',
+            'organizationName' => 'PHP',
+            'organizationalUnitName' => 'PHPMailer',
+            'commonName' => 'PHPMailer Test',
+            'emailAddress' => 'phpmailer at example.com',
+        ];
+        $cacertprops = [
+            'countryName' => 'UK',
+            'stateOrProvinceName' => 'Here',
+            'localityName' => 'There',
+            'organizationName' => 'PHP',
+            'organizationalUnitName' => 'PHPMailer CA',
+            'commonName' => 'PHPMailer Test CA',
+            'emailAddress' => 'phpmailer at example.com',
+        ];
+        $keyconfig = [
+            'digest_alg' => 'sha256',
+            'private_key_bits' => 2048,
+            'private_key_type' => OPENSSL_KEYTYPE_RSA,
+        ];
+        $password = 'password';
+        $cacertfile = 'cacertfile.pem';
+        $cakeyfile = 'cakeyfile.pem';
+        $certfile = 'certfile.pem';
+        $keyfile = 'keyfile.pem';
+
+        //Create a CA cert
+        //Make a new key pair
+        $capk = openssl_pkey_new($keyconfig);
+        //Create a certificate signing request
+        $csr = openssl_csr_new($cacertprops, $capk);
+        //Create a self-signed cert
+        $cert = openssl_csr_sign($csr, null, $capk, 1);
+        //Save the CA cert
+        openssl_x509_export($cert, $certout);
+        file_put_contents($cacertfile, $certout);
+        //Save the CA key
+        openssl_pkey_export($capk, $pkeyout, $password);
+        file_put_contents($cakeyfile, $pkeyout);
+
+        //Create a cert signed by our CA
+        //Make a new key pair
+        $pk = openssl_pkey_new($keyconfig);
+        //Create a certificate signing request
+        $csr = openssl_csr_new($certprops, $pk);
+        //Create a self-signed cert
+        $cacert = file_get_contents($cacertfile);
+        $cert = openssl_csr_sign($csr, $cacert, $capk, 1);
+        //Save the cert
+        openssl_x509_export($cert, $certout);
+        file_put_contents($certfile, $certout);
+        //Save the key
+        openssl_pkey_export($pk, $pkeyout, $password);
+        file_put_contents($keyfile, $pkeyout);
+
+        $this->Mail->sign(
+            $certfile,
+            $keyfile,
+            $password,
+            $cacertfile
+        );
+        $this->assertTrue($this->Mail->send(), 'S/MIME signing with CA failed');
+        unlink($cacertfile);
+        unlink($cakeyfile);
+        unlink($certfile);
+        unlink($keyfile);
+    }
+
+    /**
+     * DKIM body canonicalization tests.
+     *
+     * @see https://tools.ietf.org/html/rfc6376#section-3.4.4
+     */
+    public function testDKIMBodyCanonicalization()
+    {
+        //Example from https://tools.ietf.org/html/rfc6376#section-3.4.5
+        $prebody = " C \r\nD \t E\r\n\r\n\r\n";
+        $postbody = " C \r\nD \t E\r\n";
+        $this->assertEquals($this->Mail->DKIM_BodyC(''), "\r\n", 'DKIM empty body canonicalization incorrect');
+        $this->assertEquals(
+            'frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN/XKdLCPjaYaY=',
+            base64_encode(hash('sha256', $this->Mail->DKIM_BodyC(''), true)),
+            'DKIM canonicalized empty body hash mismatch'
+        );
+        $this->assertEquals($this->Mail->DKIM_BodyC($prebody), $postbody, 'DKIM body canonicalization incorrect');
+    }
+
+    /**
+     * DKIM header canonicalization tests.
+     *
+     * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
+     */
+    public function testDKIMHeaderCanonicalization()
+    {
+        //Example from https://tools.ietf.org/html/rfc6376#section-3.4.5
+        $preheaders = "A: X\r\nB : Y\t\r\n\tZ  \r\n";
+        $postheaders = "a:X\r\nb:Y Z\r\n";
+        $this->assertEquals(
+            $postheaders,
+            $this->Mail->DKIM_HeaderC($preheaders),
+            'DKIM header canonicalization incorrect'
+        );
+    }
+
+    /**
+     * DKIM Signing tests.
+     *
+     * @requires extension openssl
+     */
+    public function testDKIM()
+    {
+        $this->Mail->Subject .= ': DKIM signing';
+        $this->Mail->Body = 'This message is DKIM signed.';
+        $this->buildBody();
+        $privatekeyfile = 'dkim_private.pem';
+        //Make a new key pair
+        //(2048 bits is the recommended minimum key length -
+        //gmail won't accept less than 1024 bits)
+        $pk = openssl_pkey_new(
+            [
+                'private_key_bits' => 2048,
+                'private_key_type' => OPENSSL_KEYTYPE_RSA,
+            ]
+        );
+        openssl_pkey_export_to_file($pk, $privatekeyfile);
+        $this->Mail->DKIM_domain = 'example.com';
+        $this->Mail->DKIM_private = $privatekeyfile;
+        $this->Mail->DKIM_selector = 'phpmailer';
+        $this->Mail->DKIM_passphrase = ''; //key is not encrypted
+        $this->assertTrue($this->Mail->send(), 'DKIM signed mail failed');
+        $this->Mail->isMail();
+        $this->assertTrue($this->Mail->send(), 'DKIM signed mail via mail() failed');
+        unlink($privatekeyfile);
+    }
+
+    /**
+     * Test line break reformatting.
+     */
+    public function testLineBreaks()
+    {
+        //May have been altered by earlier tests, can interfere with line break format
+        $this->Mail->isSMTP();
+        $this->Mail->preSend();
+        $unixsrc = "hello\nWorld\nAgain\n";
+        $macsrc = "hello\rWorld\rAgain\r";
+        $windowssrc = "hello\r\nWorld\r\nAgain\r\n";
+        $mixedsrc = "hello\nWorld\rAgain\r\n";
+        $target = "hello\r\nWorld\r\nAgain\r\n";
+        $this->assertEquals($target, PHPMailer::normalizeBreaks($unixsrc), 'UNIX break reformatting failed');
+        $this->assertEquals($target, PHPMailer::normalizeBreaks($macsrc), 'Mac break reformatting failed');
+        $this->assertEquals($target, PHPMailer::normalizeBreaks($windowssrc), 'Windows break reformatting failed');
+        $this->assertEquals($target, PHPMailer::normalizeBreaks($mixedsrc), 'Mixed break reformatting failed');
+
+        //To see accurate results when using postfix, set `sendmail_fix_line_endings = never` in main.cf
+        $this->Mail->Subject = 'PHPMailer DOS line breaks';
+        $this->Mail->Body = "This message\r\ncontains\r\nDOS-format\r\nCRLF line breaks.";
+        $this->assertTrue($this->Mail->send());
+
+        $this->Mail->Subject = 'PHPMailer UNIX line breaks';
+        $this->Mail->Body = "This message\ncontains\nUNIX-format\nLF line breaks.";
+        $this->assertTrue($this->Mail->send());
+
+        $this->Mail->Encoding = 'quoted-printable';
+        $this->Mail->Subject = 'PHPMailer DOS line breaks, QP';
+        $this->Mail->Body = "This message\r\ncontains\r\nDOS-format\r\nCRLF line breaks.";
+        $this->assertTrue($this->Mail->send());
+
+        $this->Mail->Subject = 'PHPMailer UNIX line breaks, QP';
+        $this->Mail->Body = "This message\ncontains\nUNIX-format\nLF line breaks.";
+        $this->assertTrue($this->Mail->send());
+    }
+
+    /**
+     * Test line length detection.
+     */
+    public function testLineLength()
+    {
+        //May have been altered by earlier tests, can interfere with line break format
+        $this->Mail->isSMTP();
+        $this->Mail->preSend();
+        $oklen = str_repeat(str_repeat('0', PHPMailer::MAX_LINE_LENGTH) . "\r\n", 2);
+        $badlen = str_repeat(str_repeat('1', PHPMailer::MAX_LINE_LENGTH + 1) . "\r\n", 2);
+        $this->assertTrue(PHPMailer::hasLineLongerThanMax($badlen), 'Long line not detected (only)');
+        $this->assertTrue(PHPMailer::hasLineLongerThanMax($oklen . $badlen), 'Long line not detected (first)');
+        $this->assertTrue(PHPMailer::hasLineLongerThanMax($badlen . $oklen), 'Long line not detected (last)');
+        $this->assertTrue(
+            PHPMailer::hasLineLongerThanMax($oklen . $badlen . $oklen),
+            'Long line not detected (middle)'
+        );
+        $this->assertFalse(PHPMailer::hasLineLongerThanMax($oklen), 'Long line false positive');
+        $this->Mail->isHTML(false);
+        $this->Mail->Subject .= ': Line length test';
+        $this->Mail->CharSet = 'UTF-8';
+        $this->Mail->Encoding = '8bit';
+        $this->Mail->Body = $oklen . $badlen . $oklen . $badlen;
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $this->assertEquals('quoted-printable', $this->Mail->Encoding, 'Long line did not override transfer encoding');
+    }
+
+    /**
+     * Test setting and retrieving message ID.
+     */
+    public function testMessageID()
+    {
+        $this->Mail->Body = 'Test message ID.';
+        $id = hash('sha256', 12345);
+        $this->Mail->MessageID = $id;
+        $this->buildBody();
+        $this->Mail->preSend();
+        $lastid = $this->Mail->getLastMessageID();
+        $this->assertNotEquals($lastid, $id, 'Invalid Message ID allowed');
+        $id = '<' . hash('sha256', 12345) . '@example.com>';
+        $this->Mail->MessageID = $id;
+        $this->buildBody();
+        $this->Mail->preSend();
+        $lastid = $this->Mail->getLastMessageID();
+        $this->assertEquals($lastid, $id, 'Custom Message ID not used');
+        $this->Mail->MessageID = '';
+        $this->buildBody();
+        $this->Mail->preSend();
+        $lastid = $this->Mail->getLastMessageID();
+        $this->assertRegExp('/^<.*@.*>$/', $lastid, 'Invalid default Message ID');
+    }
+
+    /**
+     * Miscellaneous calls to improve test coverage and some small tests.
+     */
+    public function testMiscellaneous()
+    {
+        $this->assertEquals('application/pdf', PHPMailer::_mime_types('pdf'), 'MIME TYPE lookup failed');
+        $this->Mail->addCustomHeader('SomeHeader: Some Value');
+        $this->Mail->clearCustomHeaders();
+        $this->Mail->clearAttachments();
+        $this->Mail->isHTML(false);
+        $this->Mail->isSMTP();
+        $this->Mail->isMail();
+        $this->Mail->isSendmail();
+        $this->Mail->isQmail();
+        $this->Mail->setLanguage('fr');
+        $this->Mail->Sender = '';
+        $this->Mail->createHeader();
+        $this->assertFalse($this->Mail->set('x', 'y'), 'Invalid property set succeeded');
+        $this->assertTrue($this->Mail->set('Timeout', 11), 'Valid property set failed');
+        $this->assertTrue($this->Mail->set('AllowEmpty', null), 'Null property set failed');
+        $this->assertTrue($this->Mail->set('AllowEmpty', false), 'Valid property set of null property failed');
+        //Test pathinfo
+        $a = '/mnt/files/飛兒樂 團光茫.mp3';
+        $q = PHPMailer::mb_pathinfo($a);
+        $this->assertEquals($q['dirname'], '/mnt/files', 'UNIX dirname not matched');
+        $this->assertEquals($q['basename'], '飛兒樂 團光茫.mp3', 'UNIX basename not matched');
+        $this->assertEquals($q['extension'], 'mp3', 'UNIX extension not matched');
+        $this->assertEquals($q['filename'], '飛兒樂 團光茫', 'UNIX filename not matched');
+        $this->assertEquals(
+            PHPMailer::mb_pathinfo($a, PATHINFO_DIRNAME),
+            '/mnt/files',
+            'Dirname path element not matched'
+        );
+        $this->assertEquals(
+            PHPMailer::mb_pathinfo($a, PATHINFO_BASENAME),
+            '飛兒樂 團光茫.mp3',
+            'Basename path element not matched'
+        );
+        $this->assertEquals(PHPMailer::mb_pathinfo($a, 'filename'), '飛兒樂 團光茫', 'Filename path element not matched');
+        $a = 'c:\mnt\files\飛兒樂 團光茫.mp3';
+        $q = PHPMailer::mb_pathinfo($a);
+        $this->assertEquals($q['dirname'], 'c:\mnt\files', 'Windows dirname not matched');
+        $this->assertEquals($q['basename'], '飛兒樂 團光茫.mp3', 'Windows basename not matched');
+        $this->assertEquals($q['extension'], 'mp3', 'Windows extension not matched');
+        $this->assertEquals($q['filename'], '飛兒樂 團光茫', 'Windows filename not matched');
+
+        $this->assertEquals(
+            PHPMailer::filenameToType('abc.jpg?xyz=1'),
+            'image/jpeg',
+            'Query string not ignored in filename'
+        );
+        $this->assertEquals(
+            PHPMailer::filenameToType('abc.xyzpdq'),
+            'application/octet-stream',
+            'Default MIME type not applied to unknown extension'
+        );
+
+        //Line break normalization
+        $eol = PHPMailer::getLE();
+        $b1 = "1\r2\r3\r";
+        $b2 = "1\n2\n3\n";
+        $b3 = "1\r\n2\r3\n";
+        $t1 = "1{$eol}2{$eol}3{$eol}";
+        $this->assertEquals(PHPMailer::normalizeBreaks($b1), $t1, 'Failed to normalize line breaks (1)');
+        $this->assertEquals(PHPMailer::normalizeBreaks($b2), $t1, 'Failed to normalize line breaks (2)');
+        $this->assertEquals(PHPMailer::normalizeBreaks($b3), $t1, 'Failed to normalize line breaks (3)');
+    }
+
+    public function testBadSMTP()
+    {
+        $this->Mail->smtpConnect();
+        $smtp = $this->Mail->getSMTPInstance();
+        $this->assertFalse($smtp->mail("somewhere\nbad"), 'Bad SMTP command containing breaks accepted');
+    }
+
+    public function testHostValidation()
+    {
+        $good = [
+            'localhost',
+            'example.com',
+            'smtp.gmail.com',
+            '127.0.0.1',
+            trim(str_repeat('a0123456789.', 21), '.'),
+            '[::1]',
+            '[0:1234:dc0:41:216:3eff:fe67:3e01]',
+        ];
+        $bad = [
+            null,
+            123,
+            1.5,
+            new \stdClass(),
+            [],
+            '',
+            '999.0.0.0',
+            '[1234]',
+            '[1234:::1]',
+            trim(str_repeat('a0123456789.', 22), '.'),
+            '0:1234:dc0:41:216:3eff:fe67:3e01',
+            '[012q:1234:dc0:41:216:3eff:fe67:3e01]',
+        ];
+        foreach ($good as $h) {
+            $this->assertTrue(PHPMailer::isValidHost($h), 'Good hostname denied: ' . $h);
+        }
+        foreach ($bad as $h) {
+            $this->assertFalse(PHPMailer::isValidHost($h), 'Bad hostname accepted: ' . var_export($h, true));
+        }
+    }
+
+    /**
+     * Tests the Custom header getter.
+     */
+    public function testCustomHeaderGetter()
+    {
+        $this->Mail->addCustomHeader('foo', 'bar');
+        $this->assertEquals([['foo', 'bar']], $this->Mail->getCustomHeaders());
+
+        $this->Mail->addCustomHeader('foo', 'baz');
+        $this->assertEquals(
+            [
+                ['foo', 'bar'],
+                ['foo', 'baz'],
+            ],
+            $this->Mail->getCustomHeaders()
+        );
+
+        $this->Mail->clearCustomHeaders();
+        $this->assertEmpty($this->Mail->getCustomHeaders());
+
+        $this->Mail->addCustomHeader('yux');
+        $this->assertEquals([['yux']], $this->Mail->getCustomHeaders());
+
+        $this->Mail->addCustomHeader('Content-Type: application/json');
+        $this->assertEquals(
+            [
+                ['yux'],
+                ['Content-Type', ' application/json'],
+            ],
+            $this->Mail->getCustomHeaders()
+        );
+    }
+
+    /**
+     * Tests setting and retrieving ConfirmReadingTo address, also known as "read receipt" address.
+     */
+    public function testConfirmReadingTo()
+    {
+        $this->Mail->CharSet = 'utf-8';
+        $this->buildBody();
+
+        $this->Mail->ConfirmReadingTo = 'test at example..com';  //Invalid address
+        $this->assertFalse($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        $this->Mail->ConfirmReadingTo = ' test at example.com';  //Extra space to trim
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+        $this->assertEquals(
+            'test at example.com',
+            $this->Mail->ConfirmReadingTo,
+            'Unexpected read receipt address'
+        );
+
+        $this->Mail->ConfirmReadingTo = 'test at françois.ch';  //Address with IDN
+        if (PHPMailer::idnSupported()) {
+            $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+            $this->assertEquals(
+                'test at xn--franois-xxa.ch',
+                $this->Mail->ConfirmReadingTo,
+                'IDN address not converted to punycode'
+            );
+        } else {
+            $this->assertFalse($this->Mail->send(), $this->Mail->ErrorInfo);
+        }
+    }
+
+    /**
+     * Tests CharSet and Unicode -> ASCII conversions for addresses with IDN.
+     */
+    public function testConvertEncoding()
+    {
+        if (!PHPMailer::idnSupported()) {
+            $this->markTestSkipped('intl and/or mbstring extensions are not available');
+        }
+
+        $this->Mail->clearAllRecipients();
+        $this->Mail->clearReplyTos();
+
+        // This file is UTF-8 encoded. Create a domain encoded in "iso-8859-1".
+        $domain = '@' . mb_convert_encoding('françois.ch', 'ISO-8859-1', 'UTF-8');
+        $this->Mail->addAddress('test' . $domain);
+        $this->Mail->addCC('test+cc' . $domain);
+        $this->Mail->addBCC('test+bcc' . $domain);
+        $this->Mail->addReplyTo('test+replyto' . $domain);
+
+        // Queued addresses are not returned by get*Addresses() before send() call.
+        $this->assertEmpty($this->Mail->getToAddresses(), 'Bad "to" recipients');
+        $this->assertEmpty($this->Mail->getCcAddresses(), 'Bad "cc" recipients');
+        $this->assertEmpty($this->Mail->getBccAddresses(), 'Bad "bcc" recipients');
+        $this->assertEmpty($this->Mail->getReplyToAddresses(), 'Bad "reply-to" recipients');
+
+        // Clear queued BCC recipient.
+        $this->Mail->clearBCCs();
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        // Addresses with IDN are returned by get*Addresses() after send() call.
+        $domain = $this->Mail->punyencodeAddress($domain);
+        $this->assertEquals(
+            [['test' . $domain, '']],
+            $this->Mail->getToAddresses(),
+            'Bad "to" recipients'
+        );
+        $this->assertEquals(
+            [['test+cc' . $domain, '']],
+            $this->Mail->getCcAddresses(),
+            'Bad "cc" recipients'
+        );
+        $this->assertEmpty($this->Mail->getBccAddresses(), 'Bad "bcc" recipients');
+        $this->assertEquals(
+            ['test+replyto' . $domain => ['test+replyto' . $domain, '']],
+            $this->Mail->getReplyToAddresses(),
+            'Bad "reply-to" addresses'
+        );
+    }
+
+    /**
+     * Tests removal of duplicate recipients and reply-tos.
+     */
+    public function testDuplicateIDNRemoved()
+    {
+        if (!PHPMailer::idnSupported()) {
+            $this->markTestSkipped('intl and/or mbstring extensions are not available');
+        }
+
+        $this->Mail->clearAllRecipients();
+        $this->Mail->clearReplyTos();
+
+        $this->Mail->CharSet = 'utf-8';
+
+        $this->assertTrue($this->Mail->addAddress('test at françois.ch'));
+        $this->assertFalse($this->Mail->addAddress('test at françois.ch'));
+        $this->assertTrue($this->Mail->addAddress('test at FRANÇOIS.CH'));
+        $this->assertFalse($this->Mail->addAddress('test at FRANÇOIS.CH'));
+        $this->assertTrue($this->Mail->addAddress('test at xn--franois-xxa.ch'));
+        $this->assertFalse($this->Mail->addAddress('test at xn--franois-xxa.ch'));
+        $this->assertFalse($this->Mail->addAddress('test at XN--FRANOIS-XXA.CH'));
+
+        $this->assertTrue($this->Mail->addReplyTo('test+replyto at françois.ch'));
+        $this->assertFalse($this->Mail->addReplyTo('test+replyto at françois.ch'));
+        $this->assertTrue($this->Mail->addReplyTo('test+replyto at FRANÇOIS.CH'));
+        $this->assertFalse($this->Mail->addReplyTo('test+replyto at FRANÇOIS.CH'));
+        $this->assertTrue($this->Mail->addReplyTo('test+replyto at xn--franois-xxa.ch'));
+        $this->assertFalse($this->Mail->addReplyTo('test+replyto at xn--franois-xxa.ch'));
+        $this->assertFalse($this->Mail->addReplyTo('test+replyto at XN--FRANOIS-XXA.CH'));
+
+        $this->buildBody();
+        $this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
+
+        // There should be only one "To" address and one "Reply-To" address.
+        $this->assertEquals(
+            1,
+            count($this->Mail->getToAddresses()),
+            'Bad count of "to" recipients'
+        );
+        $this->assertEquals(
+            1,
+            count($this->Mail->getReplyToAddresses()),
+            'Bad count of "reply-to" addresses'
+        );
+    }
+
+    /**
+     * Use a fake POP3 server to test POP-before-SMTP auth with a known-good login.
+     *
+     * @group pop3
+     */
+    public function testPopBeforeSmtpGood()
+    {
+        //Start a fake POP server
+        $pid = shell_exec(
+            '/usr/bin/nohup ' .
+            $this->INCLUDE_DIR .
+            '/test/runfakepopserver.sh 1100 >/dev/null 2>/dev/null & printf "%u" $!'
+        );
+        $this->pids[] = $pid;
+
+        sleep(1);
+        //Test a known-good login
+        $this->assertTrue(
+            POP3::popBeforeSmtp('localhost', 1100, 10, 'user', 'test', $this->Mail->SMTPDebug),
+            'POP before SMTP failed'
+        );
+        //Kill the fake server, don't care if it fails
+        @shell_exec('kill -TERM ' . escapeshellarg($pid));
+        sleep(2);
+    }
+
+    /**
+     * Use a fake POP3 server to test POP-before-SMTP auth
+     * with a known-bad login.
+     *
+     * @group pop3
+     */
+    public function testPopBeforeSmtpBad()
+    {
+        //Start a fake POP server on a different port
+        //so we don't inadvertently connect to the previous instance
+        $pid = shell_exec(
+            '/usr/bin/nohup ' .
+            $this->INCLUDE_DIR .
+            '/test/runfakepopserver.sh 1101 >/dev/null 2>/dev/null & printf "%u" $!'
+        );
+        $this->pids[] = $pid;
+
+        sleep(2);
+        //Test a known-bad login
+        $this->assertFalse(
+            POP3::popBeforeSmtp('localhost', 1101, 10, 'user', 'xxx', $this->Mail->SMTPDebug),
+            'POP before SMTP should have failed'
+        );
+        //Kill the fake server, don't care if it fails
+        @shell_exec('kill -TERM ' . escapeshellarg($pid));
+        sleep(2);
+    }
+
+    /**
+     * Test SMTP host connections.
+     * This test can take a long time, so run it last.
+     *
+     * @group slow
+     */
+    public function testSmtpConnect()
+    {
+        $this->Mail->SMTPDebug = 4; //Show connection-level errors
+        $this->assertTrue($this->Mail->smtpConnect(), 'SMTP single connect failed');
+        $this->Mail->smtpClose();
+        $this->Mail->Host = 'localhost:12345;10.10.10.10:54321;' . $_REQUEST['mail_host'];
+        $this->assertTrue($this->Mail->smtpConnect(), 'SMTP multi-connect failed');
+        $this->Mail->smtpClose();
+        $this->Mail->Host = '[::1]:' . $this->Mail->Port . ';' . $_REQUEST['mail_host'];
+        $this->assertTrue($this->Mail->smtpConnect(), 'SMTP IPv6 literal multi-connect failed');
+        $this->Mail->smtpClose();
+        //All these hosts are expected to fail
+        $this->Mail->Host = 'xyz://bogus:25;tls://[bogus]:25;ssl://localhost:12345;tls://localhost:587;10.10.10.10:54321;localhost:12345;10.10.10.10';
+        $this->assertFalse($this->Mail->smtpConnect(), 'SMTP bad multi-connect succeeded');
+        $this->Mail->smtpClose();
+        $this->Mail->Host = ' localhost:12345 ; ' . $_REQUEST['mail_host'] . ' ';
+        $this->assertTrue($this->Mail->smtpConnect(), 'SMTP hosts with stray spaces failed');
+        $this->Mail->smtpClose();
+        $this->Mail->Host = $_REQUEST['mail_host'];
+        //Need to pick a harmless option so as not cause problems of its own! socket:bind doesn't work with Travis-CI
+        $this->assertTrue(
+            $this->Mail->smtpConnect(['ssl' => ['verify_depth' => 10]]),
+            'SMTP connect with options failed'
+        );
+    }
+}
+
+/*
+ * This is a sample form for setting appropriate test values through a browser
+ * These values can also be set using a file called testbootstrap.php (not in repo) in the same folder as this script
+ * which is probably more useful if you run these tests a lot
+ * <html>
+ * <body>
+ * <h3>PHPMailer Unit Test</h3>
+ * By entering a SMTP hostname it will automatically perform tests with SMTP.
+ *
+ * <form name="phpmailer_unit" action=__FILE__ method="get">
+ * <input type="hidden" name="submitted" value="1"/>
+ * From Address: <input type="text" size="50" name="mail_from" value="<?php echo get("mail_from"); ?>"/>
+ * <br/>
+ * To Address: <input type="text" size="50" name="mail_to" value="<?php echo get("mail_to"); ?>"/>
+ * <br/>
+ * Cc Address: <input type="text" size="50" name="mail_cc" value="<?php echo get("mail_cc"); ?>"/>
+ * <br/>
+ * SMTP Hostname: <input type="text" size="50" name="mail_host" value="<?php echo get("mail_host"); ?>"/>
+ * <p/>
+ * <input type="submit" value="Run Test"/>
+ *
+ * </form>
+ * </body>
+ * </html>
+ */

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/bootstrap.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/bootstrap.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/bootstrap.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,10 @@
+<?php
+/**
+ * PHPUnit bootstrap file.
+ */
+ini_set('sendmail_path', '/usr/sbin/sendmail -t -i ');
+if (file_exists('vendor/autoload.php')) {
+    require_once 'vendor/autoload.php';
+} else {
+    require_once '../vendor/autoload.php';
+}

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakepopserver.sh
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakepopserver.sh	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakepopserver.sh	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,126 @@
+#!/usr/bin/env bash
+
+# Fake POP3 server
+# By Marcus Bointon <phpmailer at synchromedia.co.uk>
+# Copyright 2010 - 2016 Marcus Bointon
+# Based on code by 'Frater' found at http://www.linuxquestions.org/questions/programming-9/fake-pop3-server-to-capture-pop3-passwords-933733
+# Does not actually serve any mail, but supports commands sufficient to test POP-before SMTP
+# Can be run directly from a shell like this:
+# mkfifo fifo; nc -l 1100 <fifo |./fakepopserver.sh >fifo; rm fifo
+# It will accept any user name and will return a positive response for the password 'test'
+
+# Licensed under the GNU Lesser General Public License: http://www.gnu.org/copyleft/lesser.html
+
+# Enable debug output
+#set -xv
+export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin
+
+LOGFOLDER=/tmp
+
+LOGFILE=${LOGFOLDER}/fakepop.log
+
+LOGGING=1
+DEBUG=1
+TIMEOUT=60
+
+POP_USER=
+POP_PASSWRD=test
+
+LINES=1
+BREAK=0
+
+write_log () {
+  if [ ${LINES} -eq 1 ] ; then
+    echo '---'  >>${LOGFILE}
+  fi
+  let LINES+=1
+  [ ${LOGGING} = 0 ] || echo -e "`date '+%b %d %H:%M'` pop3 $*" >>${LOGFILE}
+}
+
+ANSWER="+OK Fake POP3 Service Ready"
+
+while [ ${BREAK} -eq 0 ] ; do
+  echo -en "${ANSWER}\r\n"
+
+  REPLY=""
+
+  #Input appears in $REPLY
+  read -t ${TIMEOUT}
+
+  ANSWER="+OK "
+  COMMAND=""
+  ARGS=""
+  TIMEOUT=30
+
+  if [ "$REPLY" ] ; then
+    write_log "RAW input: '`echo "${REPLY}" | tr -cd '[ -~]'`'"
+
+    COMMAND="`echo "${REPLY}" | awk '{print $1}' | tr -cd '\40-\176' | tr 'a-z' 'A-Z'`"
+    ARGS="`echo "${REPLY}"    | tr -cd '\40-\176' | awk '{for(i=2;i<=NF;i++){printf "%s ", $i};printf "\n"}' | sed 's/ $//'`"
+
+    write_log "Command: \"${COMMAND}\""
+    write_log "Arguments: \"${ARGS}\""
+
+    case "$COMMAND" in
+      QUIT)
+        break
+        ;;
+      USER)
+        if [ -n "${ARGS}" ] ; then
+          POP_USER="${ARGS}"
+          ANSWER="+OK Please send PASS command"
+        fi
+        ;;
+      AUTH)
+        ANSWER="+OK \r\n."
+        ;;
+      CAPA)
+        ANSWER="+OK Capabilities include\r\nUSER\r\nCAPA\r\n."
+        ;;
+      PASS)
+        if [ "${POP_PASSWRD}" == "${ARGS}" ] ; then
+          ANSWER="+OK Logged in."
+          AUTH=1
+        else
+          ANSWER="-ERR Login failed."
+        fi
+        ;;
+      LIST)
+        if [ "${AUTH}" = 0 ] ; then
+          ANSWER="-ERR Not authenticated"
+        else
+          if [ -z "${ARGS}" ] ; then
+            ANSWER="+OK No messages, really\r\n."
+          else
+            ANSWER="-ERR No messages, no list, no status"
+          fi
+        fi
+        ;;
+      RSET)
+        ANSWER="+OK Resetting or whatever\r\n."
+        ;;
+      LAST)
+        if [ "${AUTH}" = 0 ] ; then
+          ANSWER="-ERR Not authenticated"
+        else
+          ANSWER="+OK 0"
+        fi
+        ;;
+      STAT)
+        if [ "${AUTH}" = 0 ] ; then
+          ANSWER="-ERR Not authenticated"
+        else
+          ANSWER="+OK 0 0"
+        fi
+        ;;
+      NOOP)
+        ANSWER="+OK Hang on, doing nothing"
+        ;;
+     esac
+  else
+    echo "+OK Connection timed out"
+    break
+  fi
+done
+
+echo "+OK Bye!\r\n"

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakesendmail.sh
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakesendmail.sh	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/fakesendmail.sh	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+#Fake sendmail script, adapted from:
+#https://github.com/mrded/MNPP/blob/ee64fb2a88efc70ba523b78e9ce61f9f1ed3b4a9/init/fake-sendmail.sh
+
+#Create a temp folder to put messages in
+numPath="${TMPDIR-/tmp/}fakemail"
+umask 037
+mkdir -p ${numPath}
+
+if [ ! -f ${numPath}/num ]; then
+  echo "0" > ${numPath}/num
+fi
+num=`cat ${numPath}/num`
+num=$((${num} + 1))
+echo ${num} > ${numPath}/num
+
+name="${numPath}/message_${num}.eml"
+while read line
+do
+  echo ${line} >> ${name}
+done
+exit 0

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/runfakepopserver.sh
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/runfakepopserver.sh	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/runfakepopserver.sh	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -xv
+
+# Run the fake pop server from bash
+# Idea from http://blog.ale-re.net/2007/09/ipersimple-remote-shell-with-netcat.html
+# Defaults to port 1100 so it can be run by unpriv users and not clash with a real server
+# Optionally, pass in a port number as the first arg
+
+rm -f fifo
+mkfifo fifo
+nc -l ${1:-1100} <fifo |bash ./fakepopserver.sh >fifo
+rm fifo

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/test/testbootstrap-dist.php
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/test/testbootstrap-dist.php	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/test/testbootstrap-dist.php	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,8 @@
+<?php
+
+$_REQUEST['submitted'] = 1;
+$_REQUEST['mail_to'] = 'somebody at example.com';
+$_REQUEST['mail_from'] = 'phpunit at example.com';
+$_REQUEST['mail_cc'] = 'cc at example.com';
+$_REQUEST['mail_host'] = 'localhost';
+$_REQUEST['mail_port'] = 2500;

Added: trunk/mapbender/http/classes/phpmailer-6.0.2/travis.phpunit.xml.dist
===================================================================
--- trunk/mapbender/http/classes/phpmailer-6.0.2/travis.phpunit.xml.dist	                        (rev 0)
+++ trunk/mapbender/http/classes/phpmailer-6.0.2/travis.phpunit.xml.dist	2018-08-09 12:30:02 UTC (rev 9936)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+         bootstrap="vendor/autoload.php"
+         verbose="true"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         colors="true"
+         forceCoversAnnotation="false"
+         processIsolation="false">
+    <testsuites>
+        <testsuite name="PHPMailer Tests">
+            <directory>./test/</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="PHPMailer\Test\DebugLogTestListener" />
+    </listeners>
+    <groups>
+        <exclude>
+            <group>languages</group>
+            <group>pop3</group>
+        </exclude>
+    </groups>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>
+</phpunit>



More information about the Mapbender_commits mailing list