wait #3893 @1

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