From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 5 Mar 2012 14:19:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ca431bf9de144bf6771d74adb8886eb04a6247fd;p=cubeextranet.git

---

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index a5ab3431e..4e723d7d5 100644
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -17,17 +17,28 @@ function getFlashvars(junk,fv){
 		res=fv;
 	}
 	
+	res=parseGet(res);
+
+	res['junk']=junk;
+	return res;
+}
+
+function parseGet(res){
+	if(res==undefined){
+		res={};
+	}
 	var couples=window.location.search.substr(1).split('&');
 	var couple=new Array();
 	for (var i=0;i<couples.length;i++){
 		couple=couples[i].split('=');
 		res[couple[0]]=couple[1];
 	}
-	res['junk']=junk;
 	return res;
 }
+
 function getLang(){
-	var get=parseGet();
+	var get={};
+	get=parseGet(get);
 	if(get.lang==undefined || get.lang==null || get.lang==''){
 		return FB_DEFAULT_LANG;
 	}
@@ -130,26 +141,26 @@ function wheel(event){
 	if (event.wheelDelta) { /* IE/Opera. */
 		delta = event.wheelDelta/120;
 		/** In Opera 9, delta differs in sign as compared to IE.
-                 */
+	 */
 		if (window.opera)
 			delta = -delta;
 	} else if (event.detail) { /** Mozilla case. */
 		/** In Mozilla, sign of delta is different than in IE.
-                 * Also, delta is multiple of 3.
-                 */
+	 * Also, delta is multiple of 3.
+	 */
 		delta = -event.detail/3;
 	}
 	/** If delta is nonzero, handle it.
-         * Basically, delta is now positive if wheel was scrolled up,
-         * and negative, if wheel was scrolled down.
-         */
+ * Basically, delta is now positive if wheel was scrolled up,
+ * and negative, if wheel was scrolled down.
+ */
 	if (delta){
 		handleWheel(delta);
 	}
 	/** Prevent default actions caused by mouse wheel.
-         * That might be ugly, but we handle scrolls somehow
-         * anyway, so don't bother here..
-         */
+ * That might be ugly, but we handle scrolls somehow
+ * anyway, so don't bother here..
+ */
 	if (event.preventDefault){
 		event.preventDefault();
 	}
@@ -157,8 +168,8 @@ function wheel(event){
 }
 
 /** Initialization code.
- * If you use your own event management code, change it as required.
- */
+* If you use your own event management code, change it as required.
+*/
 if (window.addEventListener){
 	/** DOMMouseScroll is for mozilla. */
 	window.addEventListener('DOMMouseScroll', wheel, false);
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c2527a117..d31f459c7 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -129,7 +129,11 @@ class wsUrl {
 				if ($droits->admin) {
 					$res .= '<td class="bouton"><a href="#" class="openContextMenu" rel="' . $context_view_id . '" rev="' . $book->book_id . '§' . $book->hash . '">' . $btVoir . '</a></td>';
 				} else {
-					$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash . '/">' . $btVoir . '</a></td>';
+					$viewURL = SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash;
+					if ($book->parametres->version == 1) {
+						$viewURL = SITE_PATH . 'viewer1/' . $book->book_id . '_' . $book->hash;
+					}
+					$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="viewer_' . $book->book_id . '" href="' . $viewURL . '/">' . $btVoir . '</a></td>';
 				}
 				$res .= '<td class="bouton"><a class="popupFSBar" rel="toolbar=yes" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '_' . $book->hash . '">' . $btEdit . '</a></td>';
 			} else {