From: vincent@cubedesigners.com Date: Thu, 17 Feb 2011 20:19:38 +0000 (+0000) Subject: (no commit message) X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b14f45ae0aeb3855fe9d39d910e71228cdd4dad5;p=cubeextranet.git --- diff --git a/.htaccess b/.htaccess index 16e1440da..608ec71a7 100644 --- a/.htaccess +++ b/.htaccess @@ -37,5 +37,5 @@ RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/comp 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/_unprotected/player.swf [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/books/final/$1/$4 [L] \ No newline at end of file diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index c8a1acfb3..7789dc534 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -356,7 +356,7 @@ html{height:100%}' . "\n"; self::checkDocumentVersionOfBook($book_id); - echo self::commonViewer($book_id, $e[1]); + echo self::commonViewer($book_id, $e[1],true); } public static function vieweru($args) @@ -398,7 +398,7 @@ html{height:100%}' . "\n"; echo self::commonViewer($book_id, $e[1]); } - public static function commonViewer($book_id, $hash) + public static function commonViewer($book_id, $hash,$standalone=false) { if (!defined('MINIMIZE_JS')) { define('MINIMIZE_JS', false); @@ -438,6 +438,9 @@ html{height:100%}' . "\n"; $css = $js = array(); $css[] = $webcompile . 'style.css'; $fv = array(); + if($standalone){ + $fv['base']=$_SERVER['REQUEST_URI']; + } $res = ''; $res .= '';