(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index 1ccf63278721492a5cb2f7bec420aa533e82fa8a..fb677d7c16d7bc18c256f48c44f497d253eee2a4 100644 (file)
--- 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>';\r
                $res .= '<tr><td>' . __('Ville') . '</td><td>' . form::field('ville', 30, 128, $client->ville) . '</td></tr>';\r
                $res .= '<tr><td>' . __('Pays') . '</td><td>' . form::combo('pays', cubeCountry::getList(), $client->pays) . '</td></tr>';\r
-               $res .= '<tr><td>' . __('Adresse de facturation') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';\r
+               $res .= '<tr><td>' . __('Adresse de facturaton') . '</td><td>' . form::textarea('adresse_facturation', 40, 3, $client->adresse_facturation) . '</td></tr>';\r
+               $res.='<tr><td>'.__('Site internet').'</td><td>'.form::field('site',30,128,$client->site).'</td></tr>';\r
                $res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . '</td><td>' . form::field('tva_intra', 15, 13, $client->tva_intra) . '</td></tr>';\r
                $res .= '<tr class="light"><th colspan="2" class="light"><strong>' . __('Fluidbook Workshop') . '</strong></th></tr>';\r
                $res .= '<tr class="odd"><td>' . __('Grade') . '</td><td>' . form::combo('ws_grade', array_flip($core->ws_grades), $client->ws_grade) . '</td></tr>';\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index 2fd63fc6e8bb54297613001bf15d55d5078ff8ed..c1a6e5a3b7f558ef3f295c18594251408e7f7be4 100644 (file)
--- 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) {\r
                $daoBook = new wsDAOBook($this->con);\r
                $pages = $daoBook->getPagesOfBook($book_id);\r
+               fb($pages);\r
                $book = $daoBook->selectById($book_id);\r
                $width = $book->parametres->width;\r
 \r
                $xml = simplexml_load_file('http://ws.fluidbook.com/books/' . $book_id . '/data/links.xml');\r
+               echo $xml;\r
                $links = $xml->xpath('//oneLink');\r
 \r
                $res = array();\r
@@ -249,14 +251,14 @@ class wsDAODocument extends commonDAO {
                        }\r
                        if (isset($lpages[$p])) {\r
                                $links[$infos['document_id']][$infos['document_page']] = $lpages[$p];\r
-                               // fb($lpages[$p]);\r
                        }\r
                }\r
 \r
                krsort($links);\r
 \r
-\r
-               wsLinks::setDocumentLinks($document_id, json_encode($l), json_encode(array()), 0, 'Import from Fluidbook V1', TIME);\r
+               foreach($links as $document_id=>$l){\r
+                       wsLinks::setDocumentLinks($document_id, json_encode($l), json_encode(array()), 0, 'Import from Fluidbook V1', TIME);\r
+               }\r
 \r
                $c = $this->con->openCursor('books');\r
                $c->changedate = TIME;\r