From f7d8617b0cd9565f7b9891e2a467eec68d5cd45f Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 17 Nov 2011 15:43:23 +0000
Subject: [PATCH]

---
 inc/extranet/Controlleur/class.extranet.url.php | 3 ++-
 inc/ws/DAO/class.ws.dao.document.php            | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 1ccf63278..fb677d7c1 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -159,7 +159,8 @@ class extranetUrl {
 		$res .= '<tr><td>' . __('Code postal') . '</td><td>' . form::field('code_postal', 10, 20, $client->code_postal) . '</td></tr>';
 		$res .= '<tr><td>' . __('Ville') . '</td><td>' . form::field('ville', 30, 128, $client->ville) . '</td></tr>';
 		$res .= '<tr><td>' . __('Pays') . '</td><td>' . form::combo('pays', cubeCountry::getList(), $client->pays) . '</td></tr>';
-		$res .= '<tr><td>' . __('Adresse de facturation') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';
+		$res .= '<tr><td>' . __('Adresse de facturaton') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';
+		$res.='<tr><td>'.__('Site internet').'</td><td>'.form::field('site',30,128,$client->site).'</td></tr>';
 		$res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . '</td><td>' . form::field('tva_intra', 15, 13, $client->tva_intra) . '</td></tr>';
 		$res .= '<tr class="light"><th colspan="2" class="light"><strong>' . __('Fluidbook Workshop') . '</strong></th></tr>';
 		$res .= '<tr class="odd"><td>' . __('Grade') . '</td><td>' . form::combo('ws_grade', array_flip($core->ws_grades), $client->ws_grade) . '</td></tr>';
diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 2fd63fc6e..c1a6e5a3b 100644
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -179,10 +179,12 @@ class wsDAODocument extends commonDAO {
 	public function setLinksFromOldFluidbook($book_id) {
 		$daoBook = new wsDAOBook($this->con);
 		$pages = $daoBook->getPagesOfBook($book_id);
+		fb($pages);
 		$book = $daoBook->selectById($book_id);
 		$width = $book->parametres->width;
 
 		$xml = simplexml_load_file('http://ws.fluidbook.com/books/' . $book_id . '/data/links.xml');
+		echo $xml;
 		$links = $xml->xpath('//oneLink');
 
 		$res = array();
@@ -249,14 +251,14 @@ class wsDAODocument extends commonDAO {
 			}
 			if (isset($lpages[$p])) {
 				$links[$infos['document_id']][$infos['document_page']] = $lpages[$p];
-				// fb($lpages[$p]);
 			}
 		}
 
 		krsort($links);
 
-
-		wsLinks::setDocumentLinks($document_id, json_encode($l), json_encode(array()), 0, 'Import from Fluidbook V1', TIME);
+		foreach($links as $document_id=>$l){
+			wsLinks::setDocumentLinks($document_id, json_encode($l), json_encode(array()), 0, 'Import from Fluidbook V1', TIME);
+		}
 
 		$c = $this->con->openCursor('books');
 		$c->changedate = TIME;
-- 
2.39.5