(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 20b53f1b41e6458126d2ed8ba24b416e7f75ee3b..63613ed83fa0c756dab1a255d437e72e8eec05df 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -444,7 +444,8 @@ class commonCore extends cubeCore {
                // Table des compilations de collection\r
                $db->book_collection_compile->collection_id('integer', 0, false);\r
                $db->book_collection_compile->compile_date('integer', 0, false);\r
-               $db->book_collection_compile->online('integer', 0, false);\r
+               $db->book_collection_compile->online_ios('integer', 0, false);\r
+               $db->book_collection_compile->online_android('integer', 0, false);\r
                $db->book_collection_compile->primary('book_collection_compile', 'collection_id', 'compile_date');\r
 \r
                // Table des notification push\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 242fb8ea27a562b7d7f67504afa1ea2d3bdd7f66..440e40c262831ec3ec342914cd8042bd51351645 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -1089,15 +1089,10 @@ class wsAjax extends cubeAjax {
                $c = $core->con->openCursor('book_collection_compile');\r
                $c->collection_id = $id;\r
                $c->compile_date = $time;\r
-               $c->online = 0;\r
+               $c->online_ios = 0;\r
+               $c->online_android = 0;\r
                $c->insert();\r
 \r
-               if (true) {\r
-                       self::collectionVersionPublish(array('collectionVersionPublish', $id, $time), new cubeAjax());\r
-               }\r
-\r
-               self::cleanCachesCollection($id);\r
-\r
                $x->addReload();\r
        }\r
 \r
@@ -1106,33 +1101,32 @@ class wsAjax extends cubeAjax {
 \r
                $id = $args[1];\r
                $date = $args[2];\r
+               $os = $args[3];\r
+\r
+               $online = 'online_' . $os;\r
 \r
                $c = $core->con->openCursor('book_collection_compile');\r
-               $c->online = 0;\r
-               $c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND online=1');\r
+               $c->$online = 0;\r
+               $c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND '.$online.'=1');\r
 \r
                $c = $core->con->openCursor('book_collection_compile');\r
-               $c->online = 1;\r
+               $c->$online = 1;\r
                $c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND compile_date=\'' . $core->con->escape($date) . '\'');\r
 \r
-\r
-               self::cleanCachesCollection($id);\r
+               self::cleanCachesCollection($id, $os);\r
 \r
                $x->addReload();\r
        }\r
 \r
-       protected static function cleanCachesCollection($id) {\r
-               $os = array('ios', 'android');\r
+       protected static function cleanCachesCollection($id, $os) {\r
                $files = array('json', 'update');\r
                $resolutions = array(150, 300);\r
 \r
-               foreach ($os as $_os) {\r
-                       foreach ($files as $f) {\r
-                               foreach ($resolutions as $r) {\r
-                                       $ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $_os . '.' . $r . '.' . $f;\r
-                                       if (file_exists($ff)) {\r
-                                               unlink($ff);\r
-                                       }\r
+               foreach ($files as $f) {\r
+                       foreach ($resolutions as $r) {\r
+                               $ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $os . '.' . $r . '.' . $f;\r
+                               if (file_exists($ff)) {\r
+                                       unlink($ff);\r
                                }\r
                        }\r
                }\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 0b85050500bd80fb35204b55ca190544ad4b3961..4904aa13ebf3ecfa04d1f1a2730932501608e0b3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -618,7 +618,7 @@ class wsServices extends cubeFlashGateway {
 \r
                $limit = TIME - 72000;\r
                if (!file_exists($cache) || !file_exists($update) || filemtime($cache) < $limit) {\r
-                       $r = $core->con->select('SELECT * FROM book_collection_compile WHERE online=1 AND collection_id=\'' . $core->con->escape($id) . '\'');\r
+                       $r = $core->con->select('SELECT * FROM book_collection_compile WHERE online_'.$os.'=1 AND collection_id=\'' . $core->con->escape($id) . '\'');\r
                        $r->fetch();\r
                        $version = $r->compile_date;\r
 \r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ea96ed2f1568f7d9a616a3b386b9cc9cdafe5047..4ffbee104096d0bd8ea5b97d636d31ee6d088609 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -335,16 +335,27 @@ class wsUrl {
                        $res.=__('Aucune version de la collection n\'a été crée');\r
                } else {\r
                        $res.='<table class="max">';\r
-                       $res.='<tr><th class="left">' . __('Date') . '</th><th class="left">' . __('Publiée') . '</th><th class="min nowrap"></th><th class="min nowrap"></th></tr>';\r
+                       $res.='<tr><th class="left">' . __('Date') . '</th><th class="left">iOS</th><th class="left">Android</th><th class="min nowrap"></th></tr>';\r
                        while ($r->fetch()) {\r
-                               if (!$r->online) {\r
-                                       $publish = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '" href="#"><div></div><span>' . __('Publier') . '</span></a>';\r
+\r
+                               if ($r->online_ios || $r->online_android) {\r
+                                       $del = '';\r
+                               } else {\r
                                        $del = '<a class="ajax suppr btbook" rel="collectionVersionDelete/' . $r->collection_id . '/' . $r->compile_date . '" href="#" title="' . __('Êtes-vous certain de vouloir supprimer cette version ?') . '"><div></div><span>' . __('Effacer') . '</span></a>';\r
+                               }\r
+\r
+                               if ($r->online_ios) {\r
+                                       $pub_ios = __('Publiée');\r
                                } else {\r
-                                       $publish = '';\r
-                                       $del = '';\r
+                                       $pub_ios = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '/ios" href="#"><div></div><span>' . __('Publier') . '</span></a>';\r
+                               }\r
+\r
+                               if ($r->online_android) {\r
+                                       $pub_android = __('Publiée');\r
+                               } else {\r
+                                       $pub_android = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '/android" href="#"><div></div><span>' . __('Publier') . '</span></a>';\r
                                }\r
-                               $res.='<tr><td>' . date('Y-m-d H:i:s', $r->compile_date) . '</td><td>' . ($r->online ? __('Oui') : __('Non')) . '</td><td class="min nowrap">' . $publish . '</td><td class="min nowrap">' . $del . '</td></tr>';\r
+                               $res.='<tr><td>' . date('Y-m-d H:i:s', $r->compile_date) . '</td><td>' . $pub_ios . '</td><td>' . $pub_android . '</td><td class="min nowrap">' . $del . '</td></tr>';\r
                        }\r
                        $res.='</table>';\r
                }\r