(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index faa3ccbecf0dbbd1fa2da7728e7ab8193c7c6acf..58ddd97818b2ec43e51fd2dc732fd4fd4e9c8d35 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -786,20 +786,16 @@ class wsAjax extends cubeAjax {
                        if ($book_id < 10000) {\r
                                $dao->setLinksFromOldFluidbook($book_id);\r
                        } else {\r
-                               fb($book_id);\r
                                $dao->setFluidbookLinksFromCSV($book_id);\r
                        }\r
                        return;\r
                }\r
 \r
 \r
-               $dao->getLinksAndRulers($book_id, $links, $rulers, $time);\r
-               $xls = $dao->getLinksAsExcel($links, $rulers);\r
-\r
-               wsLinks::getLinksFromExcel($xls, $nlinks, $nrulers);\r
+               wsLinks::getLinksAndRulers($book_id, $links, $rulers, $time);\r
 \r
                $dao = new wsDAODocument($core->con);\r
-               $dao->setLinksAndRulers($book_id, json_encode($nlinks), json_encode($nrulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r
+               $dao->setLinksAndRulers($book_id, json_encode($links), json_encode($rulers), 'Restore links from ' . date('Y-m-d H:i:s', $time), $core->user->utilisateur_id);\r
        }\r
 \r
        public static function importLinksAsExcel($args) {\r

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 292d5086f5f86252952bfc398992fd5ba24c4056..b3e1e3702996d32b081eaac9e75b32dc4629b736 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -796,6 +796,25 @@ class wsMaintenance {
                }\r
        }\r
 \r
+       public static function correctAutoBookmarkLinks($args) {\r
+               global $core;\r
+               $book_id = $args[0];\r
+               wsLinks::getLinksAndRulers($book_id, $links, $rulers);\r
+\r
+\r
+               $newlinks = array();\r
+               foreach ($links as $link) {\r
+                       $link['left']-=1;\r
+                       $link['top']+=1;\r
+                       $link['width']+=5;\r
+                       $link['height']+=3;\r
+                       $newlinks[] = $link;\r
+               }\r
+\r
+               $dao = new wsDAODocument($core->con);\r
+               $dao->setLinksAndRulers($book_id, json_encode($newlinks), json_encode($rulers), 'Autobookmark links correction', $core->user->utilisateur_id);\r
+       }\r
+\r
 }\r
 \r
 ?>
\ No newline at end of file