From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 25 Oct 2013 18:45:21 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b93eec0a527639fc938b7608e0a56dd828050d5f;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index faa3ccbec..58ddd9781 100644
--- 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) {
 				$dao->setLinksFromOldFluidbook($book_id);
 			} else {
-				fb($book_id);
 				$dao->setFluidbookLinksFromCSV($book_id);
 			}
 			return;
 		}
 
 
-		$dao->getLinksAndRulers($book_id, $links, $rulers, $time);
-		$xls = $dao->getLinksAsExcel($links, $rulers);
-
-		wsLinks::getLinksFromExcel($xls, $nlinks, $nrulers);
+		wsLinks::getLinksAndRulers($book_id, $links, $rulers, $time);
 
 		$dao = new wsDAODocument($core->con);
-		$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);
+		$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);
 	}
 
 	public static function importLinksAsExcel($args) {
diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 292d5086f..b3e1e3702 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -796,6 +796,25 @@ class wsMaintenance {
 		}
 	}
 
+	public static function correctAutoBookmarkLinks($args) {
+		global $core;
+		$book_id = $args[0];
+		wsLinks::getLinksAndRulers($book_id, $links, $rulers);
+
+
+		$newlinks = array();
+		foreach ($links as $link) {
+			$link['left']-=1;
+			$link['top']+=1;
+			$link['width']+=5;
+			$link['height']+=3;
+			$newlinks[] = $link;
+		}
+
+		$dao = new wsDAODocument($core->con);
+		$dao->setLinksAndRulers($book_id, json_encode($newlinks), json_encode($rulers), 'Autobookmark links correction', $core->user->utilisateur_id);
+	}
+
 }
 
 ?>
\ No newline at end of file