(no commit message)

diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index 606c32c629fb3fb2880f1e6f30f3e6be6e19c1dc..907f09df0d0eb293905e01fd37273028163d5679 100644 (file)
--- a/inc/commons/_common.php
+++ b/inc/commons/_common.php
@@ -11,6 +11,7 @@ $__autoload['commonAjax'] = dirname(__FILE__) . '/class.common.ajax.php';
 $__autoload['commonDroits'] = dirname(__FILE__) . '/class.common.droits.php';\r
 // Instantiation de la classe de contrôle\r
 $core = new commonCore();\r
+$core->monitoring=true;\r
 // Définition des handlers des urls\r
 $core->url->registerDefault(array('commonUrl', 'hub'));\r
 $core->url->register('ajax', 'ajax', '^ajax(.*)$', array('cubeAjax', 'ajax'));\r

diff --git a/inc/commons/class.common.filtre.php b/inc/commons/class.common.filtre.php
index c0542847e70c39dc199fdc90be1fa664634e8834..3f4e37f4eb88815dc621aaa37b35108641b44628 100644 (file)
--- a/inc/commons/class.common.filtre.php
+++ b/inc/commons/class.common.filtre.php
@@ -18,7 +18,7 @@ class commonFiltre {
        protected function getValues()\r
        {\r
                global $core;\r
-               if ($this->varname == 'equipier' || $this->varname == 'equipier_participe' || $this->varname == 'admin_book' || $this->varname=='admin_client') {\r
+               if ($this->varname == 'equipier' || $this->varname == 'equipier_participe' || $this->varname == 'admin_book' || $this->varname == 'admin_client') {\r
                        $r = $core->con->select('SELECT prenom,utilisateur_id FROM equipiers');\r
                        while ($r->fetch()) {\r
                                $this->values[$r->prenom] = $r->utilisateur_id;\r
@@ -58,8 +58,8 @@ class commonFiltre {
                } elseif ($this->varname == 'demande_moi') {\r
                        $this->values = array(__('Moi') => 'moi', __('Autres') => 'autres');\r
                        $this->all = __('Toutes');\r
-               }elseif($this->varname=='ws_grade'){\r
-                       $this->values=array_flip($core->ws_grades);\r
+               } elseif ($this->varname == 'ws_grade') {\r
+                       $this->values = array_flip($core->ws_grades);\r
                }\r
        }\r
 \r
@@ -85,21 +85,25 @@ class commonFiltre {
                $res .= '<div class="input' . $class . '"><span>' . $t . '</span>' ;\r
                $res .= '<a href="#" class="bt" title="' . $titre . '">' . cubeMedia::spacer(155, 18) . '</a>';\r
                $res .= '</div>';\r
-               $res .= '<ul><li class="all">' . $this->all . '</li>';\r
-               $last = count($this->values)-1;\r
-               $i = 0;\r
-               foreach($this->values as $v => $k) {\r
-                       $checked = false;\r
-                       if (is_null($this->settings)) {\r
-                               $checked = true;\r
-                       } elseif (isset($this->settings[$k])) {\r
-                               $checked = true;\r
+               if (is_array($this->values)) {\r
+                       $res .= '<ul><li class="all">' . $this->all . '</li>';\r
+\r
+                       $last = count($this->values)-1;\r
+                       $i = 0;\r
+\r
+                       foreach($this->values as $v => $k) {\r
+                               $checked = false;\r
+                               if (is_null($this->settings)) {\r
+                                       $checked = true;\r
+                               } elseif (isset($this->settings[$k])) {\r
+                                       $checked = true;\r
+                               }\r
+                               $l = ($i == $last)?' class="last"':'';\r
+                               $res .= '<li' . $l . '><label>' . form::checkbox(array($this->varname . '[' . $k . '][]'), 1, $checked) . ' ' . $v . '</label></li>';\r
+                               $i++;\r
                        }\r
-                       $l = ($i == $last)?' class="last"':'';\r
-                       $res .= '<li' . $l . '><label>' . form::checkbox(array($this->varname . '[' . $k . '][]'), 1, $checked) . ' ' . $v . '</label></li>';\r
-                       $i++;\r
+                       $res .= '</ul>';\r
                }\r
-               $res .= '</ul>';\r
                $res .= '</div>';\r
                return $res;\r
        }\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 31674fbe42b441e92eff7cd8d1be94fa071de559..12de0be7d414562dfbc2ab89100ae86c60dcefaa 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -17,9 +17,11 @@ define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin:/home/extranet/dev/fluidb
 define('MXMLC_PATH', '/usr/local/flex/bin/mxmlc');\r
 define('AS3_SOURCES', '/home/ws/sources/as3');\r
 \r
+define('MONITOR_PERFS', true);\r
+\r
 if ($dev) {\r
        // Définition de la configuration sur l'environnement de développement\r
-       define('DB_HOST',':/var/run/mysqld/mysqld.sock');\r
+       define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
        define('DB_NAME', 'extranet_dev');\r
        define('DB_USER', 'ws');\r
        define('DB_PASSWORD', '*arica*2');\r
@@ -28,7 +30,7 @@ if ($dev) {
        define('WS_URL', 'http://dev.ws.fluidbook.com');\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
-       define('DB_HOST',':/var/run/mysqld/mysqld.sock');\r
+       define('DB_HOST', ':/var/run/mysqld/mysqld.sock');\r
        define('DB_NAME', 'extranet');\r
        define('DB_USER', 'ws');\r
        define('DB_PASSWORD', '*arica*2');\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index d154188f439b379ca1c2a0f76b554e567a4f80f1..4e8858e279c88e384d2212f56f6448e1673e3767 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -91,8 +91,8 @@ class wsUrl {
                        $res .= '<td>' . $book->parametres->pages . '</td>';\r
 \r
                        if ($droits->revendeur) {\r
-                               $p = str_replace(" (", '<br />', $book->proprietaire);\r
-                               $p = trim($p, ')');\r
+                               $p = str_replace(" (", '<br /><em>', $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
@@ -756,9 +756,9 @@ html{height:100%}' . "\n";
                        $odd = cubeMath::isOdd($i)?' class="odd"':'';\r
                        $res .= '<tr' . $odd . '><td colspan="10">';\r
                        if ($admin) {\r
-                               $res .= commonPage::pager($settings['page'], $dao->count(null,'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->count(null, 'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');\r
                        } else {\r
-                               $res .= commonPage::pager($settings['page'], $dao->count($core->user,'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');\r
+                               $res .= commonPage::pager($settings['page'], $dao->count($core->user, 'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');\r
                        }\r
                        $res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));\r
                        $res .= '</td></tr>';\r

diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index 43f145e013e2b5d01ed473bbafdb7341f8f92e05..da93e32288627dace0c934aa93a0636537bd2f61 100644 (file)
--- a/inc/ws/Controlleur/class.ws.users.tree.php
+++ b/inc/ws/Controlleur/class.ws.users.tree.php
@@ -100,7 +100,7 @@ class wsUsersTree {
                        sort($this->admins[$admin]);\r
                }\r
 \r
-               $c = $this->con->openCursor('utilisateurs');\r
+               $c = $core->con->openCursor('utilisateurs');\r
                foreach($this->admins as $admin => $list) {\r
                        $c->ws_rights = implode(',', $list);\r
                        $c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');\r

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 23c1daa517b7d171bfd534aa4bc2dbc33a9c6a84..ab867b9a8114d9324e0d76bf706264e9b085e0ee 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -24,9 +24,9 @@ class wsDAOTheme extends commonDAO {
                return $theme;\r
        }\r
 \r
-       public function selectById($theme_id,$table='themes_vue')\r
+       public function selectById($theme_id, $table = 'themes_vue')\r
        {\r
-               $r = $this->con->select('SELECT * FROM '.$table.' WHERE theme_id=\'' . $this->con->escape($theme_id) . '\' LIMIT 1');\r
+               $r = $this->con->select('SELECT * FROM ' . $table . ' WHERE theme_id=\'' . $this->con->escape($theme_id) . '\' LIMIT 1');\r
                return $this->singleton($r);\r
        }\r
 \r
@@ -59,16 +59,10 @@ class wsDAOTheme extends commonDAO {
                $c->date = TIME;\r
                $p = new wsThemeParametres($parent);\r
                foreach($data as $k => $v) {\r
-                       try {\r
-                               if (!isset($p->$k)) {\r
-                                       continue;\r
-                               }\r
-                               $p->$k = $v;\r
-                               fb($v, $k);\r
-                       }\r
-                       catch(Exception $e) {\r
-                               fb($e);\r
+                       if (!isset($p->$k)) {\r
+                               continue;\r
                        }\r
+                       $p->$k = $v;\r
                }\r
                $c->parametres = serialize($p);\r
                $c->update('WHERE theme_id=\'' . $this->con->escape($data['theme_id']) . '\'');\r

diff --git a/index.php b/index.php
index 1276f64c7ae99409dfab773b2698f0d18affce41..6e6ef4540b9f7c69aaf7c03a0ea9af431461408e 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,9 +14,6 @@ echo $core->url->getDocument();
 $buffer = ob_get_contents();\r
 \r
 ob_clean();\r
-// $css['IE'] = CSS_PATH . '/ie.css';\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