(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index c656e79018e388915a9e1d2b1d9f9b1b40f97b04..192b6ba3269e9aefd271bc35b4cbb20213cc63c5 100644 (file)
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -489,7 +489,16 @@ class wsFlash extends cubeFlashGateway {
                $this->json = false;\r
                $this->json = true;\r
 \r
+               $types = array(1, 2, 3, 4, 5, 6, 7, 11, 13, 14, 15, 16, 17);\r
+               if (wsDroits::revendeur()) {\r
+                       $types = array(1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21);\r
+               }\r
+               if (wsDroits::admin()) {\r
+                       $types = range(1, 30);\r
+               }\r
+\r
                if ($this->json) {\r
+                       $this->jsonDatas['types'] = $types;\r
                        $this->jsonDatas['pages'] = $nb_pages;\r
                        $this->jsonDatas['numerotation'] = $book->numerotation;\r
                        $this->jsonDatas['width'] = $size[0];\r
@@ -520,7 +529,6 @@ class wsFlash extends cubeFlashGateway {
        protected function _addSpecialInfos($book, $theme, $param, $specialName) {\r
                if ($specialName == 'archives') {\r
                        $p = $book->parametres;\r
-                       \r
                } else {\r
                        $p = $theme->parametres;\r
                }\r

diff --git a/inc/ws/Controlleur/class.ws.stats.php b/inc/ws/Controlleur/class.ws.stats.php
index b7cde88bb6d7e6d6128e8f754290855949564fee..a6bb06cb74a484c855da3a249c5dfda3c460e001 100644 (file)
--- a/inc/ws/Controlleur/class.ws.stats.php
+++ b/inc/ws/Controlleur/class.ws.stats.php
@@ -110,10 +110,14 @@ class wsStats {
                $res .= commonPage::bMain();\r
 \r
 \r
-               self::$xls->setActiveSheetIndex(0);\r
-               $writer = new PHPExcel_Writer_Excel2007();\r
-               $writer->setPHPExcel(self::$xls);\r
-               $writer->save(self::_getXLSFile($bid, $annee, $mois));\r
+               try {\r
+                       self::$xls->setActiveSheetIndex(0);\r
+                       $writer = new PHPExcel_Writer_Excel2007();\r
+                       $writer->setPHPExcel(self::$xls);\r
+                       $writer->save(self::_getXLSFile($bid, $annee, $mois));\r
+               } catch (Exception $e) {\r
+                       \r
+               }\r
 \r
                return $res;\r
        }\r
@@ -317,7 +321,7 @@ class wsStats {
                }\r
                $res = '<table class="' . implode(' ', $class) . '">';\r
                // Titre\r
-               $res .= '<tr><th colspan="' . count($colsTitles) . '"><h1>' . $title. '</h1></th></tr>';\r
+               $res .= '<tr><th colspan="' . count($colsTitles) . '"><h1>' . $title . '</h1></th></tr>';\r
                // Head\r
                if (implode('', $colsTitles) != '') {\r
                        $res .= '<tr>';\r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 2d28707badd7b4baa4a63f2551c42a82c20f34ae..4769e5ce6962f7219908428ad8539fd2481731c4 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -48,7 +48,6 @@ class wsDAOTheme extends commonDAO {
                } else {\r
                        $or = '';\r
                        if (wsDroits::revendeur() && !is_null($demos)) {\r
-                               fb($demos);\r
                                $or = ' OR theme_id IN(' . implode(',', $demos) . ')';\r
                        }\r
                        $sql = 'SELECT * FROM themes_vue WHERE theme_id IN (SELECT theme FROM books WHERE proprietaire IN(' . $user->ws_rights . ') ' . $or . ')';\r