From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 21 Jun 2011 10:18:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=9bb559aa3e403e8a6ebece557fe872c0b9d2cf8c;p=cubeextranet.git

---

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index f529c4258..fb24921f0 100644
--- 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)) {
 				$xml = simplexml_load_file($referencesFile);
 				$i = 0;
+				$allref=array();
 				foreach ($xml->item as $item) {
 					$ref = (string) $item['reference'];
+					if(isset($allref[$ref])){
+						continue;
+					}
+					$allref[$ref]=true;
 					foreach ($formats as $f) {
 						$refimage = $workingDir . 'commerce/' . $ref . '.' . $f;
 						if (file_exists($refimage)) {
-							$flex->addBitmap($refimage, "basket_image_" + $ref);
+							$flex->addBitmap($refimage, "basket_image_". $ref);
 							break;
 						}
 					}
 					$i++;
 				}
 			}
-			$flex->addVariable('basketReferences', $xml->asXML(),false,true, "XML");
+			$flex->addVariable('basketReferences', cubeXML::condense($xml->asXML()),false,true, "String");
 		}
 		// Fonts
 		$flex->addFont(FONT_PATH . '/' . $lang->font, 'GeneralFont', $lang->charset);
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index c15fccf03..6d4b8f877 100644
--- 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';
 
 		$basketFilter = new stdClass();
-		$basketFilter->name = __('Liste de produits') . ' (*.xml, *.csv)';
-		$basketFilter->extensions = '*.xml;*.csv';
+		$basketFilter->name = __('Liste de produits') . ' (*.xml)';
+		$basketFilter->extensions = '*.xml';
 
 		$imageFilter = new stdClass();
 		$imageFilter->name = __('Images') . ' (*.jpg, *.png)';