From 016f645a855aea0e3ce75e826499f3d4156bab54 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 18 Sep 2013 15:21:47 +0000
Subject: [PATCH]

---
 inc/commons/class.common.core.php        |  3 +-
 inc/ws/Controlleur/class.ws.ajax.php     | 36 ++++++++++--------------
 inc/ws/Controlleur/class.ws.services.php |  2 +-
 inc/ws/Controlleur/class.ws.url.php      | 23 +++++++++++----
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 20b53f1b4..63613ed83 100644
--- 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
 		$db->book_collection_compile->collection_id('integer', 0, false);
 		$db->book_collection_compile->compile_date('integer', 0, false);
-		$db->book_collection_compile->online('integer', 0, false);
+		$db->book_collection_compile->online_ios('integer', 0, false);
+		$db->book_collection_compile->online_android('integer', 0, false);
 		$db->book_collection_compile->primary('book_collection_compile', 'collection_id', 'compile_date');
 
 		// Table des notification push
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 242fb8ea2..440e40c26 100644
--- 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');
 		$c->collection_id = $id;
 		$c->compile_date = $time;
-		$c->online = 0;
+		$c->online_ios = 0;
+		$c->online_android = 0;
 		$c->insert();
 
-		if (true) {
-			self::collectionVersionPublish(array('collectionVersionPublish', $id, $time), new cubeAjax());
-		}
-
-		self::cleanCachesCollection($id);
-
 		$x->addReload();
 	}
 
@@ -1106,33 +1101,32 @@ class wsAjax extends cubeAjax {
 
 		$id = $args[1];
 		$date = $args[2];
+		$os = $args[3];
+
+		$online = 'online_' . $os;
 
 		$c = $core->con->openCursor('book_collection_compile');
-		$c->online = 0;
-		$c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND online=1');
+		$c->$online = 0;
+		$c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND '.$online.'=1');
 
 		$c = $core->con->openCursor('book_collection_compile');
-		$c->online = 1;
+		$c->$online = 1;
 		$c->update('WHERE collection_id=\'' . $core->con->escape($id) . '\' AND compile_date=\'' . $core->con->escape($date) . '\'');
 
-
-		self::cleanCachesCollection($id);
+		self::cleanCachesCollection($id, $os);
 
 		$x->addReload();
 	}
 
-	protected static function cleanCachesCollection($id) {
-		$os = array('ios', 'android');
+	protected static function cleanCachesCollection($id, $os) {
 		$files = array('json', 'update');
 		$resolutions = array(150, 300);
 
-		foreach ($os as $_os) {
-			foreach ($files as $f) {
-				foreach ($resolutions as $r) {
-					$ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $_os . '.' . $r . '.' . $f;
-					if (file_exists($ff)) {
-						unlink($ff);
-					}
+		foreach ($files as $f) {
+			foreach ($resolutions as $r) {
+				$ff = WS_COLLECTIONS . '/ws/' . $id . '.' . $os . '.' . $r . '.' . $f;
+				if (file_exists($ff)) {
+					unlink($ff);
 				}
 			}
 		}
diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 0b8505050..4904aa13e 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -618,7 +618,7 @@ class wsServices extends cubeFlashGateway {
 
 		$limit = TIME - 72000;
 		if (!file_exists($cache) || !file_exists($update) || filemtime($cache) < $limit) {
-			$r = $core->con->select('SELECT * FROM book_collection_compile WHERE online=1 AND collection_id=\'' . $core->con->escape($id) . '\'');
+			$r = $core->con->select('SELECT * FROM book_collection_compile WHERE online_'.$os.'=1 AND collection_id=\'' . $core->con->escape($id) . '\'');
 			$r->fetch();
 			$version = $r->compile_date;
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ea96ed2f1..4ffbee104 100644
--- 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');
 		} else {
 			$res.='<table class="max">';
-			$res.='<tr><th class="left">' . __('Date') . '</th><th class="left">' . __('Publiée') . '</th><th class="min nowrap"></th><th class="min nowrap"></th></tr>';
+			$res.='<tr><th class="left">' . __('Date') . '</th><th class="left">iOS</th><th class="left">Android</th><th class="min nowrap"></th></tr>';
 			while ($r->fetch()) {
-				if (!$r->online) {
-					$publish = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '" href="#"><div></div><span>' . __('Publier') . '</span></a>';
+
+				if ($r->online_ios || $r->online_android) {
+					$del = '';
+				} else {
 					$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>';
+				}
+
+				if ($r->online_ios) {
+					$pub_ios = __('Publiée');
 				} else {
-					$publish = '';
-					$del = '';
+					$pub_ios = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '/ios" href="#"><div></div><span>' . __('Publier') . '</span></a>';
+				}
+
+				if ($r->online_android) {
+					$pub_android = __('Publiée');
+				} else {
+					$pub_android = '<a class="ajax download btbook" rel="collectionVersionPublish/' . $r->collection_id . '/' . $r->compile_date . '/android" href="#"><div></div><span>' . __('Publier') . '</span></a>';
 				}
-				$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>';
+				$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>';
 			}
 			$res.='</table>';
 		}
-- 
2.39.5