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 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 @@ + + + + + mariadb + true + org.mariadb.jdbc.Driver + jdbc:mariadb://localhost:3306/dev_clphp74 + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml index 838093b..8894fa4 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -12,13 +12,28 @@ - - - - + + + + + + + + + + + + + + + + + + + - + 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 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index de13053..ddb69a7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,10 +2,6 @@ - - - - \ No newline at end of file diff --git a/README.md b/README.md index 58ca2d4..e0ee86d 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 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 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 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');