fix #5, add default htaccess from mod_rewrite plugin

.htaccess

@@ -0,0 +1,61 @@
+################################################################################
+# ConLite AMR plugin simple rewrite rules set.
+#
+# Contains few easy to handle rewrite rules.
+#
+# @version    1.0.0
+# @author     Ortwin Pinke <ortwin.pinke@php-backoffice.de>
+# @author     Murat Purc <murat@purc.de>
+# @copyright  2019 ConLite Team
+# @link       http://www.conlite.org
+#
+# Versions before 1.0 copyright 4fb, author Murat Purc
+#
+# $Id: htaccess_simple.txt 145 2019-10-25 16:00:47Z oldperl $
+################################################################################
+
+#SetEnv CONLITE_ENVIRONMENT development
+
+<IfModule mod_rewrite.c>
+
+    # Enable rewrite engine
+    RewriteEngine on
+
+    # Specify a base URL-path for the rules
+    RewriteBase /cms
+
+    # Catch some common exploits in query string to get rid of them
+    # NOTE: Conditions to prevent protocols (ftp, http[s]) in query string could
+    #       be a disadvantage in some cases
+    RewriteCond %{QUERY_STRING} contenido_path=.*$  [NC,OR]
+    RewriteCond %{QUERY_STRING} cfg\[path\]=.*$  [NC,OR]
+    RewriteCond %{QUERY_STRING} _PHPLIB\[libdir\]=.*$  [NC,OR]
+    RewriteCond %{QUERY_STRING} (\<|%3C).*script.*(\>|%3E) [NC,OR]
+    RewriteCond %{QUERY_STRING} ftp://.*$  [NC,OR]
+    RewriteCond %{QUERY_STRING} http[s]*://.*$ [NC]
+    RewriteRule ^.* - [F,L]  # all matching conditions from above will end in nirvana
+
+    # Rewrite request to root to front_content.php
+    RewriteRule ^$ front_content.php [QSA,L]
+
+    # Exclude following request from rewriting
+    # tests for favicon.ico, valid symlinks (-s), not empty files (-l) and folders (-d)
+    RewriteCond %{REQUEST_URI} ^/favicon.ico$ [OR]
+    RewriteCond %{REQUEST_FILENAME} -s [OR]
+    RewriteCond %{REQUEST_FILENAME} -l [OR]
+    RewriteCond %{REQUEST_FILENAME} -d
+    RewriteRule ^.*$ - [NC,L]
+
+    # Pass other requests to front_content.php
+    RewriteRule ^.*$ front_content.php [QSA,NC,L]
+
+</IfModule>
+
+# Some rules to compress files.
+# NOTE: Following settings are not mod rewrite specific, but enabling mod_deflate
+#       for some file types can help to reduce bandwith.
+<IfModule mod_deflate.c>
+    <FilesMatch "\.(js|css|html|htm|php|xml)$">
+        SetOutputFilter DEFLATE
+    </FilesMatch>
+</IfModule>

setup/lib/defines.php

@@ -1,37 +1,18 @@
 <?php
+
 /**
- * defines.php
- * 
  * define needed var for conlite setup
  * 
- * 
  * @package ConLite
  * @subpackage Setup
- * @version $Rev$
+ * @version 1.0.0
- * @author 
+ * @author Ortwin Pinke <oldperl@ortwinpinke.de>
- * @license http://www.gnu.de/documents/gpl-3.0.de.html GNU General Public License (GPL)
+ * @author Murat Purc <murat@purc.de>
- * @link http://conlite.conrepo.org ConLite Portal
+ * @copyright (c) 2020, ConLite.org
+ * @license https://www.gnu.org/licenses/gpl-3.0.de.html GNU General Public License 3
+ * @link https://conlite.org ConLite Portal
+ * @since file available since contenido release <= 4.8.15
  * 
- * $Id$
- */
-
-/**
- * Project:
- * Contenido Content Management System
- *
- * Description:
- *
- * Requirements:
- * @con_php_req 5
- *
- *
- * @package    Contenido Setup
- * @version    0.2.1
- * @author     unknown
- * @copyright  four for business AG <www.4fb.de>
- * @license    http://www.contenido.org/license/LIZENZ.txt
- * @link       http://www.4fb.de
- * @link       http://www.contenido.org
  */
 
 if (!defined('CON_FRAMEWORK')) {
@@ -56,6 +37,6 @@ define('C_SETUP_STEPFILE', 'images/steps/s%d.png');
 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', '5.6');
+define('C_SETUP_MIN_PHP_VERSION', '7.2');
-define('C_SETUP_VERSION', '2.1.1');
+define('C_SETUP_MAX_PHP_VERSION', '7.4');
-?>
+define('C_SETUP_VERSION', '2.2.0');

setup/lib/startup.php

@@ -1,31 +1,25 @@
 <?php
+
 /**
- * Project:
+ * ConLite setup bootstrap file
- * Contenido Content Management System
+ * 
- *
+ * @package ConLite
- * Description:
+ * @subpackage Setup
- * Main Contenido setup bootstrap file.
+ * @version 1.0.0
- *
+ * @author Ortwin Pinke <oldperl@ortwinpinke.de>
- * Requirements:
+ * @author Murat Purc <murat@purc.de>
- * @con_php_req 5.0
+ * @copyright (c) 2020, ConLite.org
- *
+ * @license https://www.gnu.org/licenses/gpl-3.0.de.html GNU General Public License 3
- *
+ * @link https://conlite.org ConLite Portal
- * @package    Contenido setup bootstrap
+ * @since file available since contenido release <= 4.8.15
- * @version    0.0.1
+ * 
- * @author     Murat Purc <murat@purc.de>
- * @copyright  four for business AG <www.4fb.de>
- * @license    http://www.contenido.org/license/LIZENZ.txt
- * @link       http://www.4fb.de
- * @link       http://www.contenido.org
- * @since      file available since contenido release <= 4.8.15
- *
- *   $Id$
  */
 
 if (!defined('CON_FRAMEWORK')) {
     die('Illegal call');
 }
 define('CON_BE_PATH', '../conlite/');
+require_once 'defines.php';
 
 // uncomment this lines during development if needed
 error_reporting(E_ALL ^ E_NOTICE);
@@ -36,14 +30,14 @@ ini_set("error_log", "../data/logs/setup_errorlog.txt");
 header('Content-Type: text/html; charset=UTF-8');
 
 // Check php version
-if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+if (version_compare(PHP_VERSION, C_SETUP_MIN_PHP_VERSION, '<')) {
-    die("You need PHP >= 7.0.0 to install ConLite 2.1. Sorry, even the setup doesn't work otherwise. Your version: " . PHP_VERSION . "\n");
+    die("You need PHP >= " . C_SETUP_MIN_PHP_VERSION . " to install ConLite " . C_SETUP_VERSION . ". Sorry, even the setup doesn't work otherwise. Your version: " . PHP_VERSION . "\n");
 }
 
-// Check version
+$iVersionMax = substr(C_SETUP_MAX_PHP_VERSION, 0, strrpos(C_SETUP_MAX_PHP_VERSION, ".") + 1) . (1 + substr(C_SETUP_MAX_PHP_VERSION, strrpos(C_SETUP_MAX_PHP_VERSION, ".") + 1));
-//PHP >= 7.0.0 and < 7.4
+
-if (version_compare(PHP_VERSION, '7.4.0', '>=')) {
+if (!(version_compare($iVersionMax, PHP_VERSION, ">") && version_compare(C_SETUP_MAX_PHP_VERSION, PHP_VERSION, "<="))) {
-    die("You need PHP >= 7.0 and < 7.4 to install ConLite 2.1. Sorry, even the setup doesn't work otherwise. Your version: " . PHP_VERSION . "\n");
+    die("You need PHP >= " . C_SETUP_MIN_PHP_VERSION . " and <= " . C_SETUP_MAX_PHP_VERSION . " to install ConLite " . C_SETUP_VERSION . ". Sorry, even the setup doesn't work otherwise. Your version: " . PHP_VERSION . "\n");
 }
 
 
@@ -53,7 +47,7 @@ if (version_compare(PHP_VERSION, '7.4.0', '>=')) {
  * If you want to set a different enviroment value please define it in your .htaccess file
  * or in the server configuration.
  *
- * SetEnv CONTENIDO_ENVIRONMENT development
+ * SetEnv CONLITE_ENVIRONMENT development
  */
 if (!defined('CL_ENVIRONMENT')) {
     if (getenv('CONLITE_ENVIRONMENT')) {
@@ -80,13 +74,13 @@ Contenido_Security::checkRequests();
  */
 function checkAndInclude($filename) {
     if (file_exists($filename) && is_readable($filename)) {
-            require_once($filename);
+        require_once($filename);
     } else {
-            echo "<pre>";
+        echo "<pre>";
-            echo "Setup was unable to include neccessary files. The file $filename was not found. Solutions:\n\n";
+        echo "Setup was unable to include neccessary files. The file $filename was not found. Solutions:\n\n";
-            echo "- Make sure that all files are correctly uploaded to the server.\n";
+        echo "- Make sure that all files are correctly uploaded to the server.\n";
-            echo "- Make sure that include_path is set to '.' (of course, it can contain also other directories). Your include path is: ".ini_get("include_path")."\n"; 
+        echo "- Make sure that include_path is set to '.' (of course, it can contain also other directories). Your include path is: " . ini_get("include_path") . "\n";
-            echo "</pre>";
+        echo "</pre>";
     }
 }
 
@@ -97,6 +91,10 @@ $cfg['path']['frontend'] = CON_FRONTEND_PATH;
 $cfg['path']['conlite'] = $cfg['path']['frontend'] . '/conlite/';
 $cfg['path']['conlite_config'] = CON_FRONTEND_PATH . '/data/config/' . CL_ENVIRONMENT . '/';
 
+if(!is_dir($cfg['path']['conlite_config'])) {
+    die("Setup cannot find the config folder \"".$cfg['path']['conlite_config']."\"! Make shure folder exists and is readable.");
+}
+
 // (bool) Flag to use native i18n.
 //        Note: Enabling this could create unwanted side effects, because of
 //        native gettext() behavior.
@@ -106,7 +104,7 @@ session_start();
 
 // includes
 checkAndInclude('lib/defines.php');
-checkAndInclude($cfg['path']['frontend'].'/pear/HTML/Common2.php');
+checkAndInclude($cfg['path']['frontend'] . '/pear/HTML/Common2.php');
 checkAndInclude($cfg['path']['conlite'] . 'classes/cHTML5/class.chtml.php');
 checkAndInclude($cfg['path']['conlite'] . 'classes/class.htmlelements.php');
 checkAndInclude($cfg['path']['conlite'] . 'classes/con2con/class.filehandler.php');