(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f529c425896ee4e809324971a3d9fd4657a05f32..fb24921f0f4e371ffc303031ecda956ea0f2ebd0 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -720,19 +720,24 @@ class wsDAOBook extends commonDAO {
                        if (file_exists($referencesFile)) {\r
                                $xml = simplexml_load_file($referencesFile);\r
                                $i = 0;\r
+                               $allref=array();\r
                                foreach ($xml->item as $item) {\r
                                        $ref = (string) $item['reference'];\r
+                                       if(isset($allref[$ref])){\r
+                                               continue;\r
+                                       }\r
+                                       $allref[$ref]=true;\r
                                        foreach ($formats as $f) {\r
                                                $refimage = $workingDir . 'commerce/' . $ref . '.' . $f;\r
                                                if (file_exists($refimage)) {\r
-                                                       $flex->addBitmap($refimage, "basket_image_" + $ref);\r
+                                                       $flex->addBitmap($refimage, "basket_image_". $ref);\r
                                                        break;\r
                                                }\r
                                        }\r
                                        $i++;\r
                                }\r
                        }\r
-                       $flex->addVariable('basketReferences', $xml->asXML(),false,true, "XML");\r
+                       $flex->addVariable('basketReferences', cubeXML::condense($xml->asXML()),false,true, "String");\r
                }\r
                // Fonts\r
                $flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index c15fccf038b025be41dd4b01a2efb7496fc2b14d..6d4b8f8778a8d0ef61b4b61008008a5933570da5 100644 (file)
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -109,8 +109,8 @@ class wsBookParametres extends wsParametres {
                $swfFilter->extensions = '*.swf';\r
 \r
                $basketFilter = new stdClass();\r
-               $basketFilter->name = __('Liste de produits') . ' (*.xml, *.csv)';\r
-               $basketFilter->extensions = '*.xml;*.csv';\r
+               $basketFilter->name = __('Liste de produits') . ' (*.xml)';\r
+               $basketFilter->extensions = '*.xml';\r
 \r
                $imageFilter = new stdClass();\r
                $imageFilter->name = __('Images') . ' (*.jpg, *.png)';\r