try #953 @0.5

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 7ea78a7842c5673d753771525c15fc972ae24991..a5edbd5955a3faf840fffb9d161c17ecb970e65a 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -304,7 +304,7 @@ class wsDAOBook extends commonDAO {
                }
                if ($r->count() == 1) {
                        $pages = unserialize($r->composition);
-                       if (null===$pages || !count($pages)) {
+                       if (null === $pages || !count($pages)) {
                                return $this->getPagesOfBook($book_id);
                        }
                        return $pages;
@@ -316,14 +316,14 @@ class wsDAOBook extends commonDAO {
                                        return $this->getPagesOfBook($book_id);
                                }
                                $res = unserialize($pages);
-                               if (null===$res || !count($res)) {
+                               if (null === $res || !count($res)) {
                                        return $this->getPagesOfBook($book_id);
                                }
                        }
                        $pages = $r->composition;
                }
                $res = unserialize($pages);
-               if (null===$res || !count($res)) {
+               if (null === $res || !count($res)) {
                        return $this->getPagesOfBook($book_id);
                }
                return $res;
@@ -1088,7 +1088,7 @@ class wsDAOBook extends commonDAO {
 
                foreach ($filesToCopy as $local => $source) {
                        $localPath = $finalDir . $local;
-                       if (!file_exists($localPath) || filemtime($localPath) < filemtime($source) || filesize($localPath) != filesize($source) || filemtime($localPath) < $book->composition_update) {
+                       if (!file_exists($localPath) || filemtime($localPath) != filemtime($source) || filesize($localPath) != filesize($source) || filemtime($localPath) < $book->composition_update) {
                                if (is_dir($source)) {
                                        continue;
                                }
@@ -1286,6 +1286,7 @@ class wsDAOBook extends commonDAO {
                        $baset = wsDocument::getDir($infos['document_id']) . 't' . $infos['document_page'];
                        $swffile = $base . '.swf';
                        if (file_exists($swffile)) {
+                               clearstatcache(true, $swffile);
                                $fsize = filesize($swffile);
                        } else {
                                $fsize = 0;