From de545f7a29e860a4365af7a1e49990f6249fe6cd Mon Sep 17 00:00:00 2001 From: O3-Shop Date: Sun, 2 Apr 2023 23:00:41 +0200 Subject: [PATCH] change to O3-Shop --- .../Controller/Admin/TinyFileManager.php | 20 ++++ Application/Controller/Admin/TinyHelper.php | 20 ++++ Application/Core/.ide-helper.php | 19 ++++ Application/Core/ViewConfig.php | 24 ++-- Application/Core/config.php | 25 +++-- README.md | 106 ++++++++---------- composer.json | 20 ++-- metadata.php | 35 +++--- 8 files changed, 166 insertions(+), 103 deletions(-) diff --git a/Application/Controller/Admin/TinyFileManager.php b/Application/Controller/Admin/TinyFileManager.php index 1280dd3..8938b62 100755 --- a/Application/Controller/Admin/TinyFileManager.php +++ b/Application/Controller/Admin/TinyFileManager.php @@ -1,4 +1,24 @@ + * + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) + */ + namespace VanillaThunder\TinyMCE\Application\Controller\Admin; use OxidEsales\Eshop\Core\Registry; diff --git a/Application/Controller/Admin/TinyHelper.php b/Application/Controller/Admin/TinyHelper.php index 826e9cf..ad260c2 100755 --- a/Application/Controller/Admin/TinyHelper.php +++ b/Application/Controller/Admin/TinyHelper.php @@ -1,4 +1,24 @@ + * + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) + */ + namespace VanillaThunder\TinyMCE\Application\Controller\Admin; diff --git a/Application/Core/.ide-helper.php b/Application/Core/.ide-helper.php index 6afb7bf..3b43b32 100755 --- a/Application/Core/.ide-helper.php +++ b/Application/Core/.ide-helper.php @@ -1,5 +1,24 @@ + * + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) + */ + namespace VanillaThunder\TinyMCE\Application\Core; diff --git a/Application/Core/ViewConfig.php b/Application/Core/ViewConfig.php index 5968cd7..62ac190 100755 --- a/Application/Core/ViewConfig.php +++ b/Application/Core/ViewConfig.php @@ -1,16 +1,22 @@ + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with O3-Shop. If not, see + * + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) */ namespace VanillaThunder\TinyMCE\Application\Core; diff --git a/Application/Core/config.php b/Application/Core/config.php index c43f85d..f18dde2 100755 --- a/Application/Core/config.php +++ b/Application/Core/config.php @@ -1,19 +1,22 @@ + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with O3-Shop. If not, see * - * Marat Bedoev + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) */ function checkAccess($action) diff --git a/README.md b/README.md index 794d024..c0b38c4 100644 --- a/README.md +++ b/README.md @@ -1,65 +1,51 @@ -## TinyMCE Editor for OXID eShop CE -by Marat Bedoev, bestlife AG -https://github.com/vanilla-thunder/bla-tinymce -### module version 2.1.1 ( 2017-10-02 ) +# O3-Shop TinyMCE WYSIWYG Editor -TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL. -More information here: http://www.tinymce.com/ -and here: https://github.com/tinymce +This module integrates the [TinyMCE WYSIWYG editor](https://www.tiny.cloud/tinymce/) in the O3-Shop backend. -# bitte entfernen Sie vollständig das alte bla-TinyMCE Modul, bevor Sie das neue hochladen! - * Modul im Backend deaktivieren - * modules/bla/bla-tinymce löschen - * tmp/ leeren - -# please completely remove the older module version before update! - * deactivate module in backend - * remove modules/bla/bla-tinymce - * clear tmp/ +## Usage -## more info here: [https://marat.ws/bla-tinymce/](http:/marat.ws/bla-tinymce/) +This assumes you have O3-Shop (at least the `v1.0.0` compilation) up and running. -### changelog -- **2017-10-02 :: version 2.1.1** - - rollback to TinyMCE 4.6.6, because of issues with filemanager -- **2017-09-25 :: version 2.1.0** - - TinyMCE 4.6.7 - - increased maximum image size for upload via filemanager -- **2017-06-20 :: version 2.0.3** - - TinyMCE 4.6.4 -- **2017-01-11 :: version 2.0.2** - - TinyMCE 4.5.2 - - fullscreen editing plugin -- **2016-09-07 :: version 2.0.1** - - TinyMCE 4.4.3 - - link url conversion fixed. TinyMCE accepts smarty tags/variables as URL wirhout convertig them to absolute URL. -- **2016-09-07 :: version 2.0.0** - - TinyMCE 4.4.1 - - eingebauter Filemanager "Roxy Fileman" -- **2015-07-29 :: version 1.5.0** - - TinyMCE 4.2.2 -- **2015-05-06 :: version 1.4.0** - - TinyMCE 4.1.10 - - fix: data-mce attributes removed from html output -- **2014-09-04 :: version 1.3.1** - - TinyMCE v4.1.4 - - fix: fullpage Plugin für Newsletter hinzugefügt -- **2014-08-20 :: version 1.3.0** - - TinyMCE v4.1.3 - - feature: Support für eigene Text-Felder hinzugefügt -- **2014-04-23 :: version 1.2.2** - - TinyMCE 4.0.10 - - fix: iframes werden nicht mehr ersetzt +### Install -### LICENSE AGREEMENT - bla-tinymce - Copyright (C) 2017 bestlife AG - info: oxid@bestlife.ag - - This program is free software; - you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; - either version 3 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along with this program; if not, see +The TinyMCE Editor module is already included in the O3-Shop `v1.2.0` compilation. + +Module can be installed manually, by using composer: +```bash +$ composer require o3-shop/tinymce-editor +$ vendor/bin/oe-console oe:module:install source/modules/o3-shop/tinymce-editor +``` + +After requiring the module, you need to activate it, either via O3-Shop admin or CLI. + +Navigate to shop folder and execute the following: +```bash +$ vendor/bin/oe-console oe:module:activate tinymce-editor +``` + +### How to use + +Activate the module. + +## Developer installation + +```bash +$ git clone https://gitlab.o3-shop.com/o3/tinymce-editor/ source/modules/o3-shop/tinymce-editor +$ composer config repositories.o3-shop/tinymce-editor path ./source/modules/o3-shop/tinymce-editor +$ composer require o3-shop/tinymce-editor:* + +$ vendor/bin/oe-console oe:module:install source/modules/o3-shop/tinymce-editor +``` + +## Issues + +To report issues with the module, please use the [O3-Shop bugtracking system](https://issues.o3-shop.com/) - module TinyMCE Editor project. + +## License + +GPLv3, see [LICENSE file](LICENSE). + +## Credits + +the original module was created by Marat Bedoev, bestlife AG +and published under the GPL v3 licence diff --git a/composer.json b/composer.json index d566a5e..2a8d46f 100755 --- a/composer.json +++ b/composer.json @@ -1,21 +1,25 @@ { - "name": "vanilla-thunder/oxid-module-tinymce", - "version": "3.0", - "description": "TinyMCE 5 Integration for OXID eShop V6.2", + "name": "o3-shop/tinymce-editor", + "version": "1.0", + "description": "TinyMCE 5 Integration for O3-Shop", "type": "oxideshop-module", - "homepage": "https://github.com/vanilla-thunder/oxid-module-tinymce", + "homepage": "https://www.o3-shop.com/", "license": [ "GPL-3.0" ], "authors": [ { - "name": "Marat Bedoev", + "name": "Marat Bedoev, bestlife AG", "email": "hello@mb-dev.pro" + }, + { + "name": "O3-Shop", + "email": "info@o3-shop.com" } ], "extra": { "oxideshop": { - "target-directory": "vt/TinyMCE" + "target-directory": "o3-shop/tinymce-editor" } }, "archive": { @@ -23,11 +27,11 @@ }, "require": { "php": ">=7.0", - "oxid-esales/oxideshop-ce": "^v6.2" + "o3-shop/shop-ce": "^1.0" }, "autoload": { "psr-4": { - "VanillaThunder\\TinyMCE\\": "../../../source/modules/vt/TinyMCE" + "VanillaThunder\\TinyMCE\\": "../../../source/modules/o3-shop/tinymce-editor" } } } diff --git a/metadata.php b/metadata.php index 702a912..29e5d2d 100755 --- a/metadata.php +++ b/metadata.php @@ -1,29 +1,34 @@ + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with O3-Shop. If not, see + * + * @copyright Copyright (c) 2022 OXID Marat Bedoev, bestlife AG + * @copyright Copyright (c) 2023 O3-Shop (https://www.o3-shop.com) + * @license https://www.gnu.org/licenses/gpl-3.0 GNU General Public License 3 (GPLv3) */ $sMetadataVersion = '2.1'; $aModule = [ - 'id' => 'vt-tinymce', - 'title' => '[vt] TinyMCE', - 'description' => 'TinyMCE 5 Integration for OXID eShop ≥ V6.2', + 'id' => 'tinymce-editor', + 'title' => 'TinyMCE Editor', + 'description' => 'TinyMCE 5 Integration for O3-Shop', 'thumbnail' => 'tinymce.png', 'version' => '3.1.0 ( 2021-10-20 )', - 'author' => 'Marat Bedoev', - 'email' => openssl_decrypt("Az6pE7kPbtnTzjHlPhPCa4ktJLphZ/w9gKgo5vA//p4=", str_rot13("nrf-128-pop"), str_rot13("gvalzpr")), - 'url' => 'https://github.com/vanilla-thunder/oxid-module-tinymce', + 'author' => 'Marat Bedoev, O3-Shop', + 'url' => 'https://www.o3-shop.com/', 'extend' => [ OxidEsales\Eshop\Core\ViewConfig::class => VanillaThunder\TinyMCE\Application\Core\ViewConfig::class ],