]> _ Git - cubeextranet.git/commitdiff
projects / cubeextranet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 515e608)
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 20 Jul 2011 15:38:00 +0000 (15:38 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Wed, 20 Jul 2011 15:38:00 +0000 (15:38 +0000)
inc/ws/Controlleur/class.ws.url.php patch | blob | history

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 1fe38b10ffe041afe17f0c0655abf66e57dcbb40..ca88a4bd537324f03424a4cc44f03a40c7d04bb3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -265,7 +265,7 @@ class wsUrl {
 \r
 \r
                $res .= commonPage::bh();\r
-               $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS.'/_html5/js/libs'), $lang_id, null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
+               $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS . '/_html5/js/libs'), $lang_id, null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
                $res .= commonPage::bf();\r
                $res .= '</form>';\r
                return $res;\r
@@ -653,7 +653,7 @@ html{height:100%}' . "\n";
 \r
                self::checkDocumentVersionOfBook($book_id);\r
 \r
-               echo self::commonViewer($book_id, $e[1]);\r
+               echo self::commonViewer($book_id, $e[1], false, 'default', true);\r
        }\r
 \r
        public static function viewer($args) {\r
@@ -679,7 +679,7 @@ html{height:100%}' . "\n";
                echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl);\r
        }\r
 \r
-       public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') {\r
+       public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default', $fps=false) {\r
                if (!defined('MINIMIZE_JS')) {\r
                        define('MINIMIZE_JS', false);\r
                }\r
@@ -723,6 +723,9 @@ html{height:100%}' . "\n";
                if ($standalone) {\r
                        $fv['base'] = $_SERVER['REQUEST_URI'];\r
                }\r
+               if ($fps) {\r
+                       $fv['monitoring'] = '1';\r
+               }\r
 \r
                $res = '<html>';\r
                $res .= '<head>';\r
@@ -746,7 +749,7 @@ html{height:100%}' . "\n";
                $res.="\t" . 'window.location="data/document.pdf"' . "\n";\r
                $res.='} else {' . "\n";\r
                $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",';\r
-               $res .= '"", [],';\r
+               $res .= '"", ' . json_encode($fv) . ',';\r
                $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}';\r
                $res .= ');' . "\n";\r
                $res.='}' . "\n";\r
Unnamed repository; edit this file 'description' to name the repository.