Merge pull request #1422 from evolution-cms/3.x

Evo 3.0 RC3

Author: Dmi3yy

.gitignore

@@ -43,8 +43,14 @@
 !/assets/site/index.html
 !/assets/site/.htaccess
 
+# Core
+/core/composer.lock
+/core/vendor/bin
+/core/.install
+
 # Manager
 /manager/includes/config.inc.php
+/manager/media/style/default/css/styles.min.css
 
 # Composer
 /composer.phar
@@ -61,6 +67,9 @@ _ide_helper.php
 /node_modules
 npm-debug.log
 
+
+#docker
+/docker/nginx/logs/*
 # System
 ftpsync.settings
 Thumbs.db

.htaccess

@@ -0,0 +1,62 @@
+# For full documentation and other suggested options, please see
+# http://rtfm.modx.com/evolution/1.0/administration/friendly-url-solutions
+# including for unexpected logouts in multi-server/cloud environments
+# and especially for the first three commented out rules
+
+#php_flag register_globals Off
+AddDefaultCharset utf-8
+#php_value date.timezone Europe/Moscow
+
+#Options +FollowSymlinks
+RewriteEngine On
+RewriteBase /
+
+# Fix Apache internal dummy connections from breaking [(site_url)] cache
+RewriteCond %{HTTP_USER_AGENT} ^.*internal\ dummy\ connection.*$ [NC]
+RewriteRule .* - [F,L]
+
+#Remove ///// in url
+#RewriteCond %{REQUEST_URI} ^(.*)/{2,}(.*)$
+#RewriteRule . %1/%2 [R=301,L]
+
+#redirect http to https
+#RewriteCond %{HTTP:SSL} !=1 [NC]
+#RewriteRule ^(.*) https://%{SERVER_NAME}/$1 [L,R=301]
+#or
+#RewriteCond %{HTTPS} off
+#RewriteRule ^(.*) https://%{HTTP_HOST}%{REQUEST_URI}
+
+# Rewrite domain.com -> www.domain.com -- used with SEO Strict URLs plugin
+#RewriteCond %{HTTP_HOST} !^$
+#RewriteCond %{HTTP_HOST} !^www\. [NC]
+#RewriteCond %{HTTP_HOST} (.+)$
+#RewriteRule ^(.*)$ http://www.%1/$1 [R=permanent,L] .
+
+# without www
+#RewriteCond %{HTTP_HOST} .
+#RewriteCond %{HTTP_HOST} !^example\.com [NC]
+#RewriteRule (.*) http://example.com/$1 [R=301,L]
+
+# without www all domains
+#RewriteCond %{HTTP_HOST} .
+#RewriteCond %{HTTP_HOST} ^www.(.*)$ [NC]
+#RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+
+# 301 that removes index.php?q= from all urls
+#RewriteCond %{THE_REQUEST} \s/+index\.php\?&q=([^\s&]+) [NC]
+#RewriteRule ^ /%1? [R=301,L]
+#RewriteCond %{THE_REQUEST} \s/+index\.php\?q=([^\s&]+) [NC]
+#RewriteRule ^ /%1? [R=301,L]
+
+# Exclude /assets and /manager directories and images from rewrite rules
+RewriteRule ^(manager|assets|js|css|images|img)/.*$ - [L]
+RewriteRule \.(jpg|jpeg|png|gif|ico)$ - [L]
+
+# For Friendly URLs
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
+
+# Reduce server overhead by enabling output compression if supported.
+#php_flag zlib.output_compression On
+#php_value zlib.output_compression_level 5

.tx/config

@@ -11,13 +11,13 @@ lang_map = bg: bulgarian, cs: czech, da: danish, de: german, es: spanish-utf8, f
 
 [modx-evolution.countrylist]
 file_filter = manager/includes/lang/country/<lang>_country.inc.php
-source_file = manager/includes/lang/country/english_country.inc.php
+source_file = manager/includes/country/english_country.inc.php
 source_lang = en
 type = PHP_ALT_ARRAY
 
 [modx-evolution.manager]
-file_filter = manager/includes/lang/<lang>.inc.php
-source_file = manager/includes/lang/english.inc.php
+file_filter = manager/includes/<lang>.inc.php
+source_file = manager/includes/english.inc.php
 source_lang = en
 type = PHP_ALT_ARRAY
 

Dockerfile

@@ -0,0 +1,38 @@
+FROM php:7.2-fpm
+# Copy composer.lock and composer.json
+COPY composer.json /var/www/
+# Set working directory
+WORKDIR /var/www
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    libpng-dev \
+    libjpeg62-turbo-dev \
+    libfreetype6-dev \
+    locales \
+    zip \
+    jpegoptim optipng pngquant gifsicle \
+    vim \
+    unzip \
+    git \
+    curl
+# Clear cache
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+# Install extensions
+RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl
+RUN docker-php-ext-configure gd --with-gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-png-dir=/usr/include/
+RUN docker-php-ext-install gd
+# Install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+# Add user for laravel application
+RUN groupadd -g 1000 www
+RUN useradd -u 1000 -ms /bin/bash -g www www
+# Copy existing application directory contents
+COPY . /var/www
+# Copy existing application directory permissions
+COPY --chown=www:www . /var/www
+# Change current user to www
+USER www
+# Expose port 9000 and start php-fpm server
+EXPOSE 9000
+CMD ["php-fpm"]

README.md

@@ -1,46 +1,47 @@
-# Evolution CMS
+## Evolution CMS
 
-[![CMS Evolution](https://img.shields.io/badge/CMS-Evolution-brightgreen.svg)](https://github.com/evolution-cms/evolution) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/releases) ![PHP version](https://img.shields.io/badge/PHP->=v5.6-green.svg?php=5.6) [![Issues](https://img.shields.io/github/issues-closed-raw/evolution-cms/evolution.svg?maxAge=2592000)](https://github.com/evolution-cms/evolution/issues) [![Code quality](https://img.shields.io/scrutinizer/g/evolution-cms/evolution.svg?maxAge=2592000&b=develop)](https://scrutinizer-ci.com/g/evolution-cms/evolution/?branch=develop) [![Documentation](https://img.shields.io/badge/Documentation-processed-orange.svg)](https://github.com/evolution-cms/docs/)
+[![CMS Evolution](https://img.shields.io/badge/CMS-Evolution-brightgreen.svg)](https://github.com/evolution-cms/evolution) [![GitHub release](https://img.shields.io/github/release/evolution-cms/evolution.svg)](https://github.com/evolution-cms/evolution/releases) ![PHP version](https://img.shields.io/badge/PHP->=v7.3-red.svg?php=7.3) [![Issues](https://img.shields.io/github/issues-closed-raw/evolution-cms/evolution.svg?maxAge=2592000)](https://github.com/evolution-cms/evolution/issues) [![Code quality](https://img.shields.io/scrutinizer/g/evolution-cms/evolution.svg?maxAge=2592000&b=develop)](https://scrutinizer-ci.com/g/evolution-cms/evolution/?branch=develop) [![Documentation](https://img.shields.io/badge/Documentation-processed-orange.svg)](https://github.com/evolution-cms/docs/)
 
-Evolution CMS requires **PHP >= 5.6**
+Evolution CMS requires **PHP >= 7.3**
 
+## What is Evolution CMS
 
-## What is EVO
-
-**EVO** is an open source Content Management System and Application Framework.
+**Evolution CMS** is an open source Content Management System and Application Framework.
 
 ## History
 
-Initially inspired by **Etomite 0.6**, then it been **MODX Evolution 0.7 - 1.0.8** is an ongoing project written by *Raymond Irving* and a core team of contributors **MODX**, and now its **Evolution CMS** maintained by *Dmytro Lukianenko* and a core team of contributors at the **EVO Project**.
+Initially inspired by **Etomite 0.6**, then it been **MODX Evolution 0.7 - 1.0.8** is an ongoing project written by *Raymond Irving* and a core team of contributors **MODX**, and now its **Evolution CMS** maintained by *Dmytro Lukianenko* and a core team of contributors at the **Evolution CMS Project**.
 
 ## License
 
-**EVO** is distributed under the **GPL license** and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
+**Evolution CMS** is distributed under the **GPL license** and is now run by a professional team of developers from all over the world. Visit the Forums for more information.
 
 ## Features
 
-**EVO** provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications.
+**Evolution CMS** provides a fast, lightweight and powerful framework on which to deploy and secure your website and web applications.
 
 For example, it gives you a true system for registered web users and groups that is separate from administration users. You can grant some web users access to one page and others access to another page.
 
 For content management, you can easily duplicate documents, folders (and all their children!), chunks and snippets.
 
-Most significant, though, is **EVO's** ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
-
+Most significant, though, is **Evolution CMS's** ability to empower you to quickly and easily create and maintain a rich and dynamic website like never before.
 
 ## Install
-Just use [Evo Installer](https://github.com/evolution-cms/installer)
+Just use [Evolution CMS Installer](https://github.com/evolution-cms/installer)
+
+## Docker
 
+To run **Evolution CMS** using docker make **docker-compose up -d** command in your terminal. Additional configs and access parameters you can find in **docker-compose.yml** file and **docker** folder 
 
-### Screenshots
+## Screenshots
 
 ![screenshot_1](https://user-images.githubusercontent.com/7342798/30167975-5ec146c0-93e8-11e7-8cf8-b324c2b09477.jpg)
 
 ![screenshot_2](https://user-images.githubusercontent.com/7342798/30128635-b34fa2a4-9343-11e7-9d87-13d0e17fb69e.jpg)
 
 ![screenshot_3](https://user-images.githubusercontent.com/7342798/30128638-b5b2cdc8-9343-11e7-8c75-0864d00fe28a.jpg)
 
-### References
+## References
 
 Official Website:
 https://evo.im/
@@ -52,7 +53,8 @@ Previous Releases:
 https://modx.com/download/evolution/previous-releases.html
 
 Extras:
-https://extras.evolution-cms.com
+https://extras.evo.im
 
 Documentation:
+https://docs.evo.im
 https://evolution-docs.com

assets/backup/.htaccess

@@ -1,2 +1,2 @@
 order deny,allow
-allow from all
+deny from all

assets/cache/.htaccess

@@ -0,0 +1,2 @@
+order deny,allow
+deny from all

assets/cache/siteManager.php

@@ -1,2 +1,2 @@
-<?php
-define('MGR_DIR', 'manager');
+<?php
+define('MGR_DIR', 'manager');