(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 019746d48e547a9b530b9140294353a9d15994af..535933fe091cd46ec6e03763477447b3b9ad8f78 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -16,19 +16,19 @@ class wsAjax extends cubeAjax {
 \r
        public static function pageBooks($args, &$x)\r
        {\r
-               self::page('books', $args[1]);\r
+               extranetAjax::page('books', $args[1]);\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
        }\r
 \r
        public static function parPageBooks($args, &$x)\r
        {\r
-               self::parPage('books', $_POST['par_page']);\r
+               extranetAjax::parPage('books', $_POST['par_page']);\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
        }\r
 \r
        public static function sortBooks($args, &$x)\r
        {\r
-               self::sort('books', $args[1]);\r
+               extranetAjax::sort('books', $args[1]);\r
                $x->addContent('listeBooks', wsUrl::listeBooks());\r
        }\r
 \r
@@ -40,11 +40,11 @@ class wsAjax extends cubeAjax {
        public static function filtreBooks($args, &$x)\r
        {\r
                if (isset($args[1]) && $args[1] == 'efface') {\r
-                       self::filtre('books');\r
+                       extranetAjax::filtre('books');\r
                        $x->addReload();\r
                        return;\r
                } else {\r
-                       self::filtre('books', $_POST);\r
+                       extranetAjax::filtre('books', $_POST);\r
                        $x->addContent('listeBooks', wsUrl::listeBooks());\r
                }\r
        }\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 942e6c6246c7e68182f37284920af2f871895108..bc69cf5cfd018ff0ebdb1a480c7bf85b7edb35e3 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -44,7 +44,7 @@ class wsUrl {
                $res .= '<th>' . extranetUrl::orderby(__('Titre de la publication'), 'nom', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . extranetUrl::orderby(__(''), 'lang', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th>' . extranetUrl::orderby(__('Proprietaire'), 'proprietaire_nom', $settings, 'sort' . $change) . '</th>';\r
-               $res .= '<th>' . extranetUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) . '</th>';\r
+               $res .= '<th>' . /*extranetUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) .*/ '</th>';\r
                $res .= '<th>' . extranetUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';\r
                $res .= '<th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';\r
                $i = 0;\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 14edad77625c0c95b49b4acae5d49cd8d38bdf83..7932486921fa5f0bc5b156c15047058cebd06853 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -477,8 +477,8 @@ class wsDAOBook extends extranetDAO {
                $flex->addVariable('numerotation', $book->numerotation, false, true, 'String');\r
                $flexLight->addVariable('theme', $theme->parametres->toStandardObject());\r
                $flexLight->addVariable('pages', count($pages));\r
-               $flexLight->addVariable('fwidth', $size[0], false, true, 'Number');\r
-               $flexLight->addVariable('fheight', $size[1], false, true, 'Number');\r
+               $flexLight->addVariable('fwidth', round($size[0]), false, true, 'Number');\r
+               $flexLight->addVariable('fheight', round($size[1]), false, true, 'Number');\r
                $flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');\r
                $flex->addVariable('index', $index);\r
                $flex->addVariable('textes', $textes);\r
@@ -498,7 +498,6 @@ class wsDAOBook extends extranetDAO {
                                $swffile = ROOT . '/docs/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf';\r
                                if ($i == 1) {\r
                                        $flexLight->addSWF($swffile, 'page' . $i);\r
-\r
                                } else {\r
                                        $flex->addSWF($swffile, 'page' . $i);\r
                                }\r