move tinymce to resources folder

core/lib/Thelia/Core/TheliaHttpKernel.php

@@ -213,7 +213,7 @@ class TheliaHttpKernel extends HttpKernel
         }
     }
 
-    protected function initSession(Request $request)
+    public function initSession(Request $request)
     {
         if (null === self::$session) {
             $storage = new Session\Storage\NativeSessionStorage();

local/modules/Tinymce/AdminIncludes/category-edit-js.html

@@ -1,20 +1 @@
-<script src="{url file='/tinymce/tinymce.min.js'}"></script>
+{include file="include/tinymce_init.tpl"}
-
-<script>
-    tinymce.init({
-        selector: ".wysiwyg",
-        theme: "modern",
-        menubar : false,
-        language: "",
-        plugins: [
-            "advlist autolink link image lists charmap print preview hr anchor pagebreak",
-            "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
-            "table contextmenu directionality emoticons paste textcolor filemanager"
-        ],
-        toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
-        image_advtab: true ,
-        external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
-        filemanager_title:"{intl l='Files manager'}" ,
-        external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
-    });
-</script>

local/modules/Tinymce/AdminIncludes/content-edit-js.html

@@ -1,20 +1 @@
-<script src="{url file='/tinymce/tinymce.min.js'}"></script>
+{include file="include/tinymce_init.tpl"}
-
-<script>
-    tinymce.init({
-        selector: ".wysiwyg",
-        theme: "modern",
-        menubar : false,
-        language: "",
-        plugins: [
-            "advlist autolink link image lists charmap print preview hr anchor pagebreak",
-            "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
-            "table contextmenu directionality emoticons paste textcolor filemanager"
-        ],
-        toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
-        image_advtab: true ,
-        external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
-        filemanager_title:"{intl l='Files manager'}" ,
-        external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
-    });
-</script>

local/modules/Tinymce/AdminIncludes/folder-edit-js.html

@@ -1,20 +1 @@
-<script src="{url file='/tinymce/tinymce.min.js'}"></script>
+{include file="include/tinymce_init.tpl"}
-
-<script>
-    tinymce.init({
-        selector: ".wysiwyg",
-        theme: "modern",
-        menubar : false,
-        language: "",
-        plugins: [
-            "advlist autolink link image lists charmap print preview hr anchor pagebreak",
-            "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
-            "table contextmenu directionality emoticons paste textcolor filemanager"
-        ],
-        toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
-        image_advtab: true ,
-        external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
-        filemanager_title:"{intl l='Files manager'}" ,
-        external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
-    });
-</script>

local/modules/Tinymce/AdminIncludes/product-edit-js.html

@@ -1,20 +1 @@
-<script src="{url file='/tinymce/tinymce.min.js'}"></script>
+{include file="include/tinymce_init.tpl"}
-
-<script>
-    tinymce.init({
-        selector: ".wysiwyg",
-        theme: "modern",
-        menubar : false,
-        language: "",
-        plugins: [
-            "advlist autolink link image lists charmap print preview hr anchor pagebreak",
-            "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
-            "table contextmenu directionality emoticons paste textcolor filemanager"
-        ],
-        toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect | filemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
-        image_advtab: true ,
-        external_filemanager_path:"{url file='/tinymce/plugins/filemanager/'}'",
-        filemanager_title:"{intl l='Files manager'}" ,
-        external_plugins: { "filemanager" : "{url file='/tinymce/plugins/filemanager/plugin.min.js'}"}
-    });
-</script>

local/modules/Tinymce/Listener/VerifyTinymceListener.php

@@ -22,10 +22,12 @@
 /*************************************************************************************/
 
 namespace Tinymce\Listener;
+
 use Symfony\Component\EventDispatcher\Event;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Event\Cache\CacheEvent;
 use Thelia\Core\Thelia;
 
 
@@ -42,10 +44,19 @@ class VerifyTinymceListener implements EventSubscriberInterface
         if(false === file_exists(THELIA_WEB_DIR . '/tinymce')) {
             $fs = new Filesystem();
 
-            $fs->mirror(__DIR__ . '/../Config/tinymce', THELIA_WEB_DIR . '/tinymce');
+            $fs->mirror(__DIR__ . '/../Resources/js/tinymce', THELIA_WEB_DIR . '/tinymce');
         }
     }
 
+    public function clearCache(CacheEvent $event)
+    {
+        $fs = new Filesystem();
+
+        $directory = new \DirectoryIterator(THELIA_WEB_DIR . '/tinymce');
+
+        $fs->remove($directory);
+    }
+
     /**
      * Returns an array of event names this subscriber wants to listen to.
      *
@@ -69,7 +80,8 @@ class VerifyTinymceListener implements EventSubscriberInterface
     public static function getSubscribedEvents()
     {
         return array(
-            TheliaEvents::BOOT => array('verifyTinymce', 128)
+            TheliaEvents::BOOT => array('verifyTinymce', 128),
+            TheliaEvents::CACHE_CLEAR => array("clearCache", 128)
         );
     }
 }

local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/config.php

@@ -1,5 +1,45 @@
 <?php
-session_start();
+use Thelia\Core\HttpKernel\HttpCache\HttpCache;
+use Thelia\Core\Thelia;
+use Thelia\Core\HttpFoundation\Request;
+
+//use Symfony\Component\DependencyInjection;
+
+$env = 'prod';
+require __DIR__ . '/../../../../../core/bootstrap.php';
+
+$request = Request::createFromGlobals();
+
+$thelia = new Thelia("prod", false);
+$thelia->boot();
+
+$httpKernel = $thelia->getContainer()->get('http_kernel');
+
+$httpKernel->getContainer()->enterScope('request');
+$httpKernel->getContainer()->set('request', $request, 'request');
+$httpKernel->initSession($request);
+/** @var \Thelia\Core\Security\SecurityContext $securityContext */
+$securityContext = $httpKernel->getContainer()->get('thelia.securityContext');
+
+$isGranted = $securityContext->isGranted(
+    array('ADMIN'),
+    array(
+        \Thelia\Core\Security\Resource\AdminResources::PRODUCT,
+        \Thelia\Core\Security\Resource\AdminResources::CATEGORY,
+        \Thelia\Core\Security\Resource\AdminResources::FOLDER,
+        \Thelia\Core\Security\Resource\AdminResources::CONTENT,
+    ),
+    array(),
+    array(
+        \Thelia\Core\Security\AccessManager::UPDATE,
+        \Thelia\Core\Security\AccessManager::CREATE,
+    )
+);
+
+if (false === $isGranted) {
+    exit;
+}
+
 
 //------------------------------------------------------------------------------
 // DON'T COPY THIS VARIABLES IN FOLDERS config.php FILES
@@ -19,8 +59,8 @@ session_start();
 //    |   |   |   |- responsivefilemanager
 //    |   |   |   |   |- plugin.min.js
 
-$base_url="http://www.site.com";  // base url (only domain) of site (without final /). If you prefer relative urls leave empty
+$base_url=rtrim(\Thelia\Model\ConfigQuery::read('url_site'), '/');  // base url (only domain) of site (without final /). If you prefer relative urls leave empty
-$upload_dir = '/source/'; // path from base_url to base of upload folder (with start and final /)
+$upload_dir = '/media/'; // path from base_url to base of upload folder (with start and final /)
 $current_path = '../source/'; // relative path from filemanager folder to upload folder (with final /)
 //thumbs folder can't put inside upload folder
 $thumbs_base_path = '../thumbs/'; // relative path from filemanager folder to thumbs folder (with final /)
@@ -93,7 +133,7 @@ $ext=array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allow
 
 /******************
  * AVIARY config
-*******************/
+ *******************/
 $aviary_key="dvh8qudbp6yx2bnp";
 $aviary_secret="m6xaym5q42rpw433";
 $aviary_version=3;
@@ -114,7 +154,7 @@ $hidden_folders = array();
 $hidden_files = array('config.php');
 
 /*******************
- * JAVA upload 
+ * JAVA upload
  *******************/
 $java_upload=true;
 $JAVAMaxSizeUpload=200; //Gb