(no commit message)

diff --git a/.htaccess b/.htaccess
index 8e945aca9695661301f05f6d362a749d25646e7d..a950c2c9657e21519197bd990f075cc397da6b39 100644 (file)
--- 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]\r
 \r
        RewriteRule ^viewerh([ai])/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5$1/$2/$5 [L]\r
-       \r
 </IfModule>
\ No newline at end of file

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index 85c4d4b529f12dd0b9e4844a3e9ec3267048ed9e..537c94bd8fd933e23213b2d699bfe3e4d7a3e9c2 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -1,4 +1,5 @@
 var _GET = parseGet();\r
+var _openedWindows = {};\r
 \r
 function getWmode() {\r
        if (_GET['wmode'] != undefined) {\r
@@ -70,8 +71,23 @@ function popupFS(page) {
 }\r
 \r
 function popupFocus(url, target) {\r
-       var opened = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');\r
-       opened.focus();\r
+       var openedw;\r
+       if (target.substr(0, 1) == '_') {\r
+               openedw = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');\r
+       } else {\r
+               if (_openedWindows[target] != undefined && _openedWindows[target] != null) {\r
+                       openedw = _openedWindows[target];\r
+                       openedw.location = url;\r
+               } else {\r
+                       openedw = window.open(url, target, 'width=' + screen.width + ',height=' + screen.height + ',resizable=yes');\r
+                       _openedWindows[target] = openedw;\r
+               }\r
+       }\r
+\r
+\r
+\r
+\r
+       openedw.focus();\r
 }\r
 \r
 function getCookieVal(offset)\r

diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html
index 61c2895052dbb4cfc8a54c5faf0185e3b974b462..cf1ec213427df0c8845e64317e45037e2bff027c 100644 (file)
--- 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>\r
                <script type="text/javascript" src="$spfluidbook.js?junk=$junk"></script>\r
                <script type="text/javascript">\r
-                       FB_DEFAULT_LANG='$lang';\r
-                       var backgroundColor="$bgcolor";\r
-                       if(isMobile()){\r
+                       FB_DEFAULT_LANG = '$lang';\r
+                       var backgroundColor = "$bgcolor";\r
+                       if (isMobile()) {\r
                                $redirectMobile\r
-                       }else if(isBadMobile()){\r
+                       } else if (isBadMobile()) {\r
                                $redirectPDF\r
-                       }else{\r
-                               swfobject.embedSWF("$pathToIndex?junk=$junk", "fluidbook", "100%", "100%", "$flashversion","",getFlashvars($junk,$fv),{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#"+getBackgroundColor()});\r
+                       } else {\r
+                               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()});\r
                        }\r
                </script>\r
                $ga\r

diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index fef184b0ab0f23b5e6405de47ac2fe18be5a4e5a..b4725a8db0a2291d521df617f88fda2e8d300867 100644 (file)
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -497,7 +497,7 @@ class extranetAjax {
                $liste[] = 'output';\r
                $liste[] = ROOT . '/factures/print_' . $core->user->utilisateur_id . '_' . TIME . '.pdf';\r
 \r
-               $pdftk = new cubeCommandLine('/usr/local/bin/pdftk');\r
+               $pdftk = new cubeCommandLine('pdftk');\r
                $pdftk->setManualArg(implode(' ', $liste));\r
                $pdftk->execute();\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index c651a7ef3056783e8304312580196358862deff2..fe2a8b26431e332cc961ef403ef526f84e0464d2 100644 (file)
--- 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";\r
                $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "' . $flashVersion . '",';\r
                $res .= '"", ' . json_encode($fv) . ',';\r
-               $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';\r
+               $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true","allowFullScreenInteractive":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';\r
                $res .= ');' . "\n";\r
                $res.='}' . "\n";\r
                $res .= '</script>';\r