(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index e3609d948cba2098b7a1f50fd8e57aa28c5e3931..20b53f1b41e6458126d2ed8ba24b416e7f75ee3b 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -501,6 +501,14 @@ class commonCore extends cubeCore {
                // Table Grdf\r
                $db->grdf->datas('text', 0, false);\r
 \r
+               // Table bulle\r
+               $db->bulle->email('varchar', 128, false);\r
+               $db->bulle->date('integer', 0, false);\r
+               $db->bulle->prenom('varchar', 128, false);\r
+               $db->bulle->nom('varchar', 128, false);\r
+               $db->bulle->catalogue('varchar', 128, false);\r
+\r
+\r
                // Table google search api\r
                $db->google_search_api->request('varchar', 256, false);\r
                $db->google_search_api->response('text', 0, false);\r

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index 04d9bbaef7205e8d852a3fafd57b87c34251f1fd..1c09723a4e4939bf10df60069e60c396ea67f398 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -371,6 +371,50 @@ class wsServices extends cubeFlashGateway {
                }\r
        }\r
 \r
+       public function bulle() {\r
+               global $core;\r
+               $e = explode('-', $this->args['catalogue'], 2);\r
+               if (count($e) == 2) {\r
+                       $catalogue = $e[1];\r
+               } else {\r
+                       $catalogue = $e[0];\r
+               }\r
+\r
+               $c = $core->con->openCursor('bulle');\r
+               $c->prenom = trim($this->args['prenom']);\r
+               $c->nom = trim($this->args['nom']);\r
+               $c->catalogue = trim($catalogue);\r
+               $c->email = trim($this->args['email']);\r
+               $c->date = TIME;\r
+               $c->insert();\r
+       }\r
+\r
+       public function getBulleList() {\r
+               $user = 'bulle';\r
+               $pass = '23bu1l300';\r
+               $this->outputXML = false;\r
+               $ok = (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] == $user && isset($_SERVER['PHP_AUTH_PW']) && $_SERVER['PHP_AUTH_PW'] == $pass);\r
+               if (!$ok) {\r
+                       header('WWW-Authenticate: Basic realm="Protected access"');\r
+                       header('HTTP/1.0 401 Unauthorized');\r
+                       ob_end_clean();\r
+                       header('Content-type: text/html');\r
+                       echo '<h1>Forbidden</h1>';\r
+                       exit;\r
+               } else {\r
+                       global $core;\r
+                       header('Content-type: text/csv');\r
+                       header('Content-Disposition: attachment; filename="inscriptions.csv"');\r
+                       $r = $core->con->select('SELECT * FROM bulle ORDER BY date');\r
+                       ob_end_clean();\r
+                       echo utf8_decode('"Prénom";"Nom";"E-mail";"Catalogue";"Date"') . "\n";\r
+                       while ($r->fetch()) {\r
+                               echo utf8_decode('"' . $r->prenom . '";"' . $r->nom . '";"' . $r->email . '";"' . $r->catalogue . '";"' . date('Y-m-d H:i', $r->date) . '"') . "\n";\r
+                       }\r
+                       exit;\r
+               }\r
+       }\r
+\r
        public function grdfValidForm() {\r
                $notempty = array('civilite', 'prenom', 'nom', 'adresse', 'codepostal', 'ville', 'telephone', 'optin', 'connu', 'energie');\r
                $error = false;\r
@@ -615,13 +659,13 @@ class wsServices extends cubeFlashGateway {
 \r
                        $langs = array_unique($langs);\r
 \r
-                       $w2h=new wiki2xhtml();\r
-                       $w2h->setOpt('active_pre',0);\r
-                       \r
+                       $w2h = new wiki2xhtml();\r
+                       $w2h->setOpt('active_pre', 0);\r
+\r
                        $contents = $collection->contents;\r
                        foreach ($langs as $lang) {\r
                                $langsnames[$lang] = cubeLang::getNameByCode($lang);\r
-                               $contents[$lang]['apropos']=$w2h->transform($contents[$lang]['apropos']);\r
+                               $contents[$lang]['apropos'] = $w2h->transform($contents[$lang]['apropos']);\r
                        }\r
 \r
 \r
@@ -724,7 +768,7 @@ class wsServices extends cubeFlashGateway {
 \r
        protected function _getRegExpManifest($r, $book, $theme, $resolution) {\r
                $reg = array();\r
-               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$','^' . $r . 'data/images/interface-down.svg$');\r
+               $reg['loading'] = array('^' . $r . 'style/(.*).css$', '^' . $r . 'index.html$', '^' . $r . 'data/style/(.*)$', '^' . $r . 'data/(.*).js$', '^' . $r . 'data/images/' . $theme->parametres->logoLoader . '$', '^' . $r . 'style/fonts/(.*).ttf$', '^' . $r . 'data/images/interface-down.svg$');\r
                $reg['extras'] = array('^' . $r . 'data/links/(.*)$', '^' . $r . 'data/(.*).pdf$', '^' . $r . 'cover.jpg$');\r
                $reg['thumbnails'] = array('^' . $r . 'data/thumbnails/p(\d+).jpg$');\r
                for ($i = 1; $i <= $book->parametres->pages; $i++) {\r