(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index f038d1b920e87b4c7ed11c180847688eef4791b4..7ddb39a2b771d42ca81672e86891398d2a93b26b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -19,7 +19,7 @@ class wsUrl {
                        $filtres[] = new commonFiltre(__('Administrateur'), 'admin_book', $settings['filtres']);\r
                }\r
                $res = commonPage::barre($filtres , 'filtreBooks', 'books', $shortcuts);\r
-               $res .= commonPage::tMain(null, true);\r
+               $res .= commonPage::tMain(null,wsDroits::admin());\r
                $res .= commonPage::bh();\r
                $res .= '<div id="listeBooks">';\r
                $res .= self::listeBooks();\r
@@ -88,19 +88,19 @@ class wsUrl {
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '>';\r
                        $res .= '<td>' . $book->book_id . '</td>';\r
-                       $res .= '<td>' . $book->nom . '</td>';\r
+                       $res .= '<td>' . html::escapeHTML($book->nom) . '</td>';\r
                        $res .= '<td>' . mb_strtoupper($book->lang) . '</td>';\r
                        $res .= '<td>' . $book->parametres->pages . '</td>';\r
 \r
                        if ($droits->revendeur) {\r
-                               $p = str_replace(" (", '<br /><em>', $book->proprietaire);\r
+                               $p = str_replace(" (", '<br /><em>', html::escapeHTML($book->proprietaire));\r
                                $p = str_replace(')', '</em>', $p);\r
                                $res .= '<td><a href="#" class="popup" rel="formChangeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $p . '</a></td>';\r
                        } else {\r
-                               $res .= '<td>' . $book->proprietaire_utilisateur . '</td>';\r
+                               $res .= '<td>' . html::escapeHTML($book->proprietaire_utilisateur) . '</td>';\r
                        }\r
                        if ($droits->admin) {\r
-                               $res .= '<td>' . $book->facturable . '</td>';\r
+                               $res .= '<td>' . html::escapeHTML($book->facturable) . '</td>';\r
                        }\r
                        if ($droits->revendeur) {\r
                                if ($droits->admin || $book->status <= 1) {\r

diff --git a/index.php b/index.php
index 6e6ef4540b9f7c69aaf7c03a0ea9af431461408e..d03bb060cdfb7a907d18108467386826eabd5311 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@ $js[] = JS_PATH . '/' . MODE . '.js';
 $jsvar['IMG'] = IMG;\r
 $jsvar['SITE_PATH'] = SITE_PATH;\r
 $css[] = CSS_PATH . '/style.css';\r
-$standard = 'XHTML 1.0 Strict';\r
+$standard = 'XHTML 1.0 Transitional';\r
 \r
 echo $core->url->getDocument();\r
 $buffer = ob_get_contents();\r

diff --git a/js/common.js b/js/common.js
index 31c37b800dfeec52a65e9680aa907b98027d7005..be69e81e165a65b1cee2678898e3f3cb49493c6f 100644 (file)
--- a/js/common.js
+++ b/js/common.js
@@ -1,6 +1,7 @@
 TO_LOAD_INDEX++;\r
 TO_LOAD[TO_LOAD_INDEX]='load_common_extranet();';\r
 FIRST_LOAD=true;\r
+\r
 function load_common_extranet(){\r
        if($(".dashboard").length>=1 && $("#dash").length>=1){\r
                $("#dash").sortable('destroy');\r

diff --git a/js/ws.js b/js/ws.js
index 521913e07dae1fe8e4c2baba6e89b2dc570e7d8f..e473944ef1f394f5297829e4a28120afa2a46196 100644 (file)
--- a/js/ws.js
+++ b/js/ws.js
@@ -1,6 +1,7 @@
 TO_LOAD_INDEX++;\r
 TO_LOAD[TO_LOAD_INDEX]='load_ws();';\r
 FIRST_LOAD=true;\r
+\r
 function load_ws(){\r
        if($("#book_nom").length){\r
                $("#book_nom").autocomplete(SITE_PATH+'autocomplete/book',{\r

diff --git a/style/ws/style.css b/style/ws/style.css
index f1f06af153071511a463a8c26e5a39e69e310c6f..288ce07f038fa7474ca1886ba9618301e85c7b92 100644 (file)
--- a/style/ws/style.css
+++ b/style/ws/style.css
@@ -441,7 +441,7 @@ display:none;
 \r
 .gris{background-color:#ecedf0;}\r
 \r
-#listeBooks{width:100%;height:100%;}\r
+#listeBooks{width:100%;height:auto;}\r
 \r
 /* Stats */\r
 .graphStats table{\r