(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 3cdd7fed8140af84f815d38631421a1dfcb9f849..5d48ba6231607f63d37077eaabefee0b025a93ce 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -19,7 +19,7 @@ class wsDroits {
                        $nav[__('Clients')] = 'clients';\r
                }\r
                if ($core->user->ws_grade >= 5) {\r
-                       $nav[__('Devis')]='demandes';\r
+                       $nav[__('Devis')] = 'demandes';\r
                        $nav[__('Traductions')] = 'traductions';\r
                }\r
                if ($core->user->ws_grade < 5) {\r
@@ -75,9 +75,11 @@ class wsDroits {
 \r
                $dao = new wsDAOSignature($core->con);\r
 \r
-               $signatures = $dao->selectAll();\r
+               if (!isset($GLOBALS['allSignatures'])) {\r
+                       $GLOBALS['allSignatures'] = $dao->selectAll();\r
+               }\r
                $res = array();\r
-               foreach($signatures as $signature) {\r
+               foreach($GLOBALS['allSignatures'] as $signature) {\r
                        if (!$admin && !in_array($signature->signature_id, $mySignatures)) {\r
                                continue;\r
                        }\r

diff --git a/index.php b/index.php
index 8c4e1552ce1d56d7de3a85077132e7a1a09a3e2e..1276f64c7ae99409dfab773b2698f0d18affce41 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,21 +2,21 @@
 require_once(dirname(__FILE__) . '/inc/prepend.php');\r
 ob_start();\r
 \r
-$meta=array();\r
+$meta = array();\r
 $js[] = JS_PATH . '/common.js';\r
 $js[] = JS_PATH . '/' . MODE . '.js';\r
 $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 Strict';\r
 \r
 echo $core->url->getDocument();\r
 $buffer = ob_get_contents();\r
 \r
 ob_clean();\r
-\r
 // $css['IE'] = CSS_PATH . '/ie.css';\r
-echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9,false,$meta,array(),$standard);\r
+echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);\r
 fb($core->debug());\r
+fb($GLOBALS['all_queries'], 'SQL Queries', FirePHP::TABLE);\r
 \r
 ?>
\ No newline at end of file