(no commit message)

diff --git a/.htaccess b/.htaccess
index 7deb29f2a4531f8788ee338566a014108cfa3596..16e1440daf83a424f4254b37cfac87970798b03f 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -34,4 +34,8 @@ RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final
 RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ vieweru/$1_$2_$3/index [L]\r
 RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_unprotected/index.swf [L]\r
 RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/player.swf$ fluidbook/compile/_unprotected/player.swf [L]\r
-RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]
\ No newline at end of file
+RewriteRule ^vieweru/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
+\r
+RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewerp/$1_$2_$3/index [L]\r
+RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.swf$ fluidbook/compile/_unprotected/player.swf [L]\r
+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 d12eeb57f703033342a6078f0c1e2a0795732273..e6b1418aa1281af64ecb6d389eba7060d9c67182 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -255,6 +255,26 @@ html{height:100%}' . "\n";
                return wsStats::display($bid, $annee, $mois);\r
        }\r
 \r
+       public static function viewerp($args)\r
+       {\r
+               commonDroits::min(5);\r
+\r
+               $args = cubePage::getArgs($args);\r
+\r
+               $e = explode('_', $args[0]);\r
+               if (count($e) == 2 || $e[2] < TIME-10) {\r
+                       $e[2] = TIME;\r
+                       http::redirect(SITE_PATH . 'viewerp/' . implode('_', $e) . '/');\r
+                       exit;\r
+               }\r
+\r
+               $book_id = $e[0];\r
+\r
+               self::checkDocumentVersionOfBook($book_id);\r
+\r
+               echo self::commonViewer($book_id, $e[1]);\r
+       }\r
+\r
        public static function vieweru($args)\r
        {\r
                commonDroits::min(5);\r
@@ -272,7 +292,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]);\r
        }\r
 \r
        public static function viewer($args)\r
@@ -291,10 +311,10 @@ html{height:100%}' . "\n";
                self::checkDocumentVersionOfBook($book_id);\r
                wsSecureSWF::checkProtectedSWF();\r
 \r
-               echo self::commonViewer($book_id,$e[1]);\r
+               echo self::commonViewer($book_id, $e[1]);\r
        }\r
 \r
-       public static function commonViewer($book_id,$hash)\r
+       public static function commonViewer($book_id, $hash)\r
        {\r
                if (!defined('MINIMIZE_JS')) {\r
                        define('MINIMIZE_JS', false);\r

diff --git a/inc/ws/_common.php b/inc/ws/_common.php
index 391841f952383d36d449fee2eebb514a1be146b9..da8679da753e3ac545723a381109499877634b36 100644 (file)
--- a/inc/ws/_common.php
+++ b/inc/ws/_common.php
@@ -11,6 +11,7 @@ $core->url->register('services', 'services', '^services(.*)$', array('wsServices
 $core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));\r
 $core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer'));\r
 $core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vieweru'));\r
+$core->url->register('viewerp', 'viewerp', '^viewerp/(.*)$', array('wsUrl', 'viewerp'));\r
 \r
 if (DEV) {\r
        $tools = ROOT . '/../inc/tools/';\r