Portiert zum OXID esale v6.0

.gitignore

@@ -0,0 +1,2 @@
+.idea/
+/vendor/

README.md

@@ -1,25 +1,25 @@
-## TinyMCE Editor for OXID eShop CE
+TinyMCE Editor for OXID eShop CE v6.x
+======================================
+
 by Marat Bedoev, bestlife AG <oxid@bestlife.ag>  
 https://github.com/vanilla-thunder/bla-tinymce
-### module version 2.1.1 ( 2017-10-02 )
+
+### module version 2.2.0 ( 2018-07-09 )
 
 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
 
-#  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/
 
-## more info here: [https://marat.ws/bla-tinymce/](http:/marat.ws/bla-tinymce/)
+## Installation
+
+Only for OXID eShop v6.x
+
+    composer require vanilla-thunder/bla-tinymce
 
 ### changelog
+- **2018-07-09 :: version 2.2.0**
+   - Portiert to OXID eSale v6.x
 - **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**

copy_this/modules/bla/bla-tinymce/application/controllers/admin/tinymcehelper.php → application/controllers/admin/tinymcehelper.php

@@ -14,17 +14,30 @@
  *
  * Marat Bedoev
  */
-
-class tinymcehelper extends oxAdminView
+namespace bla\tinymce\application\controllers\admin;
+
+use OxidEsales\Eshop\Application\Controller\Admin\AdminController;
+use OxidEsales\Eshop\Application\Model\Content;
+use OxidEsales\Eshop\Core\DatabaseProvider;
+use OxidEsales\Eshop\Core\Model\ListModel;
+use OxidEsales\Eshop\Core\Output;
+use OxidEsales\Eshop\Core\Registry;
+
+/**
+ * Class tinymcehelper
+ *
+ * @package bla\tinymce\application\controllers\admin
+ */
+class tinymcehelper extends AdminController
 {
     protected $_errors;
     protected $_content;
 
     public function render()
     {
-        $oOutput = oxRegistry::get("oxOutput");
+        $oOutput = Registry::get(Output::class);
         $oOutput->setCharset($this->getCharSet());
-        $oOutput->setOutputFormat(oxOutput::OUTPUT_FORMAT_JSON);
+        $oOutput->setOutputFormat(Output::OUTPUT_FORMAT_JSON);
         $oOutput->sendHeaders();
         $oOutput->output('errors', $this->_errors);
         $oOutput->output('content', $this->_content);
@@ -33,33 +46,31 @@ public function render()
 
     public function search()
     {
-        $cfg = oxRegistry::getConfig();
+        $cfg = Registry::getRequest();
 
         $what  = $cfg->getRequestParameter("what");
         $where = $cfg->getRequestParameter("where");
 
         $this->_content = $what . ' + '. $where;
     }
-
+
+    /**
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseConnectionException
+     * @throws \OxidEsales\Eshop\Core\Exception\DatabaseErrorException
+     */
     public function getCMS()
     {
-        $oList = oxNew("oxlist");
-        $oList->init("oxcontent");
+        /** @var ListModel $oList */
+        $oList = oxNew(ListModel::class);
+        $oList->init(Content::class);
+
+        /** @var Content $oListObject */
         $oListObject = $oList->getBaseObject();
         $sViewName = $oListObject->getViewName();
         $sActiveSnippet = $oListObject->getSqlActiveSnippet();
         $sSQL = "SELECT OXID, OXLOADID, OXTITLE FROM {$sViewName} WHERE {$sActiveSnippet} AND {$sViewName}.oxfolder != 'CMSFOLDER_EMAILS'";
 
-        $aPages = oxDB::getDb()->getAssoc($sSQL);
+        $aPages = DatabaseProvider::getDb(DatabaseProvider::FETCH_MODE_ASSOC)->getAll($sSQL);
         $this->_content = $aPages;
     }
-
-    public function oxgetseourl()
-    {
-        $cfg = oxRegistry::getConfig();
-
-        $type = ($cfg->getRequestParameter("type") ? $cfg->getRequestParameter("type") : "oxcontent");
-        $oxid = ($cfg->getRequestParameter("oxid") ? $cfg->getRequestParameter("oxid") : "oximpressum");
-    }
-
 }

application/core/blaTinyMceOxViewConfig.php

@@ -0,0 +1,254 @@
+<?php
+/*
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ * Marat Bedoev
+ */
+
+namespace bla\tinymce\application\core;
+
+use OxidEsales\Eshop\Core\Registry;
+
+/**
+ * Class blaTinyMceOxViewConfig
+ * @package bla\tinymce
+ * @mixin \OxidEsales\Eshop\Core\ViewConfig
+ */
+class blaTinyMceOxViewConfig extends blaTinyMceOxViewConfig_parent
+{
+    public function loadTinyMce()
+    {
+        $cfg = Registry::getConfig();
+        $blEnabled = in_array($this->getActiveClassName(), $cfg->getConfigParam("aTinyMCE_classes"));
+        $blPlainCms = in_array($cfg->getActiveView()->getViewDataElement("edit")->oxcontents__oxloadid->value, $cfg->getConfigParam("aTinyMCE_plaincms"));
+        $blFilemanager = $cfg->getConfigParam("blTinyMCE_filemanager");
+
+        if (!$blEnabled) return false;
+        if ($blPlainCms) return Registry::getLang()->translateString("BLA_TINYMCE_PLAINCMS");
+
+        // processing editor config & other stuff
+        $sLang = Registry::getLang()->getLanguageAbbr(Registry::getLang()->getTplLanguage());
+        // array to assign shops lang abbreviations to lang file names of tinymce: shopLangAbbreviation => fileName (without .js )
+        $aLang = array(
+            "cs" => "cs",
+            "da" => "da",
+            "de" => "de",
+            "fr" => "fr_FR",
+            "it" => "it",
+            "nl" => "nl",
+            "ru" => "ru"
+        );
+
+        // default config
+        $aDefaultConfig = array(
+            'force_br_newlines' => 'false',
+            'force_p_newlines' => 'false',
+            'forced_root_block' => '""',
+            'selector' => '"textarea:not(.mceNoEditor)"',
+            'language' => '"' . (in_array($sLang, $aLang) ? $aLang[$sLang] : 'en') . '"',
+            //'spellchecker_language'   => '"' . (in_array($sLang, $aLang) ? $aLang[$sLang] : 'en') . '"',
+            'nowrap' => 'false',
+            'entity_encoding' => '"raw"', // http://www.tinymce.com/wiki.php/Configuration:entity_encoding
+            'height' => 300,
+            'menubar' => 'false',
+            'document_base_url' => '"' . $this->getBaseDir() . '"', // http://www.tinymce.com/wiki.php/Configuration:document_base_url
+            'relative_urls' => 'false', // http://www.tinymce.com/wiki.php/Configuration:relative_urls
+            'plugin_preview_width' => 'window.innerWidth',
+            'plugin_preview_height' => 'window.innerHeight-90',
+            'code_dialog_width' => 'window.innerWidth-50',
+            'code_dialog_height' => 'window.innerHeight-130',
+            'image_advtab' => 'true',
+            'imagetools_toolbar' => '"rotateleft rotateright | flipv fliph | editimage imageoptions"',
+            'moxiemanager_fullscreen' => 'true',
+            'insertdatetime_formats' => '[ "%d.%m.%Y", "%H:%M" ]',
+            'nonbreaking_force_tab' => 'true', // http://www.tinymce.com/wiki.php/Plugin:nonbreaking
+            'autoresize_max_height' => '400',
+            'urlconverter_callback' => '"urlconverter"',
+            'filemanager_access_key' => '"' . md5($_SERVER['DOCUMENT_ROOT']) . '"',
+            'tinymcehelper' => '"' . $this->getSelfActionLink() . 'renderPartial=1"'
+        );
+        if ($blFilemanager) {
+            $aDefaultConfig['external_filemanager_path'] = '"../modules/bla/bla-tinymce/fileman/"';
+            $aDefaultConfig['filemanager_access_key'] = '"' . md5($_SERVER['HTTP_HOST']) . '"';
+            $oUS = Registry::getUtilsServer();
+            $oUS->setOxCookie("filemanagerkey", md5($_SERVER['DOCUMENT_ROOT'] . $oUS->getOxCookie("admin_sid")));
+        }
+        //merging with onfig override
+        $aConfig = ($aOverrideConfig = $this->_getTinyCustConfig()) ? array_merge($aDefaultConfig, $aOverrideConfig) : $aDefaultConfig;
+
+
+        // default plugins and their buttons
+        $aDefaultPlugins = array(
+            'advlist' => '', // '' = plugin has no buttons
+            'anchor' => 'anchor',
+            'autolink' => '',
+            'autoresize' => '',
+            'charmap' => 'charmap',
+            'code' => 'code',
+            'colorpicker' => '',
+            'hr' => 'hr',
+            'image' => 'image',
+            'imagetools' => '',
+            'insertdatetime' => 'insertdatetime',
+            'link' => 'link unlink',
+            'lists' => '',
+            'media' => 'media',
+            'nonbreaking' => 'nonbreaking',
+            'pagebreak' => 'pagebreak',
+            'paste' => 'pastetext',
+            'preview' => 'preview',
+            'searchreplace' => 'searchreplace',
+            'table' => 'table',
+            'textcolor' => 'forecolor backcolor',
+            'visualblocks' => '',
+            //'visualchars'    => 'visualchars',
+            'wordcount' => '',
+            'oxfullscreen' => 'fullscreen', //custom fullscreen plugin
+            //'oxwidget'       => 'widget'
+            //'oxgetseourl'    => 'yolo' //custom seo url plugin // wip
+        );
+
+        // plugins for newsletter emails
+        if ($this->getActiveClassName() == "newsletter_main") {
+            $aDefaultPlugins["legacyoutput"] = "false";
+            $aDefaultPlugins["fullpage"] = "fullpage";
+        }
+
+        // override for active plugins
+        $aOverridePlugins = $cfg->getConfigParam("aTinyMCE_plugins");
+        $aPlugins = (empty($aOverridePlugins) || !is_array($aOverridePlugins)) ? $aDefaultPlugins : array_merge($aDefaultPlugins, $aOverridePlugins);
+        $aPlugins = array_filter($aPlugins, function ($value) {
+            return $value !== "false";
+        });
+
+        // array keys von $aPlugins enthalten aktive plugins
+        $aConfig['plugins'] = '"' . implode(' ', array_keys($aPlugins)) . '"';
+
+        // external plugins
+        $aConfig['external_plugins'] = '{ "oxfullscreen":"' . $this->getModuleUrl('bla-tinymce', 'plugins/oxfullscreen/plugin.js') . '" ';
+        //$aConfig['external_plugins'] .= ', "oxwidget":"' . $this->getModuleUrl('bla-tinymce', 'plugins/oxwidget/plugin.js') . '" ';
+        if ($blFilemanager) $aConfig['external_plugins'] .= ',"roxy":"' . $this->getModuleUrl('bla-tinymce', 'plugins/roxy/plugin.js') . '" ';
+        //$aConfig['external_plugins'] .= ',"oxgetseourl":"' . $this->getModuleUrl('bla-tinymce', 'plugins/oxgetseourl/plugin.js') . '" ';
+
+        if ($aExtPlugins = $this->_getTinyExtPlugins()) {
+            foreach ($aExtPlugins AS $plugin => $file) {
+                $aConfig['external_plugins'] .= ', "' . $plugin . '": "' . $file . '" ';
+            }
+        }
+        $aConfig['external_plugins'] .= ' }';
+
+        // default toolbar buttons
+        $aDefaultButtons = array(
+            "undo redo",
+            "cut copy paste",
+            "bold italic underline strikethrough",
+            "alignleft aligncenter alignright alignjustify",
+            "bullist numlist",
+            "outdent indent",
+            "blockquote",
+            "subscript",
+            "superscript",
+            "formatselect",
+            "removeformat",
+            "fontselect",
+            "fontsizeselect"
+        );
+        $aOverrideButtons = Registry::getConfig()->getConfigParam("aTinyMCE_buttons");
+        $aButtons = (empty($aOverrideButtons) || !is_array($aOverrideButtons)) ? $aDefaultButtons : $aOverrideButtons;
+
+        // plugin buttons
+        $aPluginButtons = array_filter($aPlugins);
+
+        // zusätzliche buttons
+        $aCustomButtons = $this->_getTinyToolbarControls();
+
+        $aButtons = array_merge(array_filter($aButtons), array_filter($aPluginButtons), array_filter($aCustomButtons));
+        $aConfig['toolbar'] = '"' . implode(" | ", $aButtons) . '"';
+
+
+        // compile the whole config stuff
+        $sConfig = '';
+        foreach ($aConfig as $param => $value) {
+            $sConfig .= "$param: $value, ";
+        }
+
+        // add init script
+        $sInit = 'tinymce.init({ ' . $sConfig . ' });';
+
+        $sCopyLongDescFromTinyMCE = 'function copyLongDescFromTinyMCE(sIdent) {
+   var editor = tinymce.get("editor_"+sIdent);
+   var content = (editor && !editor.isHidden()) ? editor.getContent() : document.getElementById("editor_"+sIdent).value;
+   document.getElementsByName("editval[" + sIdent + "]").item(0).value = content.replace(/\[{([^\]]*?)}\]/g, function(m) { return m.replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&amp;/g, "&") });
+   return true;
+}
+
+var origCopyLongDesc = copyLongDesc;
+copyLongDesc = function(sIdent) {
+    if ( copyLongDescFromTinyMCE( sIdent ) ) return;
+    console.log("tinymce disabled, copy content from regular textarea");
+    origCopyLongDesc( sIdent );
+}';
+        $sUrlConverter = 'function urlconverter(url, node, on_save) {
+      console.log(tinyMCE.activeEditor);
+      if(url.indexOf("[{") == 0) return url;
+      return (tinyMCE.activeEditor.settings.relative_urls) ? tinyMCE.activeEditor.documentBaseURI.toRelative(url) : tinyMCE.activeEditor.documentBaseURI.toAbsolute(url); 
+}';
+
+        // adding scripts to template
+        $smarty = Registry::get("oxUtilsView")->getSmarty();
+        $sSufix = ($smarty->_tpl_vars["__oxid_include_dynamic"]) ? '_dynamic' : '';
+
+        $aScript = (array)$cfg->getGlobalParameter('scripts' . $sSufix);
+        $aScript[] = $sCopyLongDescFromTinyMCE;
+        $aScript[] = $sUrlConverter;
+        $aScript[] = $sInit;
+        $cfg->setGlobalParameter('scripts' . $sSufix, $aScript);
+
+        $aInclude = (array)$cfg->getGlobalParameter('includes' . $sSufix);
+
+        $aExtjs = $cfg->getConfigParam('aTinyMCE_extjs');
+        if (!empty($aExtjs) && is_array($aExtjs)) foreach ($aExtjs as $key => $js) $aInclude[3][] = $js;
+
+        $aInclude[3][] = $this->getModuleUrl('bla-tinymce', 'tinymce/tinymce.min.js');
+        $cfg->setGlobalParameter('includes' . $sSufix, $aInclude);
+
+        return '<li style="margin-left: 50px;"><button style="border: 1px solid #0089EE; color: #0089EE;padding: 3px 10px; margin-top: -10px; background: white;" ' .
+            'onclick="tinymce.each(tinymce.editors, function(editor) { if(editor.isHidden()) { editor.show(); } else { editor.hide(); } });"><span>' .
+            Registry::getLang()->translateString('BLA_TINYMCE_TOGGLE') . '</span></button></li>';
+        // javascript:tinymce.execCommand(\'mceToggleEditor\',false,\'editor1\');
+    }
+
+    protected function _getTinyCustConfig()
+    {
+        $aConfig = Registry::getConfig()->getConfigParam("aTinyMCE_config");
+        if (method_exists(get_parent_class(__CLASS__), __FUNCTION__)) {
+            $aConfig = array_merge(parent::_getTinyCustConfig(), $aConfig);
+        }
+        return $aConfig;
+    }
+
+    protected function _getTinyExtPlugins()
+    {
+        $aPlugins = Registry::getConfig()->getConfigParam("aTinyMCE_external_plugins");
+        if (method_exists(get_parent_class(__CLASS__), __FUNCTION__)) {
+            $aPlugins = array_merge(parent::_getTinyExtPlugins(), $aPlugins);
+        }
+        return $aPlugins;
+    }
+
+    protected function _getTinyToolbarControls()
+    {
+        $aControls = (method_exists(get_parent_class(__CLASS__), __FUNCTION__)) ? parent::_getTinyToolbarControls() : array();
+        return $aControls;
+    }
+}

application/views/admin/cs/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");

application/views/admin/da/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");

application/views/admin/fr/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");

application/views/admin/it/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");

application/views/admin/nl/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");

application/views/admin/ru/module_options.php

@@ -0,0 +1,2 @@
+<?php
+include(__DIR__ . "/../en/module_options.php");