From 25cdb32d068d07de09019d1f5e05d7643311930c Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 19 Aug 2014 15:06:43 +0000
Subject: [PATCH]

---
 inc/ws/Controlleur/class.ws.services.php | 6 ++++++
 inc/ws/Controlleur/class.ws.url.php      | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index d15fb17bd..327071400 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -749,6 +749,12 @@ class wsServices extends cubeFlashGateway {
 				foreach ($langs as $lang) {
 					$langsnames[$lang] = cubeLang::getNameByCode($lang);
 					$contents[$lang]['apropos'] = $w2h->transform($contents[$lang]['apropos']);
+					if (isset($collection->theme['ad_' . $lang])) {
+						$ad = WS_COLLECTIONS . '/working/' . $id . '/' . $collection->theme['ad_' . $lang];
+						if (file_exists($ad)) {
+							$contents[$lang]['ad'] = base64_encode(file_get_contents($ad));
+						}
+					}
 				}
 
 
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index dbb36658f..3138295ad 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -297,11 +297,11 @@ class wsUrl {
 			$res.='<tr><td class="min nowrap">' . __('A propos') . '</td><td>' . form::textarea(array('contents[' . $l . '][apropos]', 'contents_' . $l . '_apropos'), 60, 10, $collection->contents[$l]['apropos']) . '</td></tr>';
 			//'splash' =>
 			$res.='<tr><td class="min nowrap">' . __('Ecran de lancement') . ' (2048x2048px)</td><td><input type="file" name="splash_' . $l . '" />' . form::hidden(array('theme[splash_' . $l . ']', 'splash_' . $l), $collection->theme['splash_' . $l]) . '</td></tr>';
+			$res.='<tr><td class="min nowrap">' . __('Panneau publicité') . ' (2048x2048px)</td><td><input type="file" name="ad_' . $l . '" />' . form::hidden(array('theme[ad_' . $l . ']', 'ad_' . $l), $collection->theme['ad_' . $l]) . '</td></tr>';
+			$res.='<tr><td class="min nowrap">' . __('Lien publicité') . '</td><td>' . form::field(array('contents[' . $l . '][adlink]', 'adlink_' . $l), 64, 64, $collection->contents[$l]['adlink']) . '</td></tr>';
 			$res.='</table>';
 		}
 
-		$v = wsHTML5Compiler::getPhonegapVersions();
-		$phonegapVersions = array_combine($v, $v);
 
 		$res.='<h3>' . __('Paramètres avancés') . '</h3>';
 		$res.='<table class="max">';
@@ -309,7 +309,6 @@ class wsUrl {
 		$res.='<tr><td class="min nowrap">' . __('Build') . '</td><td>' . form::field(array('settings[build]', 'build'), 10, 64, $collection->settings['build']) . '</td></tr>';
 		$res.='<tr><td class="min nowrap">' . __('Version') . '</td><td>' . form::field(array('settings[version]', 'version'), 10, 64, $collection->settings['version']) . '</td></tr>';
 		$res.='<tr><td class="min nowrap">' . __('Full offline') . '</td><td>' . form::checkbox(array('settings[offline]', 'offline'), 1, $collection->settings['offline']) . '</td></tr>';
-		$res.='<tr><td class="min nowrap">' . __('Version phonegap') . '</td><td>' . form::combo(array('settings[phonegap]', 'phonegap'), $phonegapVersions, $collection->settings['phonegap']) . '</td></tr>';
 		$res.='<tr><td class="min nowrap">' . __('Identifiant de l\'application') . '</td><td>' . form::field(array('settings[namespace]', 'namespace'), 64, 64, $collection->settings['namespace']) . '</td></tr>';
 		$res.='<tr><td class="min nowrap">' . __('Certificat APNS') . ' Dev (' . __('Fichier .pem') . ')</td><td><input type="file" name="apns_dev" /></td></tr>';
 		$res.='<tr><td class="min nowrap">' . __('Certificat APNS') . ' Prod (' . __('Fichier .pem') . ')</td><td><input type="file" name="apns_prod" /></td></tr>';
@@ -2084,5 +2083,3 @@ html{height:100%}' . "\n";
 	}
 
 }
-
-?>
\ No newline at end of file
-- 
2.39.5