(no commit message)

diff --git a/importWs.php b/importWs.php
index 8ef292a015ae73545ad2c27c1907ac8eeaf16c33..94b74f395ed100f9db78dca988ed60fe338b5809 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -422,7 +422,7 @@ function oldIconesToColor($iid, &$parametres)
        if ($line['iid'] != '') {\r
                $parametres->iconSet = $line['iid'];\r
                $parametres->iconsHMargin = $line['iid'] == 1?20:0;\r
-               $parametres->iconsTMargin = $line['iid'] == 1?7:0;\r
+               $parametres->menuHeight=39;\r
                $parametres->colorizeIcons = false;\r
                $parametres->couleurI = 'ffffff';\r
                return $line['iid'];\r
@@ -430,7 +430,7 @@ function oldIconesToColor($iid, &$parametres)
        $parametres->iconSet = 1;\r
        $parametres->colorizeIcons = 1;\r
        $parametres->iconsHMargin = 20;\r
-       $parametres->iconsTMargin = 7;\r
+       $parametres->menuHeight=39;\r
        $parametres->couleurI = $line['color'];\r
 \r
        return 1;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index c17fb7b5a8e33434b7906b3eaccbbc6a47f38328..a69cfca9479ae7de4fdb20585cf9c7f38d42795c 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -61,6 +61,9 @@ class wsDAOBook extends commonDAO {
        protected function getNextId()\r
        {\r
                $r = $this->con->select('SELECT MAX(book_id) AS book_id FROM books');\r
+               if($r<10000){\r
+                       return 10000;\r
+               }\r
                return $r->book_id + 1;\r
        }\r
 \r