From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 11 Apr 2011 13:41:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=033a0d008f1795b912a6d6c034e9eb45584d0410;p=cubeextranet.git

---

diff --git a/.htaccess b/.htaccess
index f54024048..06c506ed7 100644
--- a/.htaccess
+++ b/.htaccess
@@ -33,14 +33,17 @@ AddCharset UTF-8 log
 	RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer/$1_$2_$3/index [L]
 	RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/index.swf [L]
 	RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/player.swf [L]
+	RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]
 	RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]
 
 	RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ vieweru/$1_$2_$3/index [L]
 	RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_unprotected/index.swf [L]
 	RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/_unprotected/player.swf [L]
+	RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]
 	RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]
 
 	RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewerp/$1_$2_$3/index [L]
 	RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_standalone/player.swf [L]
+	RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]
 	RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]
 </IfModule>
\ No newline at end of file
diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index a90526aa1..f887b5991 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -14,7 +14,7 @@ $redirectScript
 <div style="padding:20px;text-align:center;"><a href="http://get.adobe.com/flashplayer/" target="_blank"><img style="border:0;" src="$pathToGetflash" alt="" width="734" height="409" /></a></div>
 <div style="padding:20px;">$alt</div>
 </div>
-<script type="text/javascript">swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),	{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":"gpu","allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});
+<script type="text/javascript">swfobject.embedSWF("$pathToIndex", "fluidbook", "100%", "100%", "10.0.0","", parseGet(),	{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#$bgcolor"});
 </script>
 $ga
 </body>
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 6d1b984a7..4c5f6d734 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -476,7 +476,7 @@ html{height:100%}' . "\n";
 		$res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#000000"}';
 		$res .= ');';
 		$res .= '</script>';
-		$js = array($webcompile . 'fluidbook.js');
+		$js = array('fluidbook.js');
 		$jsvar = array();
 
 		$gacodes = array(GA);