(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 3b62e137bed63912f88b49203b7b07f7a23dc3b8..43aeb626e1398132cc198e7e8045ea885158f93c 100644 (file)
--- 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);\r
                if (isset($this->args['cid'])) {\r
                        $book = $dao->selectByCid($this->args['cid']);\r
-               } else if ($this->args['id'] >= 11202) {\r
+               } else if ($this->args['id'] < 11202) {\r
                        $book = $dao->selectById($this->args['id']);\r
                }\r
 \r
@@ -371,7 +371,7 @@ class wsServices extends cubeFlashGateway {
        }\r
 \r
        public function grdfValidForm() {\r
-               $notempty = array('civilite', 'prenom', 'nom', 'email', 'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');\r
+               $notempty = array('civilite', 'prenom', 'nom',  'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'echeance');\r
                $error = false;\r
                $errors = array();\r
                foreach ($notempty as $f) {\r
@@ -381,10 +381,10 @@ class wsServices extends cubeFlashGateway {
                        }\r
                }\r
 \r
-               if (!cubeMail::isEmail($this->args['email'])) {\r
+               /*if (!cubeMail::isEmail($this->args['email'])) {\r
                        $error = true;\r
                        $errors[] = 'email_valid';\r
-               }\r
+               } */\r
 \r
                $this->xml->addChild('ok', $error ? '0' : '1');\r
                $this->xml->addChild('errors', implode(',', $errors));\r
@@ -413,7 +413,7 @@ class wsServices extends cubeFlashGateway {
                }\r
                $datas['date'] = TIME;\r
 \r
-               $c = $core->con->openCursor('grdf');\r
+               $c = $core->con->openCursor('grdf2013');\r
                $c->datas = json_encode($datas);\r
                $c->insert();\r
 \r
@@ -423,7 +423,7 @@ class wsServices extends cubeFlashGateway {
 \r
        public function grdfCoupon() {\r
                $this->outputXML = false;\r
-               $couponsRoot = WS_BOOKS . '/working/10828/commerce/';\r
+               $couponsRoot = WS_BOOKS . '/working/11222/commerce/';\r
 \r
                $xml = simplexml_load_file($couponsRoot . 'references.xml');\r
                // Check hash\r
@@ -461,7 +461,7 @@ class wsServices extends cubeFlashGateway {
                $this->outputXML = false;\r
 \r
 \r
-               $couponsRoot = WS_BOOKS . '/working/10828/commerce/';\r
+               $couponsRoot = WS_BOOKS . '/working/11222/commerce/';\r
 \r
                $xml = simplexml_load_file($couponsRoot . 'references.xml');\r
 \r
@@ -485,7 +485,7 @@ class wsServices extends cubeFlashGateway {
                }\r
                $h.='</tr>';\r
 \r
-               $r = $core->con->select('SELECT * FROM grdf');\r
+               $r = $core->con->select('SELECT * FROM grdf2013');\r
                while ($r->fetch()) {\r
                        $d = json_decode($r->datas);\r
                        $rl = explode(',', $d->reflist);\r

diff --git a/inc/ws/Metier/class.ws.book.parametres.php b/inc/ws/Metier/class.ws.book.parametres.php
index b48666afccb0e95c59131f1a31642d70475f6643..b4efdf33d7c8339bcd7aa9c0925dc9361354bb2c 100644 (file)
--- 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"));\r
                $this->fields['helpStartup'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __("Afficher l'aide au démarrage"));\r
                $this->fields['helpStartupTime'] = array('type' => 'integer', 'default' => 15, 'editable' => true, 'label' => __("Temps d'affichage en secondes"));\r
+               $this->fields['helpArrowTooltip'] = array('type' => 'text', 'default' => '', 'editable' => true, 'label' => __('Bulle affichée au niveau de la flèche de droite'), 'grade' => 5);\r
                $this->forms['help'] = array('label' => __('Aide'),\r
-                       'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks'));\r
+                       'fieldsnames' => array('help', '|', 'helpStartup', 'helpStartupTime', '|', 'helpBookmarks','|','helpArrowTooltip'));\r
                // .\r
                //              \r
                $this->fields['indexAutoScroll'] = array('type' => 'boolean', 'default' => false, 'editable' => true, 'label' => __('Activer le scroll automatique'));\r

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 5ab098daa4041a9e0973ae20efbeb346c0351330..ae53e94ddb8408952909a79d54b97d4d9ca8ea02 100644 (file)
--- 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;