Move some V1 features to V2

Disable v1

diff --git a/.htaccess b/.htaccess
index 63f7827fbc52dc9685455ebe2c47be5876e7449b..e6f61a842845367d0e597d04d96b3c995e9fbec6 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -32,7 +32,8 @@ AddCharset UTF-8 log
        RewriteEngine on\r
        RewriteBase /\r
 \r
-       RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com\r
+       RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com [OR]\r
+       RewriteCond %{HTTP_HOST} ws.fluidbook.com\r
        RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301,L]\r
 \r
        # Favicon\r
@@ -42,6 +43,8 @@ AddCharset UTF-8 log
        RewriteCond %{HTTP_HOST} fluidbook\r
        RewriteRule ^favicon.ico$ images/ws/favicon.ico [L]\r
 \r
+       RewriteRule ^voir_book/(.*)$ viewer1/$1 [L,R=301]\r
+\r
        RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
        RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L]\r
        RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L]\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 2769c450c72024587ee71c01fde86f476eb732bd..fa9c637e0dc8a6f3f8b8c17f2e1d049b94afb98e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -1182,6 +1182,9 @@ html{height:100%}' . "\n";
 
                $wmode = $wmode != '' ? $wmode : 'default';
 
+               self::checkDocumentVersionOfBook($book_id);
+               wsSecureSWF::checkProtectedSWF();
+
                echo self::commonViewer($book_id, $e[1], false, $wmode, $newurl, '1');
        }