From 670aadd9849a96ef0d62c32941d61a6cfa77cc8c Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 20 Jul 2011 15:38:00 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.url.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 1fe38b10f..ca88a4bd5 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -265,7 +265,7 @@ class wsUrl { $res .= commonPage::bh(); - $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS.'/_html5/js/libs'), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); + $res .= cubeLang::translationForm(array(PLAYER_SOURCES, WS_COMPILE_ASSETS . '/_html5/js/libs'), $lang_id, null, 'liste', array(), '' . $core->typo->Ajouter(__('Enregistrer')) . '', $lang->traductions); $res .= commonPage::bf(); $res .= ''; return $res; @@ -653,7 +653,7 @@ html{height:100%}' . "\n"; self::checkDocumentVersionOfBook($book_id); - echo self::commonViewer($book_id, $e[1]); + echo self::commonViewer($book_id, $e[1], false, 'default', true); } public static function viewer($args) { @@ -679,7 +679,7 @@ html{height:100%}' . "\n"; echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl); } - public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default') { + public static function commonViewer($book_id, $hash, $standalone = false, $wmode = 'default', $fps=false) { if (!defined('MINIMIZE_JS')) { define('MINIMIZE_JS', false); } @@ -723,6 +723,9 @@ html{height:100%}' . "\n"; if ($standalone) { $fv['base'] = $_SERVER['REQUEST_URI']; } + if ($fps) { + $fv['monitoring'] = '1'; + } $res = ''; $res .= ''; @@ -746,7 +749,7 @@ html{height:100%}' . "\n"; $res.="\t" . 'window.location="data/document.pdf"' . "\n"; $res.='} else {' . "\n"; $res .= "\t" . 'swfobject.embedSWF("index.swf", "fluidbook", "100%", "100%", "10.0.22",'; - $res .= '"", [],'; + $res .= '"", ' . json_encode($fv) . ','; $res .= '{"allowScriptAccess":"always","quality":"high","scale":"noscale","wmode":getWmode(),"allowFullScreen":"true"},{"bgcolor":"#' . $theme->parametres->loadingBackColor . '"}'; $res .= ');' . "\n"; $res.='}' . "\n"; -- 2.39.5