From c0e1abc0f3944e1b2d8670cf12c60a2f905c6532 Mon Sep 17 00:00:00 2001
From: blackcoder87 <blackcoder@gmx.de>
Date: Mon, 4 Dec 2023 17:57:04 +0100
Subject: [PATCH] Downgrade CKEditor to 4.22.1 (#883)

CKEditor 4.23 is an LTS version, which requires a license.
---
 application/modules/admin/config/config.php          |  4 ++++
 application/modules/bbcodeconvert/config/config.php  |  2 +-
 .../bbcodeconvert/controllers/admin/Index.php        |  4 ++--
 composer.json                                        |  2 +-
 composer.lock                                        | 12 ++++++------
 index.php                                            |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/application/modules/admin/config/config.php b/application/modules/admin/config/config.php
index c1686ef48..fe8a35fbc 100644
--- a/application/modules/admin/config/config.php
+++ b/application/modules/admin/config/config.php
@@ -936,6 +936,10 @@ public function getUpdate($installedVersion)
                 // Update vendor folder
                 replaceVendorDirectory();
                 break;
+            case "2.1.55":
+                // Update vendor folder. Downgrade CKEditor to 4.22.1. Version 4.23 is an LTS version, which requires a license.
+                replaceVendorDirectory();
+                break;
         }
 
         return 'Update function executed.';
diff --git a/application/modules/bbcodeconvert/config/config.php b/application/modules/bbcodeconvert/config/config.php
index 48c918c3a..3abfce437 100644
--- a/application/modules/bbcodeconvert/config/config.php
+++ b/application/modules/bbcodeconvert/config/config.php
@@ -12,7 +12,7 @@ class Config extends Install
 {
     public $config = [
         'key' => 'bbcodeconvert',
-        'version' => '1.0.3',
+        'version' => '1.0.4',
         'icon_small' => 'fa-solid fa-arrow-right-arrow-left',
         'author' => 'ilch.de',
         'link' => 'https://www.ilch.de',
diff --git a/application/modules/bbcodeconvert/controllers/admin/Index.php b/application/modules/bbcodeconvert/controllers/admin/Index.php
index f1ab310b9..743d42c5b 100644
--- a/application/modules/bbcodeconvert/controllers/admin/Index.php
+++ b/application/modules/bbcodeconvert/controllers/admin/Index.php
@@ -17,7 +17,7 @@
 class Index extends Admin
 {
     private const supportedModules = [
-        'contact' => ['2.1.52', '2.1.53', '2.1.54', '2.1.55'],
+        'contact' => ['2.1.52', '2.1.53', '2.1.54', '2.1.55', '2.1.56'],
         'events' => ['1.22.0', '1.22.1'],
         'forum' => ['1.33.0', '1.34.0', '1.34.1', '1.34.2', '1.34.3', '1.34.4'],
         'guestbook' => ['1.13.0', '1.13.1'],
@@ -25,7 +25,7 @@ class Index extends Admin
         'kvticket' => ['1.5.0'],
         'radiohoerercharts' => ['1.8.0', '1.8.1', '1.8.2'],
         'teams' => ['1.23.0', '1.23.1'],
-        'user' => ['2.1.52', '2.1.53', '2.1.54', '2.1.55']
+        'user' => ['2.1.52', '2.1.53', '2.1.54', '2.1.55', '2.1.56']
     ];
 
     private const supportedLayouts = [
diff --git a/composer.json b/composer.json
index 1a4a54c53..a674bbf5c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "fortawesome/font-awesome": "^6.2.1",
         "npm-asset/jquery": "^3.5",
         "npm-asset/jquery-ui": "^1.13",
-        "ckeditor/ckeditor": "^4.14",
+        "ckeditor/ckeditor": "4.22.1",
         "phpmailer/phpmailer": "~6.1",
         "harvesthq/chosen": "^1.8",
         "ezyang/htmlpurifier": "^4.12",
diff --git a/composer.lock b/composer.lock
index 7d4691020..be41921f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "33231b1d580656bf1ac9eddcea65ae88",
+    "content-hash": "9a3d6dc1320f2a312bc2a84adbd01693",
     "packages": [
         {
             "name": "blueimp/jquery-file-upload",
@@ -73,16 +73,16 @@
         },
         {
             "name": "ckeditor/ckeditor",
-            "version": "4.23.0",
+            "version": "4.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ckeditor/ckeditor4-releases.git",
-                "reference": "13a70b2385e6ff7805c2faff1278fca6e42646f7"
+                "reference": "0d51138b0a258165ac09724e8f5cda67cf9126a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ckeditor/ckeditor4-releases/zipball/13a70b2385e6ff7805c2faff1278fca6e42646f7",
-                "reference": "13a70b2385e6ff7805c2faff1278fca6e42646f7",
+                "url": "https://api.github.com/repos/ckeditor/ckeditor4-releases/zipball/0d51138b0a258165ac09724e8f5cda67cf9126a3",
+                "reference": "0d51138b0a258165ac09724e8f5cda67cf9126a3",
                 "shasum": ""
             },
             "type": "library",
@@ -117,7 +117,7 @@
                 "source": "https://github.com/ckeditor/ckeditor4",
                 "wiki": "https://ckeditor.com/docs/ckeditor4/latest/"
             },
-            "time": "2023-08-24T13:32:10+00:00"
+            "time": "2023-06-30T13:35:30+00:00"
         },
         {
             "name": "ezyang/htmlpurifier",
diff --git a/index.php b/index.php
index 5eea048d0..8425ac595 100644
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
 $serverTimeZone = @date_default_timezone_get();
 date_default_timezone_set('UTC');
 
-define('VERSION', '2.1.55');
+define('VERSION', '2.1.56');
 define('SERVER_TIMEZONE', $serverTimeZone);
 define('DEFAULT_MODULE', 'page');
 define('DEFAULT_LAYOUT', 'index');