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

---

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 5771be61d..b0c622d41 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -713,6 +713,8 @@ class wsAjax extends cubeAjax {
 	public static function restoreLinksVersion($args, &$x) {
 		global $core;
 
+		set_time_limit(0);
+		
 		$book_id = $args[1];
 		$time = $args[2];
 
@@ -722,7 +724,7 @@ class wsAjax extends cubeAjax {
 
 		self::getLinksFromExcel($xls, $links, $rulers);
 
-
+		
 
 		$dao = new wsDAODocument($core->con);
 		$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);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 9b2ad9027..4968148b1 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -762,6 +762,12 @@ html{height:100%}' . "\n";
 			$meta['og:image'] = 'http://workshop.fluidbook.com/services/facebook_thumbnail?id=' . $book->book_id;
 		}
 
+		if ($book->parametres->mobileVersion == 'pdf') {
+			$redirectMobile = 'window.location="data/document.pdf";';
+		} else {
+			$redirectMobile = 'window.location="/viewerh/' . $book_id . '_' . $hash . '_' . TIME . '/";';
+		}
+
 		$alt = '<div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank">' . cubeMedia::image($webcompile . 'getflash.gif', 734, 409, '') . '</a></div>';
 
 		$res .= '</head>';
@@ -769,7 +775,7 @@ html{height:100%}' . "\n";
 		$res .= '<div id="fluidbook"><div style="width:734px;margin:100px auto;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img src="http://static.workshop.fluidbook.com/fluidbook/compile/getflash.gif" alt="" width="734" height="409"/></a></div></div>';
 		$res .= '<script type="text/javascript">';
 		$res.='if(isMobile()){' . "\n";
-		$res.="\t" . 'window.location="data/document.pdf"' . "\n";
+		$res.="\t" . $redirectMobile . "\n";
 		$res.='} else {' . "\n";
 		$res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",';
 		$res .= '"", ' . json_encode($fv) . ',';
diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index 0391ec9c8..e587f089d 100644
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -42,10 +42,15 @@ class wsLinks {
 		foreach ($links as $l) {
 			$i = 0;
 			foreach ($cols as $id => $label) {
-				if (!is_null($pages) && ($id == 'document_id' || $id == 'document_page')) {
-					$infos = $pages[$l['page']];
-					$value = $infos[$id];
+				if (($id == 'document_id' || $id == 'document_page')) {
+					if (!is_null($pages)) {
+						$infos = $pages[$l['page']];
+						$value = $infos[$id];
+					}else{
+						$value='';
+					}
 				} else {
+
 					if (is_bool($l[$id])) {
 						$l[$id] = $l[$id] ? 1 : 0;
 					}
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index eed282310..ba929d7b0 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -386,9 +386,6 @@ class wsHTML5Compiler {
 				$fontforge->setArg(null, '-');
 				$fontforge->setArg(null, $this->vdir . '/data/style/F' . $index . '.' . $format);
 				$fontforge->execute();
-				
-				fb($fontforge->commande);
-				fb($fontforge->output);
 			}
 		}
 	}