(no commit message)

diff --git a/.htaccess b/.htaccess
index 6c3b5295bc0b80e2e0242530340ff404cc29ba9c..63f7827fbc52dc9685455ebe2c47be5876e7449b 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -42,8 +42,6 @@ AddCharset UTF-8 log
        RewriteCond %{HTTP_HOST} fluidbook\r
        RewriteRule ^favicon.ico$ images/ws/favicon.ico [L]\r
 \r
-\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
@@ -80,6 +78,8 @@ AddCharset UTF-8 log
 \r
        RewriteRule ^viewerh([ai])/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5$1/$2/$5 [L]\r
 \r
+       RewriteRule ^fluidbook - [L]\r
+\r
        # Ignore static files or directories\r
        RewriteCond %{REQUEST_FILENAME} -s [OR]\r
        RewriteCond %{REQUEST_FILENAME} -l [OR]\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 1064da257d03a0fcd2002f2960f9d99f9c06e64a..abf14eca2c91ac2a0eaea692cdb95f1c33bd4542 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -1090,6 +1090,8 @@ class wsAjax extends cubeAjax {
                $c->online_android = '';\r
                $c->insert();\r
 \r
+               self::cleanCachesCollection($id);\r
+\r
                $x->addReload();\r
        }\r
 \r
@@ -1106,13 +1108,13 @@ class wsAjax extends cubeAjax {
                        $c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND compile_date=\'' . $core->con->escape($version) . '\'');\r
                }\r
 \r
-               self::cleanCachesCollection($id, $os);\r
+               self::cleanCachesCollection($id);\r
 \r
                $x->addReload();\r
        }\r
 \r
-       protected static function cleanCachesCollection($id, $os) {\r
-               $ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $os . '.*';\r
+       protected static function cleanCachesCollection($id) {\r
+               $ff = WS_COLLECTIONS . '/ws/' . $id . '.*';\r
                `rm $ff`;\r
        }\r
 \r
@@ -1128,6 +1130,8 @@ class wsAjax extends cubeAjax {
                        $core->con->execute('DELETE FROM book_collection_compile WHERE collection_id=\'' . $core->con->escape($id) . '\' AND compile_date=\'' . $core->con->escape($date) . '\'');\r
                }\r
                $x->addReload();\r
+\r
+               self::cleanCachesCollection($id);\r
        }\r
 \r
 }\r