#484

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 67dad664acf8f58401b78fda0aa4a4aa2f5b8573..2ed8b8c31aba53396ee69c6c6d6f198552a41f64 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -447,9 +447,25 @@ class wsAjax extends cubeAjax {
 
        public static function demandeDevis($args, &$x) {
                global $core;
+
+
+               $defaults = array('adresse' => '',
+                                 'code_postal' => '',
+                                 'ville' => '',
+                                 'pays' => 'INT',
+                                 'site' => '',
+                                 'telephone' => '',
+                                 'produits' => '',
+                                 'nombre_pages' => '',
+                                 'nombre_liens' => '',
+                                 'nombre_langues' => '');
+
+               $_POST = array_merge($defaults, $_POST);
+
                if (!self::valideDemandeDevis($x)) {
                        return;
                }
+
                // L'utilisateur est-il déjà dans la base ?
                $daoUtilisateur = new commonDAOUtilisateur($core->con);
                $utilisateur = $daoUtilisateur->selectByEmail($_POST['email']);

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 16f82a3db06454bd4e0f65d67025865fb3990c2e..37c58c737dc7d3db1aa5a6431e8269bebb10ddff 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -1005,4 +1005,21 @@ class wsServices extends cubeFlashGateway {
                }
        }
 
+       public function getFluidbookPage($id, $page) {
+               global $core;
+
+               $id = $this->callArgs[0];
+               $page = $this->callArgs[1];
+
+               $dao = new wsDAOBook($core->con);
+               $pages = $dao->getPagesOfBook($id, false);
+               $p = $pages[$page];
+
+               $file = wsDocument::getDir($p['document_id']) . '/html/t150-' . $p['document_page'] . '.jpg';
+
+               ob_end_clean();
+               cubeHTTP::contentType($file);
+               echo file_get_contents($file);
+               die;
+       }
 }