Merge remote-tracking branch 'origin/dev_php82' into dev_php82

# Conflicts: # .gitignore # .idea/modules.xml # .idea/php.xml # .idea/phpunit.xml # .idea/vcs.xml # composer.json # composer.lock # conlite/external/autoload.php # conlite/external/composer/autoload_classmap.php # conlite/external/composer/autoload_psr4.php # conlite/external/composer/autoload_static.php # conlite/external/composer/installed.json # conlite/external/composer/installed.php # conlite/external/composer/platform_check.php # conlite/external/phpmailer/phpmailer/VERSION # conlite/external/phpmailer/phpmailer/composer.json # conlite/external/phpmailer/phpmailer/get_oauth_token.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ar.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-az.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ba.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-be.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-bg.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ca.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-cs.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-da.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-de.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-el.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-eo.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-es.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-et.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fa.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fi.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fo.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-fr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-gl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-he.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hu.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-hy.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-id.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-it.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ja.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ka.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ko.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lt.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-lv.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ms.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nb.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-nl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ro.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-ru.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sk.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sl.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-sv.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-tr.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-uk.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-vi.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh.php # conlite/external/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php # conlite/external/phpmailer/phpmailer/src/SMTP.php
2023-04-25 19:12:49 +02:00 · 2023-04-25 19:12:49 +02:00 · 068c042318
commit 068c042318
parent a54fbde1c3 aa34d49978
65 changed files with 7318 additions and 2042 deletions
--- a/.idea/ConLite.iml
+++ b/.idea/ConLite.iml
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/conlite/external" isTestSource="false" packagePrefix="Conlite\External\" />
+      <sourceFolder url="file://$MODULE_DIR$/conlite/external/endroid/qr-code/src" isTestSource="false" packagePrefix="Endroid\QrCode\" />
+      <sourceFolder url="file://$MODULE_DIR$/conlite/external/endroid/qr-code/tests" isTestSource="true" packagePrefix="Endroid\QrCode\Tests\" />
+      <sourceFolder url="file://$MODULE_DIR$/conlite/external/phpmailer/phpmailer/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/edit_area/images" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/edit_area/langs" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/edit_area/plugins" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/edit_area/reg_syntax" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/cache" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/css" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/data" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/images" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/includes" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/js" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/logs" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/templates" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/frontend/upload" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/phpmailer/phpmailer" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/phpqrcode/bindings" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/phpqrcode/tools" />
+      <excludeFolder url="file://$MODULE_DIR$/conlite/external/wysiwyg/tinymce3" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/README.md
+++ b/README.md
@ -1,4 +1,3 @@
----------------------------------------------------------------------------------------------------
 This is the readme file for ConLite 2.2.0 beta

 Any help you need you may find by visiting the following links.
--- a/cms/includes/class.input.helper.php
+++ b/cms/includes/class.input.helper.php
@ -144,8 +144,7 @@ class cHTMLInputSelectElement extends cHTMLSelectElement {
     *
     * @return int		Number of items added
     * */
-    function addCategories($iMaxLevel = 0, $bColored = false, $bCatVisible = true, $bCatPublic = true,
-            $bWithArt = false, $bArtOnline = true) {
+    function addCategories($iMaxLevel = 0, $bColored = false, $bCatVisible = true, $bCatPublic = true, $bWithArt = false, $bArtOnline = true) {
        global $cfg, $client, $lang;

        $oDB = new DB_Contenido;
@ -259,27 +258,18 @@ class cHTMLInputSelectElement extends cHTMLSelectElement {
        }
    }

-    /**
-     * Selects specified elements as selected
-     *
-     * @param array		$aElements Array with "values" of the cHTMLOptionElement to set
-     *
-     * @return none
-     */
-    function setSelected($aElements) {
-        if (is_array($this->_options) && is_array($aElements)) {
-            foreach ($this->_options as $sKey => $oOption) {
-                if (in_array($oOption->getAttribute("value"), $aElements)) {
-                    $oOption->setSelected(true);
-                    $this->_options[$sKey] = $oOption;
-                } else {
-                    $oOption->setSelected(false);
-                    $this->_options[$sKey] = $oOption;
-                }
-            }
-        }
+    public function addFiles($sPath) {
+        $iCount = 0;
+        $aFiles = cDirHandler::read($sPath);
+        asort($aFiles);
+        $iCounter = count($this->_options);
+        foreach ($aFiles as $sValue) {
+            $oOption = new cHTMLOptionElement($sValue, $sValue);            
+            $this->addOptionElement($iCounter, $oOption);
+            $iCounter++;
+        }        
+        return count($aFiles);
    }
-
 }

 class UI_Config_Table {
@ -302,16 +292,24 @@ class UI_Config_Table {
    var $_sColorLight;
    var $_sColorDark;

+    /**
+     * 
+     * @var type
+     */
+    protected $_iRowCnt = 0;
+
    function __construct() {
-        global $cfg;
+        $cfg = cRegistry::getConfig();

        $this->_sPadding = 2;
        $this->_sBorder = 0;
-        $this->_sBorderColor = $cfg['color']['table_border'];
-        $this->_sTplCellCode = '        <td align="{ALIGN}" valign="{VALIGN}" class="{CLASS}" colspan="{COLSPAN}" style="{EXTRA}white-space:nowrap;" nowrap="nowrap">{CONTENT}</td>' . "\n";
+        $this->_sBorderColor = cRegistry::getConfigValue('color', 'table_border');
+        $this->_sTplCellCode = '<td align="{ALIGN}" valign="{VALIGN}" class="{CLASS}" colspan="{COLSPAN}" style="{EXTRA}white-space:nowrap;" nowrap="nowrap">' . "\n"
+                . '{CONTENT}' . "\n"
+                . '</td>' . "\n";
        $this->_sTplTableFile = $cfg['path']['contenido'] . $cfg['path']['templates'] . $cfg['templates']['generic_list'];
-        $this->_sColorLight = $cfg['color']['table_light'];
-        $this->_sColorDark = $cfg['color']['table_dark'];
+        $this->_sColorLight = cRegistry::getConfigValue('color', 'table_light');
+        $this->_sColorDark = cRegistry::getConfigValue('color', 'table_dark');
    }

    function setCellTemplate($sCode) {
@ -417,8 +415,37 @@ class UI_Config_Table {
        return $sSkript;
    }

-    function render($bPrint = false) {
-        $oTable = new Template;
+    /**
+     * increase row counter
+     */
+    public function nextRow() {
+        $this->_iRowCnt++;
+    }
+    
+    /**
+     * get current row count
+     * 
+     * @return int row count
+     */
+    public function getRowCount() : int {
+        return $this->_iRowCnt;
+    }
+
+    public function setRowCell(int $iCell, $mContent) {
+        $this->setCell($this->_iRowCnt, $iCell, $mContent);
+    }
+
+    public function setRowBorder(string $sWhich = 'bottom') {
+        $sStyle = '';
+        switch ($sWhich) {
+            case 'bottom':
+                $this->setRowExtra($this->_iRowCnt, 'border-bottom: 1px solid silver;');
+                break;
+        }
+    }
+
+    public function render($bPrint = false) {
+        $oTable = new Template();
        $oTable->reset();

        $oTable->set('s', 'CELLPADDING', $this->_sPadding);
@ -437,6 +464,8 @@ class UI_Config_Table {
                $iCount = 0;

                foreach ($aCells as $sCell => $sData) {
+                    $sData = $this->_processContentData($sData);
+
                    $iCount++;
                    $sTplCell = $this->_sTplCellCode;

@ -525,6 +554,57 @@ class UI_Config_Table {
        }
    }

-}
+    /**
+     * returns different types of content data as string
+     * you can use 
+     * - string
+     * - object, needs to have a render method
+     * - array of objects and/or strings
+     * 
+     * @author Ortwin Pinke
+     * @since 2.3.0
+     * 
+     * 
+     * @param mixed $mData
+     * @return string
+     */
+    protected function _processContentData($mData): string {
+        if (is_string($mData)) {
+            return $mData;
+        }

-?>
+        $sData = '';
+
+        if (is_array($mData) && count($mData) > 0) {
+            foreach ($mData as $mElement) {
+                if (is_string($mElement)) {
+                    $sData .= $mElement;
+                    continue;
+                }
+                $sData .= $this->_renderObject($mElement);
+            }
+        } else {
+            $sData = $this->_renderObject($mData);
+        }
+
+        return $sData;
+    }
+
+    /**
+     * Renders an object using its render method
+     * 
+     * @author Ortwin Pinke 
+     * @since 2.3.0
+     * 
+     * @param type $oObject
+     * @return string rendered string from object | empty string
+     */
+    protected function _renderObject($oObject): string {
+        $sReturn = '';
+        if (is_object($oObject) && method_exists($oObject, 'render')) {
+            $sReturn = $oObject->render();
+        }
+        return $sReturn;
+    }
+
+}
--- a/conlib/perm.inc
+++ b/conlib/perm.inc
@ -232,8 +232,8 @@ class Contenido_Perm {
                return true;
            } elseif ($item_rights[$area] != "noright") {

-                $groupsForUser = $this->getGroupsForUser($auth->auth[uid]);
-                $groupsForUser[] = $auth->auth[uid];
+                $groupsForUser = $this->getGroupsForUser($auth->auth['uid']);
+                $groupsForUser[] = $auth->auth['uid'];

                $tmp_userstring = implode("','", $groupsForUser);

@ -596,8 +596,8 @@ class Contenido_Perm {
                    }
                } elseif ($item_rights[$value] != "noright") {

-                    $groupsForUser = $this->getGroupsForUser($auth->auth[uid]);
-                    $groupsForUser[] = $auth->auth[uid];
+                    $groupsForUser = $this->getGroupsForUser($auth->auth['uid']);
+                    $groupsForUser[] = $auth->auth['uid'];

                    //else search for rights for this user in this area
                    $sql = "SELECT
--- a/conlite/backend_search.php
+++ b/conlite/backend_search.php
@ -555,8 +555,8 @@ if (empty($where) || $iAffectedRows <= 0) {
 		#Check rights per cat
 		if (!$check_rights) {
 			//hotfix timo trautmann 2008-12-10 also check rights in associated groups
-			$aGroupsForUser = $perm->getGroupsForUser($auth->auth[uid]);
-			$aGroupsForUser[] = $auth->auth[uid];
+			$aGroupsForUser = $perm->getGroupsForUser($auth->auth['uid']);
+			$aGroupsForUser[] = $auth->auth['uid'];
 			$sTmpUserString = implode("','", $aGroupsForUser);
 			
 			#Check if any rights are applied to current user or his groups
--- a/conlite/classes/cHTML5/class.chtml.php
+++ b/conlite/classes/cHTML5/class.chtml.php
@ -20,11 +20,7 @@

 // security check
 defined('CON_FRAMEWORK') or die('Illegal call');
-/*
-if (!class_exists("HTML_Common2")) {
-    cInclude("pear", "HTML/Common2.php");
-}
-*/
+
 /* Global ID counter */
 $cHTMLIDCount = 0;

@ -415,7 +411,7 @@ class cHTML extends cHTML5Common {
       $style = $this->getAttribute("style");
       
       /* If the style doesn't end with a semicolon, append one */
-       if(is_string($style)) {
+       if(!empty($style) && is_string($style)) {
           $style = trim($style);
           
           if (substr($style, strlen($style) - 1) != ";") {
@ -423,12 +419,20 @@ class cHTML extends cHTML5Common {
           }
       }
       
-       foreach($this->_aStyleDefinitions as $sEntry) {
-           $style .= $sEntry;
+        foreach($this->_aStyleDefinitions as $sKey => $sEntry) {
+            $style .= $sKey.': '.$sEntry;
           
           if (substr($style, strlen($style) - 1) != ";") {
               $style .= ";";
           }			
+       }       
+       /* Apply all stored styles */
+       foreach ($this->_styledefs as $key => $value) {
+           $style .= "$key: $value;";
+       }
+       
+       if ($style != "") {
+           $this->setStyle($style);
       }
       
       foreach($this->_aEventDefinitions as $sEventName => $sEntry) {
@ -440,15 +444,6 @@ class cHTML extends cHTML5Common {
           $this->setAttribute($sEventName, $this->getAttribute($sEventName).implode(" ", $aFullCode));
       }
       
-       /* Apply all stored styles */
-       foreach ($this->_styledefs as $key => $value) {
-           $style .= "$key: $value;";
-       }
-       
-       if ($style != "") {
-           $this->setStyle($style);
-       }
-       
       if ($this->_content != "" || $this->_contentlessTag == false) {
           $attributes = $this->getAttributes(true);
           return $this->fillSkeleton($attributes).$this->_content.$this->fillCloseSkeleton();
--- a/conlite/classes/class.article.collector.php
+++ b/conlite/classes/class.article.collector.php
@ -34,7 +34,7 @@ class cArticleCollector implements SeekableIterator, Countable {
    protected $_aStartArticles = array();
    protected $_aOptions = array();
    protected $_aOptionsDefault = array();
-    private $_bAsObject = TRUE;
+    private $_bAsObject = true;

    /**
     *
@ -65,14 +65,12 @@ class cArticleCollector implements SeekableIterator, Countable {
        }
        
        if (count($this->_aStartArticles) > 0) {
-            print_r($this->_aStartArticles);
            if ($this->_aOptions['start'] == false) {
                $oArtLangColl->setWhere("cApiArticleLanguageCollection.idartlang", $this->_aStartArticles, "NOTIN");
                //$sqlStartArticles = "a.idartlang NOT IN ('" . implode("','", $this->_startArticles) . "') AND ";
            }

            if ($this->_aOptions['startonly'] == true) {
-                echo "startonly";
                $oArtLangColl->setWhere("cApiArticleLanguageCollection.idartlang", $this->_aStartArticles, "IN");
                //$sqlStartArticles = "a.idartlang IN ('" . implode("','", $this->_startArticles) . "') AND ";
            }
@ -89,7 +87,6 @@ class cArticleCollector implements SeekableIterator, Countable {
        $oArtLangColl->setWhere("cApiArticleLanguageCollection.idlang", $this->_aOptions['lang']);

        $oArtLangColl->query();
-        echo $oArtLangColl->_lastSQL;
        if ($oArtLangColl->count() > 0) {
            $aTable = $oArtLangColl->fetchTable();
            //echo $oArtLangColl->_lastSQL;
@ -97,7 +94,6 @@ class cArticleCollector implements SeekableIterator, Countable {
            foreach ($aTable as $aItem) {
                $this->_aArticles[] = $aItem['idartlang'];
            }
-            print_r($this->_aArticles);
        }
    }

@ -162,7 +158,7 @@ class cArticleCollector implements SeekableIterator, Countable {
     * 
     * @return cApiArticleLanguage|int returns article language object or idartlang
     */
-    public function current() {
+    public function current()  :cApiArticleLanguage|int{
        $iIdartlang = $this->_aArticles[$this->_iCurrentPosition];
        if ($this->_bAsObject) {
            $oArticle = new cApiArticleLanguage($iIdartlang);
--- a/conlite/classes/class.genericdb.php
+++ b/conlite/classes/class.genericdb.php
@ -1311,7 +1311,7 @@ abstract class Item extends cItemBaseAbstract {
     * List of funcion names of the filtersused when data is retrieved from the db
     * @var  array
     */
-    protected $_arrOutFilters = array('stripslashes', 'htmldecode', 'urldecode');
+    protected $_arrOutFilters = array('stripslashes', 'htmldecode','urldecode', 'utf8_encode');

    /**
     * Class name of meta object
--- a/conlite/classes/class.htmlelements.php
+++ b/conlite/classes/class.htmlelements.php
@ -57,8 +57,7 @@ class cHTMLFormElement extends cHTML {
        if (is_string($id) && !empty($id)) {
            $this->updateAttributes(array("id" => $id));
        }
-
-        $this->setClass("text_medium"); // TODO: Remove this...
+        
        $this->setDisabled($disabled);
        $this->setTabindex($tabindex);
        $this->setAccessKey($accesskey);
@ -594,7 +593,7 @@ class cHTMLSelectElement extends cHTMLFormElement {
     * All cHTMLOptionElements
     * @var array
     */
-    var $_options;
+    var $_options = [];

    /**
     * Constructor. Creates an HTML select field (aka "DropDown").
@ -931,7 +930,7 @@ class cHTMLRadiobutton extends cHTMLFormElement {
     */
    function toHtml($renderLabel = true) {
        $attributes = $this->getAttributes(true);
-
+        //print_r($attributes);
        if ($renderLabel == false) {
            return $this->fillSkeleton($attributes);
        }
@ -1029,37 +1028,30 @@ class cHTMLCheckbox extends cHTMLFormElement {
     * @return string Rendered HTML
     */
    function toHtml($renderlabel = true) {
+        $attributes = $this->getAttributes(true);
+        
+        if ($renderlabel == false) {
+            return $this->fillSkeleton($attributes);
+        }
+
        $id = $this->getAttribute("id");
+        
        $renderedLabel = "";

-        if ($renderlabel == true) {
-            if ($id != "") {
-                $label = new cHTMLLabel($this->_value, $this->getAttribute("id"));
+        if ($id != "") {
+            $label = new cHTMLLabel($this->_value, $this->getAttribute("id"));

-                $label->setClass($this->getAttribute("class"));
-
-                if ($this->_labelText != "") {
-                    $label->setLabelText($this->_labelText);
-                }
-
-                $renderedLabel = $label->toHtml();
-            } else {
-
-                $renderedLabel = $this->_value;
-
-                if ($this->_labelText != "") {
-                    $label = new cHTMLLabel($this->_value, $this->getAttribute("id"));
-                    $label->setLabelText($this->_labelText);
-                    $renderedLabel = $label->toHtml();
-                }
+            if ($this->_labelText != "") {
+                $label->setLabelText($this->_labelText);
            }

-            return '<table border="0" cellspacing="0" cellpadding="0"><tr><td nowrap="nowrap">' . parent::toHTML() . '</td><td nowrap="nowrap">' . $renderedLabel . '</td></tr></table>';
+            $renderedLabel = $label->toHtml();
        } else {
-            return parent::toHTML();
+            $renderedLabel = $this->_value;
        }
-    }

+        return $this->fillSkeleton($attributes) . $renderedLabel;        
+    }
 }

 /**
--- a/conlite/classes/class.i18n.php
+++ b/conlite/classes/class.i18n.php
@ -130,7 +130,7 @@ class cI18n {

        // Is emulator to use?
        if (!$cfg['native_i18n']) {
-            return htmlentities(self::emulateGettext($string, $domain));
+            return self::emulateGettext($string, $domain);
        }

        // Try to use native gettext implementation
--- a/conlite/classes/class.inuse.php
+++ b/conlite/classes/class.inuse.php
@ -255,7 +255,7 @@ class InUseCollection extends ItemCollection
                }

                if (!is_object($notification)) {
-                    $notification = new Contenido_Notification;
+                    $notification = new Contenido_Notification();
                }

                $noti = $notification->messageBox("warning", $message.$override, 0);
@ -293,6 +293,4 @@ class InUseItem extends Item
            $this->loadByPrimaryKey($mId);
        }
    }
-}
-
-?>
+}
--- a/conlite/classes/class.search.php
+++ b/conlite/classes/class.search.php
@ -225,13 +225,13 @@ class Index extends SearchBaseAbstract {
     *
     * @var array
     */
-    var $cms_type = array();
+    protected static $_cms_type = [];

    /**
     * the suffix of all available cms types
     * @var array
     */
-    var $cms_type_suffix = array();
+    protected static $_cms_type_suffix = [];

    /**
     * Constructor, set object properties
@ -270,6 +270,8 @@ class Index extends SearchBaseAbstract {
            $this->idart = $idart;
        }

+        $this->_debug('Start Index for ', $this->idart);
+
        $this->place = $place;
        $this->keycode = $aContent;
        $this->setStopwords($aStopwords);
@ -283,7 +285,14 @@ class Index extends SearchBaseAbstract {
        $old_keys = array_keys($this->keywords_old);

        $this->keywords_del = array_diff($old_keys, $new_keys);
-
+        /*
+          echo '<pre>';
+          print_r($new_keys);
+          print_r($old_keys);
+          print_r($this->keywords_del);
+          echo '</pre>';
+         * 
+         */
        if (count($this->keywords_del) > 0) {
            $this->deleteKeywords();
        }
@ -312,7 +321,7 @@ class Index extends SearchBaseAbstract {
            foreach ($this->keycode as $idtype => $data) {
                if ($this->checkCmsType($idtype)) {
                    foreach ($data as $typeid => $code) {
-                        $this->_debug('code', $code);
+                        $this->_debug('createKeywords: raw code from data array', $code);

                        $code = stripslashes($code); // remove backslash
                        $code = str_ireplace(array('<br>', '<br />'), "\n", $code); // replace HTML line breaks with newlines
@ -320,13 +329,18 @@ class Index extends SearchBaseAbstract {
                        if (strlen($code) > 0) {
                            $code = clHtmlEntityDecode($code);
                        }
-                        $this->_debug('code', $code);
+                        $this->_debug('createKeywords: code after clean', $code);

                        $tmp_keys = preg_split('/[\s,]+/', trim($code)); // split content by any number of commas or space characters
-                        $this->_debug('tmp_keys', $tmp_keys);
+                        $this->_debug('createKeywords: tmp_keys', $tmp_keys);

                        foreach ($tmp_keys as $value) {
                            $value = strtolower($value); // index terms are stored with lower case
+                            $value = preg_replace('/[^\w]+/u', '', $value);
+
+                            if (empty(trim($value))) {
+                                continue;
+                            }

                            if (!in_array($value, $this->stopwords)) {
                                // eliminate stopwords
@ -335,6 +349,7 @@ class Index extends SearchBaseAbstract {
                                if (strlen($value) > 1) {
                                    // do not index single characters
                                    $this->keywords[$value] = $this->keywords[$value] . $idtype . '-' . $typeid . ' ';
+                                    $this->_debug('createKeywords: entry array keywords', $this->keywords);
                                }
                            }
                        }
@ -345,7 +360,7 @@ class Index extends SearchBaseAbstract {
            }
        }

-        $this->_debug('keywords', $this->keywords);
+        $this->_debug('createKeywords: keywords returned', $this->keywords);
    }

    /**
@ -357,9 +372,10 @@ class Index extends SearchBaseAbstract {
        $tmp_count = array();

        foreach ($this->keywords as $keyword => $count) {
+            $bProceed = true;
+            $this->_debug('keyword', $keyword);
            $tmp_count = preg_split('/[\s]/', trim($count));
            $this->_debug('tmp_count', $tmp_count);
-
            $occurrence = count($tmp_count);
            $tmp_count = array_unique($tmp_count);
            $cms_types = implode(',', $tmp_count);
@ -376,8 +392,12 @@ class Index extends SearchBaseAbstract {
                            ('" . Contenido_Security::escapeDB($keyword, $this->db) . "', '" . Contenido_Security::escapeDB($index_string, $this->db) . "', " . Contenido_Security::toInteger($this->lang) . ", " . Contenido_Security::toInteger($nextid) . ")";
            } else {
                // if keyword allready exists, create new index_string
-                if (preg_match("/&$this->idart=/", $this->keywords_old[$keyword])) {
-                    $index_string = preg_replace("/&$this->idart=[0-9]+\([\w-,]+\)/", $index_string, $this->keywords_old[$keyword]);
+                if (preg_match("/&" . $this->idart . "=/", $this->keywords_old[$keyword])) {
+                    $index_string = preg_replace("/&" . $this->idart . "=[0-9]+\([,\w-]+\)/", $index_string, $this->keywords_old[$keyword]);
+                    if ($index_string === $this->keywords_old[$keyword]) {
+                        $bProceed = false;
+                        $this->_debug('db update', 'no update needed');
+                    }
                } else {
                    $index_string = $this->keywords_old[$keyword] . $index_string;
                }
@ -386,9 +406,11 @@ class Index extends SearchBaseAbstract {
                        SET " . $this->place . " = '" . $index_string . "'
                        WHERE idlang='" . Contenido_Security::toInteger($this->lang) . "' AND keyword='" . Contenido_Security::escapeDB($keyword, $this->db) . "'";
            }
-            $this->_debug('sql', $sql);

-            $this->db->query($sql);
+            if ($bProceed) {
+                $this->_debug('sql', $sql);
+                $this->db->query($sql);
+            }
        }
    }

@ -431,7 +453,7 @@ class Index extends SearchBaseAbstract {
                    idlang=" . Contenido_Security::toInteger($this->lang) . "  AND
                    (keyword IN ('" . $keys . "')  OR " . $this->place . " REGEXP '&" . Contenido_Security::toInteger($this->idart) . "=')";

-        $this->_debug('sql', $sql);
+        $this->_debug('getKeywords: sql', $sql);

        $this->db->query($sql);

@ -440,6 +462,8 @@ class Index extends SearchBaseAbstract {
        while ($this->db->next_record()) {
            $this->keywords_old[$this->db->f('keyword')] = $this->db->f($place);
        }
+
+        $this->_debug('getKeywords: array keywords_old', $this->keywords_old);
    }

    /**
@ -448,6 +472,7 @@ class Index extends SearchBaseAbstract {
     * @return $key
     */
    function removeSpecialChars($key) {
+
        $aSpecialChars = array(
            "-", "_", "'", ".", "!", "\"", "#", "$", "%", "&", "(", ")", "*", "+", ",", "/",
            ":", ";", "<", "=", ">", "?", "@", "[", "\\", "]", "^", "`", "{", "|", "}", "~"
@ -461,6 +486,7 @@ class Index extends SearchBaseAbstract {
        // a client and should not be treated in this method.
        // modified 2007-10-01, H. Librenz - added as hotfix for encoding problems (doesn't find any words with
        //                                      umlaut vowels in it since you turn on UTF-8 as language encoding)
+
        $sEncoding = getEncodingByLanguage($this->db, $this->lang, $this->cfg);

        if (strtolower($sEncoding) != 'iso-8859-2') {
@ -486,6 +512,9 @@ class Index extends SearchBaseAbstract {
        $key = clHtmlEntityDecode($key);
        $key = str_replace($aSpecialChars, '', $key);

+        ini_set('mbstring.substitute_character', "none");
+        $key = mb_convert_encoding($key, 'UTF-8', 'UTF-8');
+
        return $key;
    }

@ -516,6 +545,21 @@ class Index extends SearchBaseAbstract {
        return $key;
    }

+    /**
+     * 
+     * @return array array with arrays of type and typesuffix
+     */
+    public function getContentTypes(): array {
+        if (empty(self::$_cms_type)) {
+            $this->setContentTypes();
+        }
+
+        return array(
+            'cms_type' => self::$_cms_type,
+            'cms_type_suffix' => self::$_cms_type_suffix
+        );
+    }
+
    /**
     * set the array of stopwords which should not be indexed
     * @param array $aStopwords
@ -537,8 +581,8 @@ class Index extends SearchBaseAbstract {
        $this->_debug('sql', $sql);
        $this->db->query($sql);
        while ($this->db->next_record()) {
-            $this->cms_type[$this->db->f('type')] = $this->db->f('idtype');
-            $this->cms_type_suffix[$this->db->f('idtype')] = substr($this->db->f('type'), 4, strlen($this->db->f('type')));
+            self::$_cms_type[$this->db->f('type')] = $this->db->f('idtype');
+            self::$_cms_type_suffix[$this->db->f('idtype')] = substr($this->db->f('type'), 4, strlen($this->db->f('type')));
        }
    }

@ -554,11 +598,11 @@ class Index extends SearchBaseAbstract {

                if (strlen($opt) > 0) {
                    if (!stristr($opt, 'cms_')) {
-                        if (in_array($opt, $this->cms_type_suffix)) {
+                        if (in_array($opt, $this->getContentTypes()['cms_type_suffix'])) {
                            $this->cms_options[$opt] = 'CMS_' . $opt;
                        }
                    } else {
-                        if (array_key_exists($opt, $this->cms_type)) {
+                        if (array_key_exists($opt, $this->getContentTypes()['cms_type'])) {
                            $this->cms_options[$opt] = $opt;
                        }
                    }
@ -788,8 +832,8 @@ class Search extends SearchBaseAbstract {

        $this->index = new Index($oDB);

-        $this->cms_type = $this->index->cms_type;
-        $this->cms_type_suffix = $this->index->cms_type_suffix;
+        $this->cms_type = $this->index->getContentTypes()['cms_type'];
+        $this->cms_type_suffix = $this->index->getContentTypes()['cms_type_suffix'];

        $this->search_option = (array_key_exists('db', $options)) ? strtolower($options['db']) : 'regexp';
        $this->search_combination = (array_key_exists('combine', $options)) ? strtolower($options['combine']) : 'or';
@ -1339,11 +1383,11 @@ class SearchResult extends SearchBaseAbstract {
        $cms_type = strtoupper($cms_type);
        if (strlen($cms_type) > 0) {
            if (!stristr($cms_type, 'cms_')) {
-                if (in_array($cms_type, $this->index->cms_type_suffix)) {
+                if (in_array($cms_type, $this->index->getContentTypes()['cms_type'])) {
                    $cms_type = 'CMS_' . $cms_type;
                }
            } else {
-                if (!array_key_exists($cms_type, $this->index->cms_type)) {
+                if (!array_key_exists($cms_type, $this->index->getContentTypes()['cms_type_suffix'])) {
                    return array();
                }
            }
--- a/conlite/classes/class.smtp.php
+++ b/conlite/classes/class.smtp.php
--- a/conlite/classes/class.update.notifier.php
+++ b/conlite/classes/class.update.notifier.php
@ -508,23 +508,47 @@ class Contenido_UpdateNotifier {
        $response = false;

        if ($this->_bUseCurl) {
-            if ($bCheckCon) {
-                $ch = $this->_checkCon2Host($sHost);
-            } else {
-                $ch = curl_init("http://" . $sHost);
-            }
-            if (is_resource($ch)) {
-                curl_setopt($ch, CURLOPT_URL, "http://" . $sHost . $sFile);
+            $sUrl = "https://" . $sHost . $sFile;
+            $ch = $this->_checkCon2Host($sUrl);
+
+            if ($ch !== false) {
                curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-                curl_setopt($ch, CURLOPT_HTTPHEADER, array('Connection: close'));
-                curl_setopt($ch, CURLOPT_TIMEOUT, 2);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+                curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
                $response = curl_exec($ch);
+
+                //Check for errors.
+                if (curl_errno($ch)) {
+                    throw new Exception(curl_error($ch));
+                }                
                curl_close($ch);
            }
+            /*
+              if ($bCheckCon) {
+              $ch = $this->_checkCon2Host($sHost);
+              } else {
+              $ch = curl_init("https://" . $sHost);
+              }
+              if (is_resource($ch)) {
+              curl_setopt($ch, CURLOPT_URL, "https://" . $sHost . $sFile);
+              curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+              curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+              curl_setopt($ch, CURLOPT_HTTPHEADER, array('Connection: close'));
+              curl_setopt($ch, CURLOPT_TIMEOUT, 2);
+              $response = curl_exec($ch);
+              curl_close($ch);
+              } */
        } else {
-            $source = file_get_contents("http://" . $sHost . $sFile);
-            if ($source !== false AND ! empty($source)) {
+            $arrContextOptions = array(
+                "ssl" => array(
+                    "verify_peer" => false,
+                    "verify_peer_name" => false,
+                )
+            );
+
+            $source = file_get_contents("https://" . $sHost . $sFile, false, stream_context_create($arrContextOptions));
+
+            if ($source !== false AND !empty($source)) {
                $response = $source;
            }
        }
@ -539,13 +563,12 @@ class Contenido_UpdateNotifier {
     * @param string $sHost 
     * @return obj|boolean curl object or false
     */
-    protected function _checkCon2Host($sHost) {
-        $ch = curl_init("http://" . $sHost);
-        if (!is_resource($ch)) {
+    protected function _checkCon2Host($sUrl) {
+        $ch = curl_init($sUrl);
+        if ($ch === false) {
            $sErrorMessage = i18n('Unable to check for updates!') . " "
                    . sprintf(i18n('Connection to %s failed!'), $sHost);
            $this->sErrorOutput = $this->renderOutput($sErrorMessage);
-            return false;
        }
        return $ch;
    }
@ -700,7 +723,7 @@ class Contenido_UpdateNotifier {
                if (strlen($sText) > 150) {
                    $sText = capiStrTrimAfterWord($sText, 150) . '...';
                }
-                 //echo $aItem->title;
+                //echo $aItem->title;
                $oTpl->set("d", "NEWS_DATE", $aItem->pubDate);
                $oTpl->set("d", "NEWS_TITLE", utf8_decode($aItem->title));
                $oTpl->set("d", "NEWS_TEXT", $sText);
--- a/conlite/classes/contenido/class.articlelanguage.php
+++ b/conlite/classes/contenido/class.articlelanguage.php
@ -1,4 +1,5 @@
 <?php
+
 /**
 * File:
 * class.articlelanguage.php
@ -18,14 +19,12 @@
 * 
 * $Id$
 */
-
 if (!defined('CON_FRAMEWORK')) {
    die('Illegal call');
 }

-
 class cApiArticleLanguageCollection extends ItemCollection {
-    
+
    public function __construct($select = false) {
        global $cfg;
        parent::__construct($cfg["tab"]["art_lang"], "idartlang");
@ -36,26 +35,26 @@ class cApiArticleLanguageCollection extends ItemCollection {
            $this->select($select);
        }
    }
-    
+
    public function getIdArtLang($iIdart, $iIdlang) {
        $this->setWhere('idart', Contenido_Security::toInteger($iIdart));
        $this->setWhere('idlang', Contenido_Security::toInteger($iIdlang));
-        if($this->query() && $this->count() > 0) {
+        if ($this->query() && $this->count() > 0) {
            return $this->next()->get('idartlang');
        }
        return false;
    }
+
 }

+class cApiArticleLanguage extends Item {

-class cApiArticleLanguage extends Item
-{
    /**
-     * Constructor Function
-     * @param  mixed  $mId  Specifies the ID of item to load
+     * 
+     * @global type $cfg
+     * @param type $mId
     */
-    public function __construct($mId = false)
-    {
+    public function __construct($mId = false) {
        global $cfg;
        parent::__construct($cfg["tab"]["art_lang"], "idartlang");
        $this->setFilters(array(), array());
@ -63,24 +62,23 @@ class cApiArticleLanguage extends Item
            $this->loadByPrimaryKey($mId);
        }
    }
-    
+
    public function loadByArticleAndLanguageId($idart, $idlang) {
        $result = true;
-        if (!$this->isLoaded()) {            
+        if (!$this->isLoaded()) {
            $idartlang = $this->_getIdArtLang($idart, $idlang);
            $result = $this->loadByPrimaryKey($idartlang);
        }
        return $result;
    }
-    
-    
+
    protected function _getIdArtLang($idart, $idlang) {
        $sql = sprintf('SELECT idartlang FROM `%s` WHERE idart = %d AND idlang = %d', cRegistry::getConfigValue('tab', 'art_lang'), $idart, $idlang);
        $this->db->query($sql);
        $this->db->next_record();
        return $this->db->f('idartlang');
    }
-    
+
    public function getContent($type = '', $id = NULL) {
        if (NULL === $this->content) {
            $this->_loadArticleContent();
@ -108,16 +106,16 @@ class cApiArticleLanguage extends Item
        // return String
        return (isset($this->content[$type][$id])) ? $this->content[$type][$id] : '';
    }
-    
+
    protected function _loadArticleContent() {
        if (NULL !== $this->content) {
            return;
        }

-        $sql = "SELECT b.type, a.typeid, a.value FROM `".cRegistry::getConfigValue('tab', 'content')
-                ."` AS a, `".cRegistry::getConfigValue('tab', 'type')
-                ."` AS b WHERE a.idartlang = ".$this->get('idartlang')
-                ." AND b.idtype = a.idtype ORDER BY a.idtype, a.typeid";
+        $sql = "SELECT b.type, a.typeid, a.value FROM `" . cRegistry::getConfigValue('tab', 'content')
+                . "` AS a, `" . cRegistry::getConfigValue('tab', 'type')
+                . "` AS b WHERE a.idartlang = " . $this->get('idartlang')
+                . " AND b.idtype = a.idtype ORDER BY a.idtype, a.typeid";

        $this->db->query($sql);

@ -126,5 +124,7 @@ class cApiArticleLanguage extends Item
            $this->content[strtolower($this->db->f('type'))][$this->db->f('typeid')] = urldecode($this->db->f('value'));
        }
    }
+
 }
+
 ?>
--- a/conlite/classes/contenido/class.category.php
+++ b/conlite/classes/contenido/class.category.php
@ -52,6 +52,4 @@ class cApiCategory extends Item {
        }
    }

-}
-
-?>
+}
--- a/conlite/classes/template/class.template.php
+++ b/conlite/classes/template/class.template.php
@ -209,7 +209,11 @@ class Template {
        if (!is_file($template)) {
            $content = & $template; //template is a string (it is a reference to save memory!!!)
        } else {
-            $content = implode("", file($template)); //template is a file
+            if(cFileHandler::readable($template)) {
+                $content = implode("", file($template)); //template is a file
+            } else {
+                return $template;
+            }
        }

        $content = (($note) ? "<!-- Generated by ConLite " . $cfg['version'] . "-->\n" : "") . $content;
--- a/conlite/classes/widgets/class.widgets.page.php
+++ b/conlite/classes/widgets/class.widgets.page.php
@ -320,8 +320,12 @@ class cPage extends cHTML {
        }

        $meta = '';
-        if ($this->_encoding != "" && !$this->_isHtml5) {
-            $meta .= '<meta http-equiv="Content-type" content="text/html;charset=' . $this->_encoding . '">' . "\n";
+        if(!empty($this->_encoding)) {
+            if($this->_isHtml5) {
+                $meta .= '<meta charset="' . $this->_encoding . '">' . "\n";
+            } else {
+                $meta .= '<meta http-equiv="Content-type" content="text/html;charset=' . $this->_encoding . '">' . "\n";
+            }
        }

        if ($this->_object !== false && method_exists($this->_object, "render")) {
--- a/conlite/external/backendedit/front_content.php
+++ b/conlite/external/backendedit/front_content.php
@ -92,7 +92,7 @@ if ($cfg["use_pseudocron"] == true) {
 * PHPLIB application development toolkit
 * @see http://sourceforge.net/projects/phplib
 */
-if (!empty($contenido)) {
+if (isset($contenido)) {
    //Backend
    page_open(array('sess' => 'Contenido_Session', 'auth' => 'Contenido_Challenge_Crypt_Auth', 'perm' => 'Contenido_Perm'));
    i18nInit($cfg["path"]["contenido"] . $cfg["path"]["locale"], $belang);
@ -130,9 +130,6 @@ if (isset($_GET['action']) && $_GET['action'] == 'get_compressed') {
    exit();
 }

-// Call hook after plugins are loaded, added by Murat Purc, 2008-09-07
-CEC_Hook::execute('Contenido.Frontend.AfterLoadPlugins');
-
 if (!isset($encoding) || !is_array($encoding) || count($encoding) == 0) {
    // get encodings of all languages
    $encoding = array();
@ -241,7 +238,7 @@ $errsite = 'Location: ' . Contenido_Url::getInstance()->buildRedirect($aParams);
 * Note: These variables can be set via http globals e.g. front_content.php?idcat=41&idart=34&idcatart=35&idartlang=42
 * If not the values will be computed.
 */
-if ($idart && !$idcat && !$idcatart) {
+if (!empty($idart) && empty($idcat) && empty($idcatart)) {
    /* Try to fetch the first idcat */
    $sql = "SELECT idcat FROM " . $cfg["tab"]["cat_art"] . " WHERE idart = '" . Contenido_Security::toInteger($idart) . "'";
    $db->query($sql);
@ -410,7 +407,7 @@ if ($cfg["cache"]["disable"] != '1') {
 * The reason is to avoid cross-site scripting errors in the backend, if the backend domain differs from
 * the frontend domain.
 */
-if ($contenido) {
+if (isset($contenido)) {
    $perm->load_permissions();

    /* Change mode edit / view */
@ -533,7 +530,7 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
 ##############################################

    /* Mark submenuitem 'Preview' in the Contenido Backend (Area: Contenido --> Articles --> Preview) */
-    if ($contenido) {
+    if (isset($contenido)) {
        $markscript = markSubMenuItem(4, true);
    }

@ -610,9 +607,11 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
    /* If article is in use, display notification */
    if (!empty($sHtmlInUseCss) && !empty($sHtmlInUseMessage)) {
        $code = preg_replace("/<\/head>/i", "$sHtmlInUseCss\n</head>", $code, 1);
-        $code = preg_replace("/(<body[^>]*)>/i", "\${1}> \n $sHtmlInUseMessage", $code, 1);
+        if(!preg_match("/(<body[^>]*)>.*/i", $code)) {
+            $code = preg_replace("/(<body[^>]*)>/i", "\${1}> \n $sHtmlInUseMessage", $code, 1);
+            $bInUseSet = true;
+        }
    }
-
    /* Check if category is public */
    $sql = "SELECT public FROM " . $cfg["tab"]["cat_lang"] . " WHERE idcat='" . Contenido_Security::toInteger($idcat) . "' AND idlang='" . Contenido_Security::toInteger($lang) . "'";

@ -651,7 +650,7 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
                             WHERE B.name = 'front_allow' AND C.name = 'str' AND A.user_id = '" . Contenido_Security::escapeDB($user_id, $db2) . "' AND A.idcat = '" . Contenido_Security::toInteger($idcat) . "'
                                    AND A.idarea = C.idarea AND B.idaction = A.idaction";

-                    $db2 = new DB_ConLite;
+                    $db2 = new DB_ConLite();
                    $db2->query($sql);

                    if ($db2->num_rows() > 0) {
@ -795,12 +794,16 @@ if (empty($inUse) && (isset($allow) && $allow == true) && $view == "edit" && ($p
            if (in_array(Contenido_Security::toInteger($idart), $aExclude)) {
                eval("?>\n" . $code . "\n<?php\n");
            } else {
+                chdir($cfgClient[$client]["path"]["frontend"]);
                // write html output into output buffer and assign it to an variable
                ob_start();
                eval("?>\n" . $code . "\n<?php\n");
                $htmlCode = ob_get_contents();
                ob_end_clean();
-
+                
+                if(!empty($sHtmlInUseMessage) && empty($bInUseSet)) {
+                    $htmlCode = preg_replace("/(<body[^>]*)>/i", "\${1}> \n $sHtmlInUseMessage", $htmlCode, 1);
+                }
                // process CEC to do some preparations before output
                $htmlCode = CEC_Hook::executeAndReturn('Contenido.Frontend.HTMLCodeOutput', $htmlCode);

--- a/conlite/external/phpmailer/phpmailer/COMMITMENT
+++ b/conlite/external/phpmailer/phpmailer/COMMITMENT
@ -0,0 +1,46 @@
+GPL Cooperation Commitment
+Version 1.0
+
+Before filing or continuing to prosecute any legal proceeding or claim
+(other than a Defensive Action) arising from termination of a Covered
+License, we commit to extend to the person or entity ('you') accused
+of violating the Covered License the following provisions regarding
+cure and reinstatement, taken from GPL version 3. As used here, the
+term 'this License' refers to the specific Covered License being
+enforced.
+
+    However, if you cease all violation of this License, then your
+    license from a particular copyright holder is reinstated (a)
+    provisionally, unless and until the copyright holder explicitly
+    and finally terminates your license, and (b) permanently, if the
+    copyright holder fails to notify you of the violation by some
+    reasonable means prior to 60 days after the cessation.
+
+    Moreover, your license from a particular copyright holder is
+    reinstated permanently if the copyright holder notifies you of the
+    violation by some reasonable means, this is the first time you
+    have received notice of violation of this License (for any work)
+    from that copyright holder, and you cure the violation prior to 30
+    days after your receipt of the notice.
+
+We intend this Commitment to be irrevocable, and binding and
+enforceable against us and assignees of or successors to our
+copyrights.
+
+Definitions
+
+'Covered License' means the GNU General Public License, version 2
+(GPLv2), the GNU Lesser General Public License, version 2.1
+(LGPLv2.1), or the GNU Library General Public License, version 2
+(LGPLv2), all as published by the Free Software Foundation.
+
+'Defensive Action' means a legal proceeding or claim that We bring
+against you in response to a prior proceeding or claim initiated by
+you or your affiliate.
+
+'We' means each contributor to this repository as of the date of
+inclusion of this file, including subsidiaries of a corporate
+contributor.
+
+This work is available under a Creative Commons Attribution-ShareAlike
+4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
--- a/conlite/external/phpmailer/phpmailer/README.md
+++ b/conlite/external/phpmailer/phpmailer/README.md
@ -0,0 +1,230 @@
+[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://supportukrainenow.org/)
+
+![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
+
+# PHPMailer – A full-featured email creation and transfer class for PHP
+
+[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions)
+[![codecov.io](https://codecov.io/gh/PHPMailer/PHPMailer/branch/master/graph/badge.svg?token=iORZpwmYmM)](https://codecov.io/gh/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)
+[![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
+[![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer/badge)](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer)
+
+## 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 SMTPS and SMTP+STARTTLS transports
+- Validates email addresses automatically
+- Protects against header injection attacks
+- Error messages in over 50 languages!
+- DKIM and S/MIME signing support
+- Compatible with PHP 5.5 and later, including PHP 8.2
+- Namespaced to prevent name clashes
+- Much more!
+
+## Why you might need it
+Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
+
+Formatting email correctly is surprisingly difficult. There are myriad overlapping (and conflicting) standards, 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, if not unsafe!
+
+The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP client allows email sending on all platforms without needing a local mail server. Be aware though, that the `mail()` function should be avoided when possible; it's both faster and [safer](https://exploitbox.io/paper/Pwning-PHP-Mail-Function-For-Fun-And-RCE.html) to use SMTP to localhost.
+
+*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](https://swiftmailer.symfony.com/)
+, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
+
+## License
+This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/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](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
+
+```json
+"phpmailer/phpmailer": "^6.8.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, you
+can [download PHPMailer as a zip file](https://github.com/PHPMailer/PHPMailer/archive/master.zip), (note that docs and examples are not included in the zip file), then 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. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
+
+## Legacy versions
+PHPMailer 5.2 (which is compatible with PHP 5.0 — 7.0) is no longer supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
+
+### 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.
+
+### 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 (*very* unlikely!), 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\SMTP;
+use PHPMailer\PHPMailer\Exception;
+
+//Load Composer's autoloader
+require 'vendor/autoload.php';
+
+//Create an instance; passing `true` enables exceptions
+$mail = new PHPMailer(true);
+
+try {
+    //Server settings
+    $mail->SMTPDebug = SMTP::DEBUG_SERVER;                      //Enable verbose debug output
+    $mail->isSMTP();                                            //Send using SMTP
+    $mail->Host       = 'smtp.example.com';                     //Set the SMTP server to send through
+    $mail->SMTPAuth   = true;                                   //