From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 21 Feb 2013 12:44:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=4b65c165090dd62ffeccb3e968dde690a0355ea8;p=cubeextranet.git

---

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 3b62e137b..43aeb626e 100644
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -341,7 +341,7 @@ class wsServices extends cubeFlashGateway {
 		$dao = new wsDAOBook($core->con);
 		if (isset($this->args['cid'])) {
 			$book = $dao->selectByCid($this->args['cid']);
-		} else if ($this->args['id'] >= 11202) {
+		} else if ($this->args['id'] < 11202) {
 			$book = $dao->selectById($this->args['id']);
 		}
 
@@ -371,7 +371,7 @@ class wsServices extends cubeFlashGateway {
 	}
 
 	public function grdfValidForm() {
-		$notempty = array('civilite', 'prenom', 'nom', 'email', 'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');
+		$notempty = array('civilite', 'prenom', 'nom',  'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');
 		$error = false;
 		$errors = array();
 		foreach ($notempty as $f) {
@@ -381,10 +381,10 @@ class wsServices extends cubeFlashGateway {
 			}
 		}
 
-		if (!cubeMail::isEmail($this->args['email'])) {
+		/*if (!cubeMail::isEmail($this->args['email'])) {
 			$error = true;
 			$errors[] = 'email_valid';
-		}
+		} */
 
 		$this->xml->addChild('ok', $error ? '0' : '1');
 		$this->xml->addChild('errors', implode(',', $errors));
@@ -413,7 +413,7 @@ class wsServices extends cubeFlashGateway {
 		}
 		$datas['date'] = TIME;
 
-		$c = $core->con->openCursor('grdf');
+		$c = $core->con->openCursor('grdf2013');
 		$c->datas = json_encode($datas);
 		$c->insert();
 
@@ -423,7 +423,7 @@ class wsServices extends cubeFlashGateway {
 
 	public function grdfCoupon() {
 		$this->outputXML = false;
-		$couponsRoot = WS_BOOKS . '/working/10828/commerce/';
+		$couponsRoot = WS_BOOKS . '/working/11222/commerce/';
 
 		$xml = simplexml_load_file($couponsRoot . 'references.xml');
 		// Check hash
@@ -461,7 +461,7 @@ class wsServices extends cubeFlashGateway {
 		$this->outputXML = false;
 
 
-		$couponsRoot = WS_BOOKS . '/working/10828/commerce/';
+		$couponsRoot = WS_BOOKS . '/working/11222/commerce/';
 
 		$xml = simplexml_load_file($couponsRoot . 'references.xml');
 
@@ -485,7 +485,7 @@ class wsServices extends cubeFlashGateway {
 		}
 		$h.='</tr>';
 
-		$r = $core->con->select('SELECT * FROM grdf');
+		$r = $core->con->select('SELECT * FROM grdf2013');
 		while ($r->fetch()) {
 			$d = json_decode($r->datas);
 			$rl = explode(',', $d->reflist);
diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index b48666afc..b4efdf33d 100644
--- a/inc/ws/Metier/class.ws.book.parametres.php
+++ b/inc/ws/Metier/class.ws.book.parametres.php
@@ -115,8 +115,9 @@ class wsBookParametres extends wsParametres {
 		$this->fields['helpBookmarks'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Améliorer l'aide des marques-pages"));
 		$this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));
 		$this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));
+		$this->fields['helpArrowTooltip'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Bulle affichée au niveau de la flèche de droite'), 'grade' => 5);
 		$this->forms['help'] = array('label' => __('Aide'),
-			'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks'));
+			'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks','|','helpArrowTooltip'));
 		// .
 		// 		
 		$this->fields['indexAutoScroll'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le scroll automatique'));
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 5ab098daa..ae53e94dd 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -752,8 +752,8 @@ class wsHTML5Compiler {
 		foreach ($this->additionalConfig as $k => $v) {
 			$this->config->$k = $v;
 		}
-		if ($this->phonegap) {
-			$this->config->friend = $this->config->twitter = $this->config->facebook = false;
+		if ($this->phonegap && ($this->book->parametres->offlineLink == '' || $this->book->parametres->offlineLink == 'http://')) {
+			$this->config->share = false;
 		}
 
 		$this->config->standalone = $this->standalone;