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

2.1.x

assets/plugins/codemirror/codemirror.plugin.php

@@ -60,7 +60,6 @@
  */
 switch($modx->event->name) {
 	case 'OnTempFormRender'   :
-		$object_name = $content['templatename'];
 		$rte = ($prte ? $prte : 'none');
 		break;
 	case 'OnChunkFormRender'  :
@@ -72,7 +71,6 @@
 			return;
 		}
 		$textarea_name = $modx->event->params['elements'];
-		$object_name = $content['pagetitle'];
 		$rte = 'none';
 		$tvMode = true;
 		$contentType = $content['contentType'] ? $content['contentType'] : $modx->event->params['contentType'];
@@ -104,7 +102,6 @@
 			return;
 		}
 		$textarea_name = 'ta';
-        $object_name = isset($content['pagetitle']) ? $content['pagetitle'] : '';
 		$xrte = (('htmlmixed' == $mode) ? $xrte : 0);
         $rte = ($prte ? $prte : (isset($content['id']) ? ($xrte ? $srte : 'none') : $srte));
 		$contentType = $content['contentType'];
@@ -344,8 +341,10 @@ function makeMarker(symbol) {
 		} else {
 			$setHeight = '';
 		};
-
-		$object_id = md5($modx->event->name . '-' . $content['id'] . '-' . $el);
+        if(isset($content['id']))
+		    $object_id = md5($modx->event->name . '-' . $content['id'] . '-' . $el);
+        else
+            $object_id = md5($modx->event->name . '-' . $el);
 
 		$output .= "
 			<script>

core/artisan

@@ -5,6 +5,9 @@ define('MODX_API_MODE', true);
 
 require __DIR__ . '/bootstrap.php';
 
+if (! defined('IN_INSTALL_MODE')) {
+    define('IN_INSTALL_MODE', false);
+}
 /*
 |--------------------------------------------------------------------------
 | Run The Artisan Application

core/composer.json

@@ -57,7 +57,8 @@
     "tracy/tracy": "~2.5",
     "wikimedia/composer-merge-plugin": "dev-master",
     "symfony/process": "^4.3",
-    "i-rocky/eloquent-dynamic-relation": "^1.0"
+    "i-rocky/eloquent-dynamic-relation": "^1.0",
+    "dmitry-suffi/redis-session-handler": "*"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master"

core/config/database/default.php

@@ -0,0 +1,2 @@
+<?php
+return 'default';

core/config/database/migrations.php

@@ -1,2 +1,6 @@
 <?php
-return 'migrations';
+if (IN_INSTALL_MODE === false)
+    return 'migrations';
+else
+    return 'migrations_install';
+

core/factory/version.php

@@ -1,7 +1,7 @@
 <?php
 return [
-    'version' => '2.0.2', // Current version number
-    'release_date' => 'Mar 13, 2020', // Date of release
+    'version' => '2.1.0', // Current version number
+    'release_date' => 'Jul 1, 2020', // Date of release
     'branch' => 'Evolution CMS', // Codebase name
-    'full_appname' => 'Evolution CMS 2.0.2 (Mar 13, 2020)'
+    'full_appname' => 'Evolution CMS 2.1.0 (Jul 1, 2020)'
 ];

core/functions/preload.php

@@ -67,6 +67,15 @@ function startCMSSession()
             , $secure
             , true
         );
+
+        if (SESSION_STORAGE == 'redis' && class_exists('Redis')) {
+            $redis = new Redis();
+            if ($redis->connect(REDIS_HOST, REDIS_PORT) && $redis->select(0)) {
+                $handler = new \suffi\RedisSessionHandler\RedisSessionHandler($redis);
+                session_set_save_handler($handler);
+            }
+        }
+
         session_start();
         $key = "modx.mgr.session.cookie.lifetime";
 
@@ -125,7 +134,7 @@ function removeInvalidCmsSessionIds($session_name)
      * @param int $depth
      * @return array|string
      */
-    function modx_sanitize_gpc(& $values, $depth = 0)
+    function modx_sanitize_gpc(&$values, $depth = 0)
     {
         if (200 < $depth) {
             exit('GPC Array nested too deep!');
@@ -148,7 +157,7 @@ function modx_sanitize_gpc(& $values, $depth = 0)
     }
 }
 
-if (! function_exists('getSanitizedValue')) {
+if (!function_exists('getSanitizedValue')) {
     /**
      * @param string $value
      * @return string
@@ -177,7 +186,7 @@ function getSanitizedValue($value = '')
         return $value;
     }
 }
-if (! function_exists('removeSanitizeSeed')) {
+if (!function_exists('removeSanitizeSeed')) {
     /**
      * @param string $string
      * @return string