From 35ffd817f4b64bc9ca7d6b2fe1baa7343c8f2030 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 10 Feb 2015 12:59:53 +0000 Subject: [PATCH] Move some V1 features to V2 Disable v1 --- .htaccess | 5 ++++- inc/ws/Controlleur/class.ws.url.php | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 63f7827fb..e6f61a842 100644 --- a/.htaccess +++ b/.htaccess @@ -32,7 +32,8 @@ AddCharset UTF-8 log RewriteEngine on RewriteBase / - RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com + RewriteCond %{HTTP_HOST} www.workshop.fluidbook.com [OR] + RewriteCond %{HTTP_HOST} ws.fluidbook.com RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301,L] # Favicon @@ -42,6 +43,8 @@ AddCharset UTF-8 log RewriteCond %{HTTP_HOST} fluidbook RewriteRule ^favicon.ico$ images/ws/favicon.ico [L] + RewriteRule ^voir_book/(.*)$ viewer1/$1 [L,R=301] + RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L] RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L] RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L] diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 2769c450c..fa9c637e0 100644 --- 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'); } -- 2.39.5