From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 11 Feb 2011 15:01:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=537a7f0f11aa5787ae4bba9f6eabfeb1f0fd0ce9;p=cubeextranet.git

---

diff --git a/inc/commons/_common.php b/inc/commons/_common.php
index 606c32c62..907f09df0 100644
--- 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';
 // Instantiation de la classe de contrôle
 $core = new commonCore();
+$core->monitoring=true;
 // Définition des handlers des urls
 $core->url->registerDefault(array('commonUrl', 'hub'));
 $core->url->register('ajax', 'ajax', '^ajax(.*)$', array('cubeAjax', 'ajax'));
diff --git a/inc/commons/class.common.filtre.php b/inc/commons/class.common.filtre.php
index c0542847e..3f4e37f4e 100644
--- a/inc/commons/class.common.filtre.php
+++ b/inc/commons/class.common.filtre.php
@@ -18,7 +18,7 @@ class commonFiltre {
 	protected function getValues()
 	{
 		global $core;
-		if ($this->varname == 'equipier' || $this->varname == 'equipier_participe' || $this->varname == 'admin_book' || $this->varname=='admin_client') {
+		if ($this->varname == 'equipier' || $this->varname == 'equipier_participe' || $this->varname == 'admin_book' || $this->varname == 'admin_client') {
 			$r = $core->con->select('SELECT prenom,utilisateur_id FROM equipiers');
 			while ($r->fetch()) {
 				$this->values[$r->prenom] = $r->utilisateur_id;
@@ -58,8 +58,8 @@ class commonFiltre {
 		} elseif ($this->varname == 'demande_moi') {
 			$this->values = array(__('Moi') => 'moi', __('Autres') => 'autres');
 			$this->all = __('Toutes');
-		}elseif($this->varname=='ws_grade'){
-			$this->values=array_flip($core->ws_grades);
+		} elseif ($this->varname == 'ws_grade') {
+			$this->values = array_flip($core->ws_grades);
 		}
 	}
 
@@ -85,21 +85,25 @@ class commonFiltre {
 		$res .= '<div class="input' . $class . '"><span>' . $t . '</span>' ;
 		$res .= '<a href="#" class="bt" title="' . $titre . '">' . cubeMedia::spacer(155, 18) . '</a>';
 		$res .= '</div>';
-		$res .= '<ul><li class="all">' . $this->all . '</li>';
-		$last = count($this->values)-1;
-		$i = 0;
-		foreach($this->values as $v => $k) {
-			$checked = false;
-			if (is_null($this->settings)) {
-				$checked = true;
-			} elseif (isset($this->settings[$k])) {
-				$checked = true;
+		if (is_array($this->values)) {
+			$res .= '<ul><li class="all">' . $this->all . '</li>';
+
+			$last = count($this->values)-1;
+			$i = 0;
+
+			foreach($this->values as $v => $k) {
+				$checked = false;
+				if (is_null($this->settings)) {
+					$checked = true;
+				} elseif (isset($this->settings[$k])) {
+					$checked = true;
+				}
+				$l = ($i == $last)?' class="last"':'';
+				$res .= '<li' . $l . '><label>' . form::checkbox(array($this->varname . '[' . $k . '][]'), 1, $checked) . ' ' . $v . '</label></li>';
+				$i++;
 			}
-			$l = ($i == $last)?' class="last"':'';
-			$res .= '<li' . $l . '><label>' . form::checkbox(array($this->varname . '[' . $k . '][]'), 1, $checked) . ' ' . $v . '</label></li>';
-			$i++;
+			$res .= '</ul>';
 		}
-		$res .= '</ul>';
 		$res .= '</div>';
 		return $res;
 	}
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 31674fbe4..12de0be7d 100644
--- 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');
 define('AS3_SOURCES', '/home/ws/sources/as3');
 
+define('MONITOR_PERFS', true);
+
 if ($dev) {
 	// Définition de la configuration sur l'environnement de développement
-	define('DB_HOST',':/var/run/mysqld/mysqld.sock');
+	define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
 	define('DB_NAME', 'extranet_dev');
 	define('DB_USER', 'ws');
 	define('DB_PASSWORD', '*arica*2');
@@ -28,7 +30,7 @@ if ($dev) {
 	define('WS_URL', 'http://dev.ws.fluidbook.com');
 } else {
 	// Définition des variables dans l'environnement de production
-	define('DB_HOST',':/var/run/mysqld/mysqld.sock');
+	define('DB_HOST', ':/var/run/mysqld/mysqld.sock');
 	define('DB_NAME', 'extranet');
 	define('DB_USER', 'ws');
 	define('DB_PASSWORD', '*arica*2');
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index d154188f4..4e8858e27 100644
--- 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>';
 
 			if ($droits->revendeur) {
-				$p = str_replace(" (", '<br />', $book->proprietaire);
-				$p = trim($p, ')');
+				$p = str_replace(" (", '<br /><em>', $book->proprietaire);
+				$p = str_replace(')', '</em>', $p);
 				$res .= '<td><a href="#" class="popup" rel="formChangeBookProprietaire/' . $book->book_id . '" title="' . __('Mofifier le proprietaire') . '">' . $p . '</a></td>';
 			} else {
 				$res .= '<td>' . $book->proprietaire_utilisateur . '</td>';
@@ -756,9 +756,9 @@ html{height:100%}' . "\n";
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
 			$res .= '<tr' . $odd . '><td colspan="10">';
 			if ($admin) {
-				$res .= commonPage::pager($settings['page'], $dao->count(null,'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->count(null, 'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');
 			} else {
-				$res .= commonPage::pager($settings['page'], $dao->count($core->user,'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');
+				$res .= commonPage::pager($settings['page'], $dao->count($core->user, 'entreprises_ws') , $settings['par_page'], 'page' . $change . '/%d');
 			}
 			$res .= commonUrl::formParPage('parPage' . $change, $settings['par_page'], __('clients'));
 			$res .= '</td></tr>';
diff --git a/inc/ws/Controlleur/class.ws.users.tree.php b/inc/ws/Controlleur/class.ws.users.tree.php
index 43f145e01..da93e3228 100644
--- 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]);
 		}
 
-		$c = $this->con->openCursor('utilisateurs');
+		$c = $core->con->openCursor('utilisateurs');
 		foreach($this->admins as $admin => $list) {
 			$c->ws_rights = implode(',', $list);
 			$c->update('WHERE utilisateur_id=\'' . $this->con->escape($admin) . '\'');
diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 23c1daa51..ab867b9a8 100644
--- 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;
 	}
 
-	public function selectById($theme_id,$table='themes_vue')
+	public function selectById($theme_id, $table = 'themes_vue')
 	{
-		$r = $this->con->select('SELECT * FROM '.$table.' WHERE theme_id=\'' . $this->con->escape($theme_id) . '\' LIMIT 1');
+		$r = $this->con->select('SELECT * FROM ' . $table . ' WHERE theme_id=\'' . $this->con->escape($theme_id) . '\' LIMIT 1');
 		return $this->singleton($r);
 	}
 
@@ -59,16 +59,10 @@ class wsDAOTheme extends commonDAO {
 		$c->date = TIME;
 		$p = new wsThemeParametres($parent);
 		foreach($data as $k => $v) {
-			try {
-				if (!isset($p->$k)) {
-					continue;
-				}
-				$p->$k = $v;
-				fb($v, $k);
-			}
-			catch(Exception $e) {
-				fb($e);
+			if (!isset($p->$k)) {
+				continue;
 			}
+			$p->$k = $v;
 		}
 		$c->parametres = serialize($p);
 		$c->update('WHERE theme_id=\'' . $this->con->escape($data['theme_id']) . '\'');
diff --git a/index.php b/index.php
index 1276f64c7..6e6ef4540 100644
--- a/index.php
+++ b/index.php
@@ -14,9 +14,6 @@ echo $core->url->getDocument();
 $buffer = ob_get_contents();
 
 ob_clean();
-// $css['IE'] = CSS_PATH . '/ie.css';
 echo cubePage::page($buffer, $js, $jsvar, $css, array(), 9, false, $meta, array(), $standard);
-fb($core->debug());
-fb($GLOBALS['all_queries'], 'SQL Queries', FirePHP::TABLE);
 
 ?>
\ No newline at end of file