From d21688345dcb45112eb6f8f3b974ebc9975804f7 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 25 Jan 2011 17:27:58 +0000
Subject: [PATCH]

---
 importWs.php                                    | 4 +---
 inc/commons/DAO/class.common.dao.entreprise.php | 2 --
 inc/config.inc.php                              | 4 +++-
 inc/ws/Controlleur/class.ws.url.php             | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/importWs.php b/importWs.php
index 7e850484d..4a305817e 100644
--- a/importWs.php
+++ b/importWs.php
@@ -16,7 +16,6 @@ try {
 	}
 
 	define('MYSQL_BIN', '/usr/local/mysql/bin/');
-	fb(MYSQL_BIN);
 	// Copie de la base extranet vers extranet_dev
 	cubeDb::truncateDatabase('extranet_dev');
 	cubeDb::mysqlDump(DB_HOST, 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);
@@ -32,11 +31,10 @@ try {
 	foreach($tables as $t) {
 		$core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS');
 	}
-
 	// Copie des dossiers
-
 	`/bin/cp /home/extranet/www/devis/* /home/extranet/dev/devis/`;
 	`/bin/cp /home/extranet/www/factures/* /home/extranet/dev/factures/`;
+	`/bin/cp -r /home/ws/www/themes/* /home/extranet/dev/fluidbook/themes/`;
 
 	$core->con->execute('UPDATE entreprises SET ws_grade=0, ws_admin=1');
 
diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 531967f8f..e103155b9 100644
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -83,8 +83,6 @@ class commonDAOEntreprise extends commonDAO {
 
 		$sql = 'SELECT * FROM entreprises_vue WHERE ' . $where . ' ORDER BY ' . $orderby . ' ' . $sens . ' ' . $limit;
 
-		fb($sql);
-
 		$r = $this->con->select($sql);
 		$ids = array();
 		while ($r->fetch()) {
diff --git a/inc/config.inc.php b/inc/config.inc.php
index 7c7bd456d..18328e9ed 100644
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -37,7 +37,9 @@ if ($ws) {
 	define('MODE', 'extranet');
 }
 
-define('FLASH_SOURCES', AS3_SOURCES);
+define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');
+define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');
+
 define('STATIC_SERVER', 'http://static.' . $_SERVER['HTTP_HOST'] . WEBROOT);
 // Workshop
 define('THEMES', WEBROOT . '/fluidbook/themes/');
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ef9578d65..05b7c0df9 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -177,7 +177,7 @@ class wsUrl {
 		$res .= commonPage::bf();
 
 		$res .= commonPage::bh();
-		$res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);
+		$res .= cubeLang::translationForm(PLAYER_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);
 		$res .= commonPage::bf();
 		$res .= '</form>';
 		return $res;
-- 
2.39.5