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

---

diff --git a/.htaccess b/.htaccess
index 8e945aca9..a950c2c96 100644
--- a/.htaccess
+++ b/.htaccess
@@ -60,5 +60,4 @@ AddCharset UTF-8 log
 	RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]
 
 	RewriteRule ^viewerh([ai])/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5$1/$2/$5 [L]
-	
 </IfModule>
\ No newline at end of file
diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index 85c4d4b52..537c94bd8 100644
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -1,4 +1,5 @@
 var _GET = parseGet();
+var _openedWindows = {};
 
 function getWmode() {
 	if (_GET['wmode'] != undefined) {
@@ -70,8 +71,23 @@ function popupFS(page) {
 }
 
 function popupFocus(url, target) {
-	var opened = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');
-	opened.focus();
+	var openedw;
+	if (target.substr(0, 1) == '_') {
+		openedw = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');
+	} else {
+		if (_openedWindows[target] != undefined && _openedWindows[target] != null) {
+			openedw = _openedWindows[target];
+			openedw.location = url;
+		} else {
+			openedw = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');
+			_openedWindows[target] = openedw;
+		}
+	}
+
+
+
+
+	openedw.focus();
 }
 
 function getCookieVal(offset)
diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 61c289505..cf1ec2134 100644
--- a/fluidbook/compile/index.html
+++ b/fluidbook/compile/index.html
@@ -17,14 +17,14 @@
 		<style type="text/css" media="print">*{ visibility: hidden; display: none }</style>
 		<script type="text/javascript" src="$spfluidbook.js?junk=$junk"></script>
 		<script type="text/javascript">
-			FB_DEFAULT_LANG='$lang';
-			var backgroundColor="$bgcolor";
-			if(isMobile()){
+			FB_DEFAULT_LANG = '$lang';
+			var backgroundColor = "$bgcolor";
+			if (isMobile()) {
 				$redirectMobile
-			}else if(isBadMobile()){
+			} else if (isBadMobile()) {
 				$redirectPDF
-			}else{
-				swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","",getFlashvars($junk,$fv),{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#"+getBackgroundColor()});
+			} else {
+				swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion", "", getFlashvars($junk, $fv), {"allowScriptAccess": "always", "quality": "high", "scale": "noscale", "wmode": getWmode(), "allowFullScreen": "true", 'allowFullScreenInteractive': 'true'}, {"bgcolor": "#" + getBackgroundColor()});
 			}
 		</script>
 		$ga
diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index fef184b0a..b4725a8db 100644
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -497,7 +497,7 @@ class extranetAjax {
 		$liste[] = 'output';
 		$liste[] = ROOT . '/factures/print_' . $core->user->utilisateur_id . '_' . TIME . '.pdf';
 
-		$pdftk = new cubeCommandLine('/usr/local/bin/pdftk');
+		$pdftk = new cubeCommandLine('pdftk');
 		$pdftk->setManualArg(implode(' ', $liste));
 		$pdftk->execute();
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c651a7ef3..fe2a8b264 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -970,7 +970,7 @@ html{height:100%}' . "\n";
 		$res.='} else {' . "\n";
 		$res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "' . $flashVersion . '",';
 		$res .= '"", ' . json_encode($fv) . ',';
-		$res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';
+		$res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true","allowFullScreenInteractive":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';
 		$res .= ');' . "\n";
 		$res.='}' . "\n";
 		$res .= '</script>';