(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index f1ba7167047314de59cbf1593161ab7932f656ec..e2e9d3b1535ae2ee2bd1d8a6aa50df252f0a6dc5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -163,8 +163,19 @@ class wsFlash extends cubeFlashGateway {
                        if ($infos['error']) {\r
                                continue;\r
                        }\r
+\r
+                       if (isset($_POST['dir'])) {\r
+                               $dir = trim($_POST['dir'], '/\\ ');\r
+                       } else {\r
+                               $dir = '';\r
+                       }\r
+\r
+                       if ($dir != '') {\r
+                               $dir = $dir . '/';\r
+                       }\r
+\r
                        $fname = cubeFiles::tidyName($infos['name']);\r
-                       $dir = WS_BOOKS . '/working/' . $this->args['book_id'] . '/';\r
+                       $dir = WS_BOOKS . '/working/' . $this->args['book_id'] . '/' . $dir;\r
                        if (!file_exists($dir)) {\r
                                mkdir($dir, 0777, true);\r
                        }\r
@@ -453,11 +464,11 @@ class wsFlash extends cubeFlashGateway {
 \r
        public function saveLinks() {\r
                global $core;\r
-               \r
-               $comments=isset($this->args['comments'])?$this->args['comments']:'Saved from editor';\r
-               \r
+\r
+               $comments = isset($this->args['comments']) ? $this->args['comments'] : 'Saved from editor';\r
+\r
                $dao = new wsDAODocument($core->con);\r
-               $dao->setLinksAndRulers($this->args['book_id'], $this->args['links'], $this->args['rulers'],$comments,$core->user->utilisateur_id);\r
+               $dao->setLinksAndRulers($this->args['book_id'], $this->args['links'], $this->args['rulers'], $comments, $core->user->utilisateur_id);\r
 \r
                $daoBook = new wsDAOBook($core->con);\r
                $daoBook->setSpecialLinksAndRulers($this->args['book_id'], $this->args['specialLinks'], $this->args['specialRulers']);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index ef4d10bfc9b80f6e5a28048a6bc5ce4a4ec6432b..c15fccf038b025be41dd4b01a2efb7496fc2b14d 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -141,12 +141,12 @@ class wsBookParametres extends wsParametres {
                $this->fields['basket'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Panier activé'), 'grade' => 5);\r
                $this->fields['basketManager'] = array('type' => 'combo', 'default' => 'classic', 'editable' => true, 'label' => __("Manager de panier"),\r
                        'datas' => array(__('Classic') => 'com.fluidbook.player.basket.BasketManager',\r
-                               __('Essilor') => 'com.fluidbook.player.basket.custom.EssilorBasketManager'), 'grade' => 5);\r
+                               __('Essilor') => 'com.fluidbook.player.basket.custom.essilor.EssilorBasketManager'), 'grade' => 5);\r
                $this->fields['basketReferences'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
-                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'));\r
+                       'label' => __('Références produits'), 'grade' => 5, 'fileFilter' => $basketFilter, 'hint' => __('Fichier contenant les références produits'),'dir'=>'commerce');\r
                $this->fields['basketImages'] = array('type' => 'freefile', 'default' => '', 'editable' => true,\r
                        'label' => __('Images des produits'), 'grade' => 5, 'fileFilter' => $imageFilter, 'hint' => __('Chaque image doit avoir pour nom exact la référence du produit'),\r
-                       'multiple' => true);\r
+                       'multiple' => true, 'dir' => 'commerce');\r
 \r
                $this->forms['basket'] = array('label' => __('Panier'),\r
                        'fieldsnames' => array('basket', 'basketManager', 'basketReferences', 'basketImages'));\r