Merge branch 'develop'

melisplatform · Oct 22, 2021 · 4ff0b7d · 4ff0b7d
2 parents 6f593ae + 744353d
commit 4ff0b7d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 16 deletions.
diff --git a/config/plugins/MelisFrontGdprBannerPlugin.config.php b/config/plugins/MelisFrontGdprBannerPlugin.config.php
@@ -17,7 +17,7 @@
                                 '/MelisFront/plugins/css/plugin.gdprBanner.css',
                             ],
                             'js' => [
-                                '/MelisFront/plugins/js/plugin.melisGdprBanner.init.js',
+                                '/MelisFront/plugins/js/plugin.melisGdprBanner.init.js?v=3',
                             ],
                         ],
                     ],

diff --git a/public/plugins/js/plugin.melisGdprBanner.init.js b/public/plugins/js/plugin.melisGdprBanner.init.js
@@ -30,7 +30,7 @@ window.MelisGdprBanner = (function () {
          * src: https://zellwk.com/blog/looping-through-js-objects/
          */
         options = Object.entries({defaultOptions,options});
-        var updatedCookie = encodeURIComponent(name) + "=" + encodeURIComponent(value);
+        var updatedCookie = encodeURIComponent(name) + "=" + encodeURIComponent(value) + "; SameSite=Lax";
         for (const [key, value] of options) {
             updatedCookie += "; " + key + "=" + value;
         }

diff --git a/public/plugins/js/plugin.melistagHTML.init.js b/public/plugins/js/plugin.melistagHTML.init.js
@@ -3,12 +3,10 @@ function melistagHTML_init(idPlugin) {
 	if (typeof idPlugin === "undefined") idPlugin = null;
 
 	var tinyMceOption = {
-		templates:
-			"/melis/MelisCms/PageEdition/getTinyTemplates?idPage=" +
-			melisActivePageId,
+		templates: "/melis/MelisCms/PageEdition/getTinyTemplates?idPage=" + melisActivePageId
 	};
 
-	if (idPlugin != null) {
+	if ( idPlugin != null ) {
 		tinyMceOption.setup = "melistagHTML_savePlugin";
 	}
 
@@ -28,20 +26,26 @@ function melistagHTML_savePlugin(editor) {
 $("body").on("blur", "div.html-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
+	// var currentdata = $(this).closest(".html-editable").data();
+
+	var pluginDivId = $(this).closest('.html-editable').attr('id');
+
+	var content = tinyMCE.get(pluginDivId).getContent({ format: "html" });
 
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+	// var content = tinyMCE.activeEditor.getContent({ format: "html" });
 
 	var data = {
 		melisPluginName: currentdata.plugin,
 		melisPluginTag: currentdata.melisTag,
 		melisPluginId: currentdata.tagId,
 		tagType: currentdata.tagType,
 		tagId: currentdata.tagId,
-		tagValue: content,
+		tagValue: content
 	};
+
 	melisPluginEdition.calcFrameHeight();
 	melisPluginEdition.savePluginUpdate(data, currentdata.siteModule);
 });
 
-melistagHTML_init();
+melistagHTML_init();
diff --git a/public/plugins/js/plugin.melistagMEDIA.init.js b/public/plugins/js/plugin.melistagMEDIA.init.js
@@ -28,9 +28,14 @@ function melistagMEDIA_savePlugin(editor) {
 $("body").on("blur", "div.media-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
+	// var currentdata = $(this).closest(".html-editable").data();
+
+	var pluginDivId = $(this).closest('.media-editable').attr('id');
+
+	var content = tinyMCE.get(pluginDivId).getContent({ format: "html" });
 
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+	// var content = tinyMCE.activeEditor.getContent({ format: "html" });
 
 	var data = {
 		melisPluginName: currentdata.plugin,

diff --git a/public/plugins/js/plugin.melistagTEXTAREA.init.js b/public/plugins/js/plugin.melistagTEXTAREA.init.js
@@ -28,9 +28,14 @@ function melistagTEXTAREA_savePlugin(editor) {
 $("body").on("blur", "div.textarea-editable", function() {
 	// get all data-attributes from the clicked
 	var currentdata = $(this).data();
+	// var currentdata = $(this).closest(".html-editable").data();
+
+	var pluginDivId = $(this).closest('.textarea-editable').attr('id');
+
+	var content = tinyMCE.get(pluginDivId).getContent({ format: "html" });
 
 	// get the content of the active tinyMCE editor.
-	var content = tinyMCE.activeEditor.getContent({ format: "html" });
+	// var content = tinyMCE.activeEditor.getContent({ format: "html" });
 
 	var data = {
 		melisPluginName: currentdata.plugin,

diff --git a/src/Controller/Plugin/MelisFrontTagPlugin.php b/src/Controller/Plugin/MelisFrontTagPlugin.php
@@ -132,9 +132,11 @@ public function back()
 
     public function loadDbXmlToPluginConfig()
     {
+
         $configValues = array();
 
         $xml = simplexml_load_string($this->pluginXmlDbValue);
+
         if ($xml)
         {
             $type = isset($this->pluginFrontConfig['type']) ? $this->pluginFrontConfig['type'] : 'html';
@@ -179,11 +181,11 @@ public function savePluginConfigToXml($parameters)
     }
 
     private function getWidths()
-    {
+    {       
         // Create an array with the variables that will be available in the view
-        $this->pluginFrontConfig['widthDesktop'] = isset($this->widthDesktop[0]) ? $this->widthDesktop[0] : 100;
-        $this->pluginFrontConfig['widthTablet']  = isset($this->widthTablet[0])  ? $this->widthTablet[0]  : 100;
-        $this->pluginFrontConfig['widthMobile']  = isset($this->widthMobile[0])  ? $this->widthMobile[0]  : 100;
+        $this->pluginFrontConfig['widthDesktop'] = (is_array($this->widthDesktop) && isset($this->widthDesktop[0])) ? $this->widthDesktop[0] : 100;
+        $this->pluginFrontConfig['widthTablet']  = (is_array($this->widthTablet) && isset($this->widthTablet[0]))  ? $this->widthTablet[0]  : 100;
+        $this->pluginFrontConfig['widthMobile']  = (is_array($this->widthMobile) && isset($this->widthMobile[0]))  ? $this->widthMobile[0]  : 100;
         $this->pluginFrontConfig['pluginContainerId']  = isset($this->pluginContainerId[0])  ? $this->pluginContainerId[0] : null;
     }
 

diff --git a/src/Service/MelisSiteConfigService.php b/src/Service/MelisSiteConfigService.php
@@ -243,7 +243,7 @@ public function getSiteConfig($siteId, $returnAll = false)
 
                     if (!empty($dbConfigData)) {
                         foreach ($dbConfigData as $dbConf) {
-                            if ($dbConf['sconf_lang_id'] === '-1') {
+                            if ($dbConf['sconf_lang_id'] == '-1') {
                                 $siteConfig = ArrayUtils::merge(
                                     $siteConfig,
                                     [