change to O3-Shop

Application/Controller/Admin/TinyFileManager.php

@@ -1,4 +1,24 @@
 <?php
+
+/**
+ * This file is part of O3-Shop TinyMCE editor module.
+ *
+ * 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, version 3.
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * @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;

Application/Controller/Admin/TinyHelper.php

@@ -1,4 +1,24 @@
 <?php
+
+/**
+ * This file is part of O3-Shop TinyMCE editor module.
+ *
+ * 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, version 3.
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * @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;
 
 

Application/Core/.ide-helper.php

@@ -1,5 +1,24 @@
 <?php
 
+/**
+ * This file is part of O3-Shop TinyMCE editor module.
+ *
+ * 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, version 3.
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * @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;
 
 

Application/Core/ViewConfig.php

@@ -1,16 +1,22 @@
 <?php
 
-/*
+/**
- * vanilla-thunder/oxid-module-tinymce
+ * This file is part of O3-Shop TinyMCE editor module.
- * TinyMCE 5 Integration for OXID eShop V6.2
  *
- * This program is free software;
+ * This program is free software: you can redistribute it and/or modify
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
+ * it under the terms of the GNU General Public License as published by
- * either version 3 of the License, or (at your option) any later version.
+ * the Free Software Foundation, version 3.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * @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;

Application/Core/config.php

@@ -1,19 +1,22 @@
 <?php
 
-/*
+/**
- * bla-tinymce
+ * This file is part of O3-Shop TinyMCE editor module.
- * Copyright (C) 2017  bestlife AG
- * info:  oxid@bestlife.ag
  *
- * This program is free software;
+ * This program is free software: you can redistribute it and/or modify
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
+ * it under the terms of the GNU General Public License as published by
- * either version 3 of the License, or (at your option) any later version.
+ * the Free Software Foundation, version 3.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ * 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 <http://www.gnu.org/licenses/>
  *
- * 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)

README.md

@@ -1,65 +1,51 @@
-## TinyMCE Editor for OXID eShop CE
+# O3-Shop TinyMCE WYSIWYG Editor
-by Marat Bedoev, bestlife AG <oxid@bestlife.ag>  
-https://github.com/vanilla-thunder/bla-tinymce
-### module version 2.1.1 ( 2017-10-02 )
 
-TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL.
+This module integrates the [TinyMCE WYSIWYG editor](https://www.tiny.cloud/tinymce/) in the O3-Shop backend.
-More information here: http://www.tinymce.com/  
-and here: https://github.com/tinymce
 
-#  bitte entfernen Sie vollständig das alte bla-TinyMCE Modul, bevor Sie das neue hochladen!
+## Usage
-  * Modul im Backend deaktivieren
-  * modules/bla/bla-tinymce löschen
-  * tmp/ leeren
 
-#  please completely remove the older module version before update!
+This assumes you have O3-Shop (at least the `v1.0.0` compilation) up and running.
-  * deactivate module in backend
-  * remove modules/bla/bla-tinymce
-  * clear tmp/
 
-## more info here: [https://marat.ws/bla-tinymce/](http:/marat.ws/bla-tinymce/)
+### Install
 
-### changelog
+The TinyMCE Editor module is already included in the O3-Shop `v1.2.0` compilation.
-- **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
 
-### LICENSE AGREEMENT
+Module can be installed manually, by using composer:
-   bla-tinymce  
+```bash
-   Copyright (C) 2017 bestlife AG  
+$ composer require o3-shop/tinymce-editor
-   info:  oxid@bestlife.ag  
+$ vendor/bin/oe-console oe:module:install source/modules/o3-shop/tinymce-editor
+```
 
-   This program is free software;  
+After requiring the module, you need to activate it, either via O3-Shop admin or CLI.
-   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;  
+Navigate to shop folder and execute the following: 
-   without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+```bash
-   You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+$ 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 <oxid@bestlife.ag>  
+and published under the GPL v3 licence

composer.json

@@ -1,21 +1,25 @@
 {
-  "name": "vanilla-thunder/oxid-module-tinymce",
+  "name": "o3-shop/tinymce-editor",
-  "version": "3.0",
+  "version": "1.0",
-  "description": "TinyMCE 5 Integration for OXID eShop V6.2",
+  "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"
     }
   }
 }

metadata.php

@@ -1,29 +1,34 @@
 <?php
 
-/*
+/**
- * vanilla-thunder/oxid-module-tinymce
+ * This file is part of O3-Shop TinyMCE editor module.
- * TinyMCE 5 Integration for OXID eShop V6.2
  *
- * This program is free software;
+ * This program is free software: you can redistribute it and/or modify
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
+ * it under the terms of the GNU General Public License as published by
- * either version 3 of the License, or (at your option) any later version.
+ * the Free Software Foundation, version 3.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * This program is distributed in the hope that it will be useful, but
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * @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',
+    'id' => 'tinymce-editor',
-    'title' => '[vt] TinyMCE',
+    'title' => 'TinyMCE Editor',
-    'description' => 'TinyMCE 5 Integration for OXID eShop ≥ V6.2',
+    'description' => 'TinyMCE 5 Integration for O3-Shop',
     'thumbnail' => 'tinymce.png',
     'version' => '3.1.0 ( 2021-10-20 )',
-    'author' => 'Marat Bedoev',
+    'author' => 'Marat Bedoev, O3-Shop',
-    'email' => openssl_decrypt("Az6pE7kPbtnTzjHlPhPCa4ktJLphZ/w9gKgo5vA//p4=", str_rot13("nrf-128-pop"), str_rot13("gvalzpr")),
+    'url' => 'https://www.o3-shop.com/',
-    'url' => 'https://github.com/vanilla-thunder/oxid-module-tinymce',
     'extend' => [
         OxidEsales\Eshop\Core\ViewConfig::class => VanillaThunder\TinyMCE\Application\Core\ViewConfig::class
     ],