From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 11 Mar 2021 19:05:01 +0000 (+0000)
Subject: wait #3893 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2baa635255c74ce5b9b4f37295f173b669d4492f;p=cubeextranet.git

wait #3893 @1
---

diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 54207c2da..71ad83b0a 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -15,6 +15,7 @@ class wsThemeParametres extends wsParametres
         }
 
         $themeRoot = 'fluidbook/themes/' . $this->parent->theme_id;
+        $uploadThemeURL = SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&amp;' . session_name() . '=' . session_id();
 
         parent::initFields();
 
@@ -173,7 +174,7 @@ class wsThemeParametres extends wsParametres
         $this->fields['backgroundImage'] = array('type' => 'file', 'default' => 'backgroundImg.jpg', 'editable' => true,
             'label' => __('Image de fond'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
+            'uploadURL' => $uploadThemeURL);
         $this->fields['repeat'] = array('type' => 'combo',
             'datas' => array(__('Etirer') => wsTheme::STRETCH,
                 __('Etirer le fond en conservant les proportions') => wsTheme::RATIO,
@@ -206,14 +207,14 @@ class wsThemeParametres extends wsParametres
         $this->fields['menuImage'] = array('type' => 'file', 'default' => 'menu_back.png', 'editable' => true,
             'label' => __('Image de fond'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
+            'uploadURL' => $uploadThemeURL);
         $this->fields['invertMenuPosition'] = array('type' => 'boolean', 'default' => false, 'editable' => true,
             'label' => __("Intervertir le menu et le logo"));
 
         $this->fields['topBar'] = array('type' => 'file', 'default' => '', 'editable' => true,
             'label' => __('Top Bar'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
+            'uploadURL' => $uploadThemeURL);
         $this->fields['topBarAlign'] = array('type' => 'combo',
             'datas' => array(__('Centré') => wsTheme::CENTER,
                 __('Gauche') => wsTheme::LEFT,
@@ -223,7 +224,7 @@ class wsThemeParametres extends wsParametres
         $this->fields['afterSearch'] = array('type' => 'file', 'default' => '', 'editable' => true,
             'label' => __('Image supplémentaire'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id,
+            'uploadURL' => $uploadThemeURL,
             'hint' => __('Image disposée à droite du champ de recherche')
         );
 
@@ -238,26 +239,26 @@ class wsThemeParametres extends wsParametres
         $this->fields['logo'] = array('type' => 'file', 'default' => 'menu_clientLogo.png', 'editable' => true,
             'label' => __('Logo'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
+            'uploadURL' => $uploadThemeURL);
         $this->fields['logoHideWhenOverriden'] = array('type' => 'boolean', 'default' => false, 'editable' => true,
             'label' => __("Cacher le logo lorsqu'il est partiellement masqué par la publication"));
         $this->fields['favicon'] = array('type' => 'file', 'default' => '', 'editable' => true,
             'label' => __('Icone (pour favicon et CD-ROM)'),
             'path' => $themeRoot,
             'fileFilter' => $imageFilter,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&amp;type=favicon',
+            'uploadURL' => $uploadThemeURL . '&amp;type=favicon',
             'hint' => __('Image PNG de 256x256'));
         $this->fields['iosicon'] = array('type' => 'file', 'default' => '', 'editable' => true,
             'label' => __('Icone (pour application iOS)'),
             'path' => $themeRoot,
             'fileFilter' => $imageFilter,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&amp;type=iosicon',
+            'uploadURL' => $uploadThemeURL . '&amp;type=iosicon',
             'hint' => __('Image PNG de 1024x1024'));
         $this->fields['androidicon'] = array('type' => 'file', 'default' => '', 'editable' => true,
             'label' => __('Icone (pour application Android)'),
             'path' => $themeRoot,
             'fileFilter' => $imageFilter,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id . '&amp;type=androidicon',
+            'uploadURL' => $uploadThemeURL . '&amp;type=androidicon',
             'hint' => __('Image PNG de 1024x1024'));
 
         $this->forms['logo'] = array('label' => __('Personnalisation du logo'),
@@ -266,7 +267,7 @@ class wsThemeParametres extends wsParametres
         $this->fields['logoLoader'] = array('type' => 'file', 'default' => 'logoLoader.png', 'editable' => true,
             'label' => __('Logo affiché au chargement'),
             'path' => $themeRoot,
-            'uploadURL' => SITE_PATH . 'flash/uploadThemeFile/?theme_id=' . $this->parent->theme_id);
+            'uploadURL' => $uploadThemeURL);
         $this->fields['couleurL'] = array('type' => 'couleur', 'default' => '', 'editable' => true,
             'label' => __("Couleur principale de la barre de chargement"));
         $this->fields['loadingSecColor'] = array('type' => 'couleur', 'default' => 'ffffff', 'editable' => true,