wip #2227 @0:15

diff --git a/.htaccess b/.htaccess
index bd87e9dd3fef8fa2365a0ab2b32b4eb88374f5bb..800f2c9f8d5321a95aa22abfdc945f4f2d6f43c2 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -79,30 +79,8 @@ AddCharset UTF-8 log
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
        RewriteRule ^viewer/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
 \r
-       RewriteRule ^viewer1/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/index.html$ viewer1/$1_$2_$3/index [L]\r
-       RewriteRule ^viewer1/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
-       RewriteRule ^viewer1/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/finalv1/$1/$4 [L]\r
-\r
-       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.js$ fluidbook/compile/fluidbook.js [L]\r
-       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/_standalone/player.swf [L]\r
-       RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/fluidbook.js$ fluidbook/compile/fluidbook.js [L]\r
-       RewriteRule ^viewerp/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/final/$1/$4 [L]\r
-\r
        RewriteRule ^viewerh/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]\r
-\r
-       RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L]\r
-       RewriteRule ^viewerhu/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]\r
-\r
-       RewriteRule ^viewerht/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/js/(.+)$ fluidbook/compile/_html5/js/$4 [L]\r
-       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
+       RewriteRule ^viewers/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5/$1/$4 [L]\r
 \r
        RewriteRule ^fluidbook - [L]\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 01b2a442f7e47f605426e52c9e174db2bb9cf32a..690c89d22ca49767a2782664335bf51e70414f39 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1038,28 +1038,50 @@ html{height:100%}' . "\n";
                return wsStats::display($bid . '_' . $hash, $annee, $mois);
        }
 
-       public static function viewerp($args)
+       public static function viewerh($args)
        {
-               commonDroits::min(5);
+               global $core;
 
                $args = cubePage::getArgs($args);
 
-
                $e = explode('_', $args[0]);
-               if (count($e) == 2 || $e[2] < TIME - 10) {
-                       $e[2] = TIME;
-                       http::redirect(SITE_PATH . 'viewerp/' . implode('_', $e) . '/');
-                       exit;
-               }
 
                $book_id = $e[0];
+               $hash = $e[1];
 
-               self::checkDocumentVersionOfBook($book_id);
+               $dao = new wsDAOBook($core->con);
+
+               $book = $dao->selectById($book_id);
+               if ($hash != 'bcf26f9cf4a795ec00b9a44f42750d58' && $book->hash != $hash) {
+                       commonDroits::error();
+               }
 
-               echo self::commonViewer($book_id, $e[1], true);
+               if (!wsDroits::admin()) {
+                       if ($book->parametres->redirectDemo != '') {
+                               http::redirect($book->parametres->redirectDemo);
+                               exit;
+                       }
+                       if ($book->parametres->disableDemo) {
+                               commonDroits::error();
+                       }
+               }
+
+               $dao->compile($book_id, 'html5');
+               $time = self::getHTML5CacheTime($book_id);
+
+               if (count($e) == 2 || $e[2] <= $time - 10) {
+                       $e[2] = $time;
+                       http::redirect(SITE_PATH . 'viewerh/' . implode('_', $e) . '/index.html');
+                       exit;
+               }
+
+               $book_id = $e[0];
+               $hash = $e[1];
+               self::commonHTML5Viewer($book_id, $hash);
        }
 
-       public static function viewerh($args)
+
+       public static function viewers($args)
        {
                global $core;
 
@@ -1092,7 +1114,7 @@ html{height:100%}' . "\n";
 
                if (count($e) == 2 || $e[2] <= $time - 10) {
                        $e[2] = $time;
-                       http::redirect(SITE_PATH . 'viewerh/' . implode('_', $e) . '/index.html');
+                       http::redirect(SITE_PATH . 'viewers/' . implode('_', $e) . '/index.html');
                        exit;
                }
 
@@ -1101,6 +1123,7 @@ html{height:100%}' . "\n";
                self::commonHTML5Viewer($book_id, $hash);
        }
 
+
        public static function getHTML5CacheTime($book_id)
        {
                $cacheFile = WS_BOOKS . '/html5/' . $book_id . '/cache.appcache';
@@ -1118,10 +1141,6 @@ html{height:100%}' . "\n";
                $dao = new wsDAOBook($core->con);
 
                $dir = '';
-               if ($version == 'a') {
-                       $version = '';
-                       $dir = 'a';
-               }
 
                $book = $dao->selectById($book_id);
                if ($hash != 'bcf26f9cf4a795ec00b9a44f42750d58' && $book->hash != $hash) {
@@ -1145,31 +1164,6 @@ html{height:100%}' . "\n";
                exit;
        }
 
-       public static function viewer1($args)
-       {
-               $args = cubePage::getArgs($args);
-
-               $wmode = isset($args[1]) ? $args[1] : '';
-
-               $e = explode('_', $args[0]);
-
-               $newurl = null;
-               if (count($e) == 2 || $e[2] < TIME - 10) {
-                       $e[2] = TIME;
-                       http::redirect(SITE_PATH . 'viewer1/' . implode('_', $e) . '/' . $wmode);
-                       exit;
-               }
-
-               $book_id = $e[0];
-
-               $wmode = $wmode != '' ? $wmode : 'default';
-
-               self::checkDocumentVersionOfBook($book_id);
-               wsSecureSWF::checkProtectedSWF();
-
-               echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl, '1');
-       }
-
        public static function viewer($args)
        {
                $args = cubePage::getArgs($args);

diff --git a/inc/ws/prepend.php b/inc/ws/prepend.php
index 19d8a0c0dc8d797b733c15a81fc5f319d93cc791..d1fd8caa1b123edadbebf06216a07507c3b90069 100644 (file)
--- a/inc/ws/prepend.php
+++ b/inc/ws/prepend.php
@@ -7,14 +7,8 @@ $core->url->register('maintenance', 'maintenance', '^maintenance(.*)$', array('w
 $core->url->register('editor', 'editor', '^editor/(.*)$', array('wsUrl', 'editor'));
 $core->url->register('restoreLinks', 'restoreLinks', '^restoreLinks/(.*)$', array('wsUrl', 'restoreLinks'));
 $core->url->register('viewer', 'viewer', '^viewer/(.*)$', array('wsUrl', 'viewer'));
-$core->url->register('viewer1', 'viewer1', '^viewer1/(.*)$', array('wsUrl', 'viewer1'));
-$core->url->register('vieweru', 'vieweru', '^vieweru/(.*)$', array('wsUrl', 'vieweru'));
-$core->url->register('viewerp', 'viewerp', '^viewerp/(.*)$', array('wsUrl', 'viewerp'));
 $core->url->register('viewerh', 'viewerh', '^viewerh/(.*)$', array('wsUrl', 'viewerh'));
-$core->url->register('viewerhu', 'viewerhu', '^viewerhu/(.*)$', array('wsUrl', 'viewerhu'));
-$core->url->register('viewerht', 'viewerht', '^viewerht/(.*)$', array('wsUrl', 'viewerht'));
-$core->url->register('viewerha', 'viewerha', '^viewerha/(.*)$', array('wsUrl', 'viewerha'));
-$core->url->register('viewerhi', 'viewerhi', '^viewerhi/(.*)$', array('wsUrl', 'viewerhi'));
+$core->url->register('viewers', 'viewers', '^viewers/(.*)$', array('wsUrl', 'viewers'));
 
 if (DEV) {
        $tools = ROOT . '/../inc/tools/';
@@ -22,5 +16,4 @@ if (DEV) {
        cubePHP::appendEnv('PATH', $tools . 'gs8.70/bin/');
        cubePHP::appendEnv('PATH', $tools . 'gs8.70/lib/');
        cubePHP::setEnv('GS_FONTPATH', FONT_PATH);
-}
-?>
+}
\ No newline at end of file