From 3e6f023fdab04b2de4f6d5b548c83c95d3166781 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 23 Jun 2014 14:31:22 +0000 Subject: [PATCH] --- .htaccess | 4 ++-- inc/ws/Controlleur/class.ws.ajax.php | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.htaccess b/.htaccess index 6c3b5295b..63f7827fb 100644 --- a/.htaccess +++ b/.htaccess @@ -42,8 +42,6 @@ AddCharset UTF-8 log RewriteCond %{HTTP_HOST} fluidbook RewriteRule ^favicon.ico$ images/ws/favicon.ico [L] - - 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] @@ -80,6 +78,8 @@ AddCharset UTF-8 log RewriteRule ^viewerh([ai])/([0-9]+)_([0-9a-fA-F]+)_([0-9]+)/(.+)$ fluidbook/books/html5$1/$2/$5 [L] + RewriteRule ^fluidbook - [L] + # Ignore static files or directories RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php index 1064da257..abf14eca2 100644 --- 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 = ''; $c->insert(); + self::cleanCachesCollection($id); + $x->addReload(); } @@ -1106,13 +1108,13 @@ class wsAjax extends cubeAjax { $c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND compile_date=\'' . $core->con->escape($version) . '\''); } - self::cleanCachesCollection($id, $os); + self::cleanCachesCollection($id); $x->addReload(); } - protected static function cleanCachesCollection($id, $os) { - $ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $os . '.*'; + protected static function cleanCachesCollection($id) { + $ff = WS_COLLECTIONS . '/ws/' . $id . '.*'; `rm $ff`; } @@ -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) . '\''); } $x->addReload(); + + self::cleanCachesCollection($id); } } -- 2.39.5