(no commit message)

diff --git a/importWs.php b/importWs.php
index 7e850484daa6844938aa1f749314a0bb500c8832..4a305817ea9e13ccb1ef724150f3333f7ffc7923 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -16,7 +16,6 @@ try {
        }\r
 \r
        define('MYSQL_BIN', '/usr/local/mysql/bin/');\r
-       fb(MYSQL_BIN);\r
        // Copie de la base extranet vers extranet_dev\r
        cubeDb::truncateDatabase('extranet_dev');\r
        cubeDb::mysqlDump(DB_HOST, 'extranet' , DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false, 0);\r
@@ -32,11 +31,10 @@ try {
        foreach($tables as $t) {\r
                $core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS');\r
        }\r
-\r
        // Copie des dossiers\r
-\r
        `/bin/cp /home/extranet/www/devis/* /home/extranet/dev/devis/`;\r
        `/bin/cp /home/extranet/www/factures/* /home/extranet/dev/factures/`;\r
+       `/bin/cp -r /home/ws/www/themes/* /home/extranet/dev/fluidbook/themes/`;\r
 \r
        $core->con->execute('UPDATE entreprises SET ws_grade=0, ws_admin=1');\r
 \r

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 531967f8fa920ea6443c6cf951928b261a985884..e103155b955a475221cf6891ef4de92ec9ec65ca 100644 (file)
--- 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 {
 \r
                $sql = 'SELECT * FROM entreprises_vue WHERE ' . $where . ' ORDER BY ' . $orderby . ' ' . $sens . ' ' . $limit;\r
 \r
-               fb($sql);\r
-\r
                $r = $this->con->select($sql);\r
                $ids = array();\r
                while ($r->fetch()) {\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 7c7bd456dd9ec3da4911346434b28aa825fdb241..18328e9ed61f0273cac4c3e30909a3167e6cf7cd 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -37,7 +37,9 @@ if ($ws) {
        define('MODE', 'extranet');\r
 }\r
 \r
-define('FLASH_SOURCES', AS3_SOURCES);\r
+define('PLAYER_SOURCES', AS3_SOURCES . '/com/fluidbook/player');\r
+define('COMPOSER_SOURCES', AS3_SOURCES . '/com/fluidbook/ws');\r
+\r
 define('STATIC_SERVER', 'http://static.' . $_SERVER['HTTP_HOST'] . WEBROOT);\r
 // Workshop\r
 define('THEMES', WEBROOT . '/fluidbook/themes/');\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ef9578d65ce28544174bcc3feca2902975866bd4..05b7c0df950474a1876f93637b7674b8d44324e8 100644 (file)
--- 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();\r
 \r
                $res .= commonPage::bh();\r
-               $res .= cubeLang::translationForm(FLUIDBOOK_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
+               $res .= cubeLang::translationForm(PLAYER_SOURCES, $lang_id , null, 'liste', array(), '<a href="#" class="submit">' . $core->typo->Ajouter(__('Enregistrer')) . '</a>', $lang->traductions);\r
                $res .= commonPage::bf();\r
                $res .= '</form>';\r
                return $res;\r