From 8909189c9178035c016ae5675659498b5dcac8bd Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Wed, 26 Apr 2023 14:52:05 +0200
Subject: [PATCH 1/8] gitadmin

---
 .idea/php.xml       |  30 ++++++
 .idea/vcs.xml       |  11 +++
 .idea/workspace.xml | 236 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 277 insertions(+)
 create mode 100644 .idea/php.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..838093b
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/conlite/vendor/phpmailer/phpmailer" />
+      <path value="$PROJECT_DIR$/conlite/vendor/composer" />
+      <path value="$PROJECT_DIR$/conlite/vendor/rector/rector" />
+      <path value="$PROJECT_DIR$/conlite/vendor/phpstan/phpstan" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..de13053
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/cms/data/modules/cl_contactform" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/cms/securimage" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/conlite/plugins/cl-content-allocation" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/conlite/plugins/cl-mod-rewrite" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/conlite/plugins/cl-newsletter" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..aeb022b
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="8eedb38c-41ce-4f3c-a016-df6a207a4233" name="Changes" comment="gitadmin" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ComposerConfigs">
+    <option name="configs">
+      <option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/composer.json" />
+      <option value="$PROJECT_DIR$/conlite/external/rector/rector/composer.json" />
+      <option value="$PROJECT_DIR$/conlite/external/phpstan/phpstan/composer.json" />
+      <option value="$PROJECT_DIR$/conlite/external/symfony/options-resolver/composer.json" />
+      <option value="$PROJECT_DIR$/cms/securimage/composer.json" />
+    </option>
+  </component>
+  <component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
+    <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
+    <execution>
+      <executable path="composer" />
+    </execution>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="dev_php82" />
+        <entry key="$PROJECT_DIR$/cms/secureimage" value="master" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="/usr/bin/php">
+    <include_path>
+      <path value="$PROJECT_DIR$/conlite/vendor/phpmailer/phpmailer" />
+      <path value="$PROJECT_DIR$/conlite/vendor/composer" />
+      <path value="$PROJECT_DIR$/conlite/vendor/rector/rector" />
+      <path value="$PROJECT_DIR$/conlite/vendor/phpstan/phpstan" />
+    </include_path>
+  </component>
+  <component name="ProjectId" id="2OsnK7aTqPj8IgMHzGyLAOICLU1" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/var/www/html/clphp8/cms/data/modules/cl_contactform/php&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/cms/data/modules/cl_contactform/php" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Rector.cl_contactform_output.php">
+    <configuration name="cl_contactform_output.php" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/cl_contactform/php/cl_contactform_output.php" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/cl_contactform/php/cl_contactform_output.php" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <method v="2" />
+    </configuration>
+    <configuration name="xtcdynspryform0.9.2" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <method v="2" />
+    </configuration>
+    <configuration name="xtcdynspryform0.9.2_input.php" type="RectorRunConfigurationType" factoryName="RectorRunConfigurationType" temporary="true" nameIsGenerated="true">
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2/php/xtcdynspryform0.9.2_input.php" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <option name="pathsToProcess">
+        <list>
+          <option value="$PROJECT_DIR$/cms/data/modules/xtcdynspryform0.9.2/php/xtcdynspryform0.9.2_input.php" />
+        </list>
+      </option>
+      <option name="rectorConfigPath" value="$PROJECT_DIR$/rector.php" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Rector.cl_contactform_output.php" />
+        <item itemvalue="Rector.xtcdynspryform0.9.2_input.php" />
+        <item itemvalue="Rector.xtcdynspryform0.9.2" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="8eedb38c-41ce-4f3c-a016-df6a207a4233" name="Changes" comment="" />
+      <created>1682358089636</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1682358089636</updated>
+      <workItem from="1682358110742" duration="8528000" />
+      <workItem from="1682512199591" duration="40000" />
+      <workItem from="1682512266209" duration="329000" />
+      <workItem from="1682512610923" duration="100000" />
+      <workItem from="1682512717674" duration="523000" />
+    </task>
+    <task id="LOCAL-00001" summary="move composer vendor folder">
+      <created>1682442332378</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1682442332378</updated>
+    </task>
+    <task id="LOCAL-00002" summary="add rector.php">
+      <created>1682442467699</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1682442467700</updated>
+    </task>
+    <task id="LOCAL-00003" summary="gitadmin">
+      <created>1682442642783</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1682442642783</updated>
+    </task>
+    <task id="LOCAL-00004" summary="updates for php8">
+      <created>1682445298959</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1682445298959</updated>
+    </task>
+    <task id="LOCAL-00005" summary="documentation and cleaning code">
+      <created>1682445879204</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1682445879204</updated>
+    </task>
+    <task id="LOCAL-00006" summary="add module package xml">
+      <created>1682446236100</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1682446236100</updated>
+    </task>
+    <task id="LOCAL-00007" summary="updated doc-blocks and module package">
+      <created>1682446918410</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1682446918410</updated>
+    </task>
+    <task id="LOCAL-00008" summary="gitadmin">
+      <created>1682450834252</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1682450834252</updated>
+    </task>
+    <task id="LOCAL-00009" summary="gitadmin">
+      <created>1682513087275</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1682513087275</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="move composer vendor folder" />
+    <MESSAGE value="add rector.php" />
+    <MESSAGE value="updates for php8" />
+    <MESSAGE value="documentation and cleaning code" />
+    <MESSAGE value="add module package xml" />
+    <MESSAGE value="updated doc-blocks and module package" />
+    <MESSAGE value="gitadmin" />
+    <option name="LAST_COMMIT_MESSAGE" value="gitadmin" />
+  </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
+</project>
\ No newline at end of file

From 0de29ea0b62750625cc1c4a79d178bee959dda07 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Tue, 4 Jul 2023 16:37:19 +0200
Subject: [PATCH 2/8] gitadmin

---
 .idea/.gitignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .idea/.gitignore

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

From 881a2476353278583fbd2a75104dfdd262bc6204 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Wed, 11 Oct 2023 17:13:28 +0200
Subject: [PATCH 3/8] settings

---
 .idea/php.xml                  | 45 ++++++++++++++++++++++++++++++++++
 .idea/phpunit.xml              | 11 +++++++++
 .idea/vcs.xml                  |  7 ++++++
 conlite/plugins/cl-mod-rewrite |  2 +-
 4 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 .idea/php.xml
 create mode 100644 .idea/phpunit.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/php.xml b/.idea/php.xml
new file mode 100644
index 0000000..c99a098
--- /dev/null
+++ b/.idea/php.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MessDetectorOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCSFixerOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PHPCodeSnifferOptionsConfiguration">
+    <option name="highlightLevel" value="WARNING" />
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/conlite/external/phpqrcode/bindings" />
+      <path value="$PROJECT_DIR$/conlite/external/phpqrcode/tools" />
+      <path value="$PROJECT_DIR$/conlite/external/edit_area/plugins" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/cache" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/images" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/css" />
+      <path value="$PROJECT_DIR$/conlite/external/composer" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/data" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/upload" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/templates" />
+      <path value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer" />
+      <path value="$PROJECT_DIR$/conlite/external/edit_area/langs" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/js" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/includes" />
+      <path value="$PROJECT_DIR$/conlite/external/wysiwyg/tinymce3" />
+      <path value="$PROJECT_DIR$/conlite/external/edit_area/images" />
+      <path value="$PROJECT_DIR$/conlite/external/edit_area/reg_syntax" />
+      <path value="$PROJECT_DIR$/conlite/external/frontend/logs" />
+      <path value="$PROJECT_DIR$/conlite/external/endroid/qr-code" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+    <option name="suggestChangeDefaultLanguageLevel" value="false" />
+  </component>
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
new file mode 100644
index 0000000..ebec75a
--- /dev/null
+++ b/.idea/phpunit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PHPUnit">
+    <option name="directories">
+      <list>
+        <option value="$PROJECT_DIR$/conlite/external/phpmailer/phpmailer/tests" />
+        <option value="$PROJECT_DIR$/conlite/external/endroid/qr-code/tests" />
+      </list>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..ddb69a7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/conlite/plugins/cl-mod-rewrite" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/conlite/plugins/cl-mod-rewrite b/conlite/plugins/cl-mod-rewrite
index 91b0fd8..606b832 160000
--- a/conlite/plugins/cl-mod-rewrite
+++ b/conlite/plugins/cl-mod-rewrite
@@ -1 +1 @@
-Subproject commit 91b0fd8c15cdf1b5e9704c8720a40f959e7eb4fe
+Subproject commit 606b832ce8926ac51d5d4605a9ebb32c0e1745ad

From 63fb94db39ea06928ce2271b5b904b8d3222d28a Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Thu, 12 Oct 2023 14:44:25 +0200
Subject: [PATCH 4/8] cleanup README.md

---
 .idea/php.xml |  2 +-
 README.md     | 49 +++++++++++++++++++++++++------------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.idea/php.xml b/.idea/php.xml
index c99a098..8894fa4 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -33,7 +33,7 @@
       <path value="$PROJECT_DIR$/conlite/external/endroid/qr-code" />
     </include_path>
   </component>
-  <component name="PhpProjectSharedConfiguration" php_language_level="8.0">
+  <component name="PhpProjectSharedConfiguration" php_language_level="7.4">
     <option name="suggestChangeDefaultLanguageLevel" value="false" />
   </component>
   <component name="PhpStanOptionsConfiguration">
diff --git a/README.md b/README.md
index 58ca2d4..7252454 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
-----------------------------------------------------------------------------------------------------
-This is the readme file for ConLite 2.2.0 beta
+This is the readme file for **ConLite 2.1.3**
 
 Any help you need you may find by visiting the following links.
 
-CL-Portal http//conlite.org
-CL-Forum http://forum.conlite.org
-CL-Bugtracker http://bugs.conlite.org
-CL-API-Doc http://conlite.conrepo.org/api/4.8.16CL
+* CL-Portal [https//conlite.org](https//conlite.org)
+* CL-Forum [http://forum.conlite.org](http://forum.conlite.org)
+* CL-Bugtracker [https://gitport.de/ConLite/ConLite/issues](https://gitport.de/ConLite/ConLite/issues)
+* CL-API-Doc [http://conlite.conrepo.org/api/4.8.16CL](http://conlite.conrepo.org/api/4.8.16CL)
+
+### !!! Attention !!!
 
-!!! Attention !!!
 We tried to fix all known bugs of Contenido 4.8 and earlier but cannot give any garanties for that. So use 
 it on your own risk. If you find any bug or have any idea to enhance ConLite, feel free to visit our 
-bugtracker and register at http://bugs.conlite.org
+bugtracker at [https://gitport.de/ConLite/ConLite/issues](https://gitport.de/ConLite/ConLite/issues)
 Any help and ideas are welcome :)
 
-** Mini FAQ **
+### Mini FAQ
 
-What is ConLite?
+#### What is ConLite?
 
 CL (short for ConLite) is dedicated to close the gap between Contenido 4.8 and the version 4.10.
 In downloadable 4.8.20 (and former 4.8.15) are still a lot of bugs and some missing feautures and 
@@ -24,7 +24,7 @@ enhancements so one cannot use the version without problems. Our goal is to give
 really stable version of Contenido till the 4.9 or 4.10 is stable. By the way, there are still a lot of big sides 
 build with 4.8.x out there where upgrading to 4.10.x is not possible or cost a lot of money.
 
-Why i have to use ConLite?
+#### Why i have to use ConLite?
 
 You don't have to, but feel free to do it. ConLite will show you an easier way to upgrade step by step to Contenido 
 4.10. The new version of Contenido has a lot of changes, so you have to do a lot of work
@@ -33,14 +33,14 @@ do in the future. ConLite will do changes step by step, or better version by ver
 4.8.x or higher installation to work with the new 4.9 of Contenido. And ConLite will try to give you a 
 stable and bugfixed Content-Management-System in the future.
 
-Who are the people behind ConLite?
+#### Who are the people behind ConLite?
 
 The Team behind the CL-version are some well known guys from CONTENIDO-forum, working since many years with
 and within CONTENIDO core or coding modules and plugins for CONTENIDO. 
 And we love CONTENIDO :)
 
 
-** Copyright **
+### Copyright 
 
 The copyright for the code of CONTENIDO still remains to 4fb and the named coders for all codes coming 
 from 4.8.15 and/or from svn- or git-repository of CONTENDIO.
@@ -48,27 +48,28 @@ All ads, enhancements or new parts, coded by the CL-Team are copyright by their
 by CL-Team and conlite.org.
 
 
-** Know Bugs **
+### Know Bugs
 FS#25 - Collision with pre-installed AMR after Migration
     !!! Attention !!!
     If you want to upgrade with an installed AMR-plugin, uninstall AMR before upgrade.
     We will include a fix for that in one of the next versions of CL
 
+### History / Changelog
+**ConLite 2.1.3**
 
-** History / Changelog **
-ConLite 2.2.0 beta
+**ConLite 2.1.2**
 
-ConLite 2.1.3
-ConLite 2.1.2
-ConLite 2.1.1
-ConLite 2.1.0
-* see https://gitport.de/ConLite/ConLite/milestones
+**ConLite 2.1.1**
 
-ConLite 2.0
-ConLite 1.0
+**ConLite 2.1.0**
+* see [https://gitport.de/ConLite/ConLite/milestones](https://gitport.de/ConLite/ConLite/milestones)
+
+**ConLite 2.0**
+
+**ConLite 1.0**
 * old svn history lost
 
-CONTENIDO 4.8.16 CL
+**CONTENIDO 4.8.16 CL**
 *    20  Bug Report      genericdb: urlencode() expects parameter 1 to be string ...
 *    16  Enhancement     RSS-Reader austauschen/überarbeiten
 *    31  Optimization    Test CL installation with newest PHP and SQL on XAMPP

From 4debd1559bb3d210f279fde42ea2508aae829b2f Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Thu, 12 Oct 2023 14:45:11 +0200
Subject: [PATCH 5/8] fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7252454..e0ee86d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ This is the readme file for **ConLite 2.1.3**
 
 Any help you need you may find by visiting the following links.
 
-* CL-Portal [https//conlite.org](https//conlite.org)
+* CL-Portal [https://conlite.org](https://conlite.org)
 * CL-Forum [http://forum.conlite.org](http://forum.conlite.org)
 * CL-Bugtracker [https://gitport.de/ConLite/ConLite/issues](https://gitport.de/ConLite/ConLite/issues)
 * CL-API-Doc [http://conlite.conrepo.org/api/4.8.16CL](http://conlite.conrepo.org/api/4.8.16CL)

From c883bd206005b5bd1ef4ca24b5766c76625298ef Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Thu, 12 Oct 2023 14:55:33 +0200
Subject: [PATCH 6/8] config defines.php for 2.1.3

---
 setup/lib/defines.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/lib/defines.php b/setup/lib/defines.php
index 9eb0ec5..b9af3a4 100644
--- a/setup/lib/defines.php
+++ b/setup/lib/defines.php
@@ -38,5 +38,5 @@ define('C_SETUP_STEPFILE_ACTIVE', 'images/steps/s%da.png');
 define('C_SETUP_STEPWIDTH', 28);
 define('C_SETUP_STEPHEIGHT', 28);
 define('C_SETUP_MIN_PHP_VERSION', '7.4.0');
-define('C_SETUP_MAX_PHP_VERSION', '8.2.0');
-define('C_SETUP_VERSION', '2.2.0 beta');
+define('C_SETUP_MAX_PHP_VERSION', '8.0.0');
+define('C_SETUP_VERSION', '2.1.3');

From 8987db8e694997eb6e29b749b0e0d9528d7dbd57 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Thu, 12 Oct 2023 15:18:03 +0200
Subject: [PATCH 7/8] ide conf

---
 .idea/dataSources.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .idea/dataSources.xml

diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..a2b5907
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="dev_clphp74@localhost" uuid="e4a121a5-564c-40f5-b527-e0a343539f90">
+      <driver-ref>mariadb</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mariadb://localhost:3306/dev_clphp74</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>
\ No newline at end of file

From 23538e80bb55960f3ffa1a794bf97a85a21bbcf4 Mon Sep 17 00:00:00 2001
From: "o.pinke" <o.pinke@conlite.org>
Date: Sat, 14 Oct 2023 17:03:16 +0200
Subject: [PATCH 8/8] #43 - fixed

---
 conlite/classes/template/class.template.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/conlite/classes/template/class.template.php b/conlite/classes/template/class.template.php
index 8004a23..9f474c2 100644
--- a/conlite/classes/template/class.template.php
+++ b/conlite/classes/template/class.template.php
@@ -184,7 +184,6 @@ class Template {
         global $cCurrentModule;
 
         $cfg = cRegistry::getConfig();
-        $aCfgClient = cRegistry::getClientConfig(cRegistry::getClientId());
         $bModTplUsed = FALSE;
 
         if (isset($cCurrentModule) && $cfg['dceModEdit']['use']) {
@@ -201,8 +200,8 @@ class Template {
             }
         }
 
-        if (is_file("templates/" . $template) && !$bModTplUsed) {
-            $template = "templates/" . $template;
+        if (is_file(cRegistry::getFrontendPath() . "templates/" . $template) && !$bModTplUsed) {
+            $template = cRegistry::getFrontendPath() . "templates/" . $template;
         }
 
         //check if the template is a file or a string