(no commit message)

diff --git a/importWs.php b/importWs.php
index 67a30662fc8748053847442c0bf4a99d5806ef75..7e850484daa6844938aa1f749314a0bb500c8832 100644 (file)
--- a/importWs.php
+++ b/importWs.php
@@ -2,11 +2,9 @@
 include('inc/prepend.php');\r
 \r
 try {\r
-       set_time_limit(0);\r
-\r
        $utilisateurs = true;\r
-       $documents = false;\r
-       $books = false;\r
+       $documents = true;\r
+       $books = true;\r
        $themes = true;\r
        $langues = true;\r
 \r
@@ -17,6 +15,17 @@ try {
                $documents = true;\r
        }\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
+       cubeDb::mysqlRestore(DB_HOST, DB_NAME, DB_USER , DB_PASSWORD , dirname(__FILE__) . '/dump.sql', false);\r
+       unlink(dirname(__FILE__) . '/dump.sql');\r
+\r
+       touch(ROOT . '/cache/DB_TODO');\r
+       $core->dbSync();\r
+\r
        $grades = array(0 => 1, 0.4 => 1, '0.4' => 1, 0.5 => 1, '0.5' => 1, 1 => 1, 2 => 2, 3 => 3, 4 => 5);\r
 \r
        $tables = array('books', 'book_pages', 'dashboard', 'devis', 'documents', 'entreprises', 'factures', 'icones', 'langues', 'projets', 'signatures', 'taches', 'themes', 'timereport', 'utilisateurs'/*, 'themes_droits'*/);\r
@@ -24,30 +33,12 @@ try {
                $core->con->execute('ALTER TABLE ' . $t . ' DISABLE KEYS');\r
        }\r
 \r
-       if ($themes) {\r
-               // $core->con->execute('TRUNCATE TABLE themes_droits');\r
-               $core->con->execute('TRUNCATE TABLE themes');\r
-               $core->con->execute('TRUNCATE TABLE icones');\r
-               $core->con->execute('TRUNCATE TABLE signatures');\r
-       }\r
-       if ($langues) {\r
-               $core->con->execute('TRUNCATE TABLE langues');\r
-       }\r
+       // Copie des dossiers\r
 \r
-       if ($books) {\r
-               $core->con->execute('TRUNCATE TABLE book_pages');\r
-               $core->con->execute('TRUNCATE TABLE books');\r
-       }\r
+       `/bin/cp /home/extranet/www/devis/* /home/extranet/dev/devis/`;\r
+       `/bin/cp /home/extranet/www/factures/* /home/extranet/dev/factures/`;\r
 \r
-       if ($documents) {\r
-               $core->con->execute('TRUNCATE TABLE documents');\r
-       }\r
-\r
-       if ($utilisateurs) {\r
-               $core->con->execute('DELETE FROM utilisateurs WHERE utilisateur_id>278');\r
-               $core->con->execute('DELETE FROM entreprises WHERE entreprise_id>242');\r
-               $core->con->execute('UPDATE entreprises SET ws_grade=0, ws_admin=1');\r
-       }\r
+       $core->con->execute('UPDATE entreprises SET ws_grade=0, ws_admin=1');\r
 \r
        if ($utilisateurs) {\r
                // Importe les entreprises\r
@@ -324,7 +315,7 @@ try {
                        $c->pages = $r->pages;\r
                        $c->trim = $r->trim;\r
                        $c->date = $r->date;\r
-                       $c->version=1;\r
+                       $c->version = 1;\r
                        $c->insert();\r
                        // TODO Copie des fichiers\r
                        $docs[$r->did] = true;\r
@@ -393,6 +384,8 @@ try {
                $core->con->execute('INSERT INTO book_pages (book_id,book_page,document_id,document_page) SELECT bid,bpid,did,dpid FROM ws.book_pages');\r
        }\r
 \r
+       $core->refreshWSUsersTree();\r
+\r
        foreach($tables as $t) {\r
                $core->con->execute('ALTER TABLE ' . $t . ' ENABLE KEYS');\r
        }\r

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 540350139f9c7a3d81b1bf5210553fe1fcc61300..68255e353bbd83a221ac571f56752961ccde8657 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -11,7 +11,11 @@ class commonCore extends cubeCore {
                $this->dbSync();\r
 \r
                cubeLang::set();\r
-               $this->authentifie();\r
+               try {\r
+                       $this->authentifie();\r
+               }\r
+               catch(Exception $e) {\r
+               }\r
 \r
                if ($this->user) {\r
                        // Défini la langue de l'utilisateur en fonction du contenu de user\r
@@ -117,11 +121,12 @@ class commonCore extends cubeCore {
        public function dbSync()\r
        {\r
                $cache = ROOT . '/cache/DB_SYNC';\r
+               $todo = ROOT . '/cache/DB_TODO';\r
                if (!file_exists($cache)) {\r
                        touch($cache);\r
                        $dosync = true;\r
                } else {\r
-                       $dosync = filemtime(__FILE__) > filemtime($cache);\r
+                       $dosync = filemtime(__FILE__) >= filemtime($cache) || (file_exists($todo) && filemtime($todo) >= filemtime($cache));\r
                }\r
 \r
                if (!$dosync) {\r
@@ -129,7 +134,6 @@ class commonCore extends cubeCore {
                }\r
 \r
                $this->views->dropAllViews();\r
-\r
                $db = new CubeDbStruct($this->con);\r
                // Table utilisateurs\r
                $db->utilisateurs->utilisateur_id('integer', 0, false);\r
@@ -419,13 +423,13 @@ class commonCore extends cubeCore {
                $db->demandes->administrateur('integer', 0, false);\r
                // Clés\r
                $db->demandes->primary('pk_demandes', 'demande_id');\r
-\r
                try {\r
                        $dbi = new CubeDbStruct($this->con);\r
                        $dbi->synchronize($db);\r
                }\r
                catch(Exception $e) {\r
                        fb($e);\r
+                       return;\r
                }\r
 \r
                $this->views->createView('equipiers', 'SELECT * FROM utilisateurs WHERE grade>=1');\r
@@ -512,7 +516,6 @@ class commonCore extends cubeCore {
                         . 'FROM themes t '\r
                         . 'LEFT JOIN books b ON t.theme_id=b.theme '\r
                         . 'GROUP BY t.theme_id');\r
-\r
                $this->views->createView('demandes_vue', 'SELECT d.*, CONCAT(c.rs,\' (\',c.prenom,\' \',c.nom,\')\') AS utilisateur_nom, CONCAT(r.rs,\' (\',r.prenom,\' \',r.nom,\')\') AS revendeur_nom, c.entreprise AS entreprise, a.prenom AS administrateur_nom '\r
                         . 'FROM demandes d '\r
                         . 'LEFT JOIN utilisateurs_entreprise r ON d.revendeur=r.utilisateur_id '\r

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 71053cc43f7e31a951eacfa0ad63ea229f519a36..7c7bd456dd9ec3da4911346434b28aa825fdb241 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -3,43 +3,32 @@
 define('DB_DRIVER', 'mysql');\r
 define('ROOT', dirname(__FILE__) . '/..');\r
 \r
-$local = stristr($_SERVER['HTTP_HOST'], 'dev.');\r
+$dev = stristr($_SERVER['HTTP_HOST'], 'dev.');\r
 $extranet = stristr($_SERVER['HTTP_HOST'], 'extranet.cubedesigners.com');\r
 $ws = stristr($_SERVER['HTTP_HOST'], 'ws.fluidbook.com');\r
 \r
-if ($local) {\r
+define('WEBROOT', '');\r
+define('SITE_PATH', WEBROOT . '/');\r
+define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
+define('FTPROOT', '/home/extranet/ftp/');\r
+define('DEV', false);\r
+define('WINDOWS', false);\r
+define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');\r
+define('MXMLC_PATH', '/usr/local/bin/mxmlc');\r
+define('AS3_SOURCES', '/home/ws/sources');\r
+\r
+if ($dev) {\r
        // Définition de la configuration sur l'environnement de développement\r
        define('DB_HOST', 'localhost');\r
-       define('DB_NAME', 'extranet');\r
-       define('DB_USER', 'root');\r
-       define('DB_PASSWORD', 'valparaiso');\r
-       define('DEV', true);\r
-       define('WINDOWS', true);\r
-       define('FONT_PATH', ROOT . '/fluidbook/fonts/');\r
-       define('AS3_SOURCES', 'C:\Users\Vincent\Documents\Works\as3;C:\Users\Vincent\Documents\Works\cubeExtranet\swf\_src;C:\Users\Vincent\Documents\Works\as3-10');\r
-\r
-       define('WEBROOT', '');\r
-       define('SITE_PATH', WEBROOT . '/');\r
-\r
-       define('CONVERTER_PATH', ROOT . '/fluidbook/tools/');\r
-       define('MXMLC_PATH', 'C:\Program Files\Adobe\Flex SDK\bin\mxmlc.exe');\r
-       define('FTPROOT', 'C:/Users/Vincent/Documents/Works/cubeExtranet/_ftp/');\r
-       define('FLUIDBOOK_SOURCES', 'C:\Users\Vincent\Documents\Works\fluidbook3d\_src');\r
+       define('DB_NAME', 'extranet_dev');\r
+       define('DB_USER', 'ws');\r
+       define('DB_PASSWORD', '*arica*2');\r
 } else {\r
        // Définition des variables dans l'environnement de production\r
        define('DB_HOST', 'localhost');\r
        define('DB_NAME', 'extranet');\r
        define('DB_USER', 'ws');\r
        define('DB_PASSWORD', '*arica*2');\r
-       define('WEBROOT', '');\r
-       define('SITE_PATH', WEBROOT . '/');\r
-\r
-       define('FTPROOT', '/home/extranet/ftp/');\r
-       define('DEV', false);\r
-       define('WINDOWS', false);\r
-       define('CONVERTER_PATH', '/bin:/usr/bin:/usr/local/bin');\r
-       define('MXMLC_PATH', '/usr/local/bin/mxmlc');\r
-       define('AS3_SOURCES', '/home/ws/sources');\r
 }\r
 \r
 if ($ws) {\r
@@ -48,13 +37,8 @@ if ($ws) {
        define('MODE', 'extranet');\r
 }\r
 \r
-define('FLASH_SOURCES', ROOT . '/swf/');\r
-\r
-if (DEV) {\r
-       define('STATIC_SERVER', 'http://devstatic.ws.fluidbook.com' . WEBROOT);\r
-} else {\r
-       define('STATIC_SERVER', 'http://static.ws.fluidbook.com' . WEBROOT);\r
-}\r
+define('FLASH_SOURCES', AS3_SOURCES);\r
+define('STATIC_SERVER', 'http://static.' . $_SERVER['HTTP_HOST'] . WEBROOT);\r
 // Workshop\r
 define('THEMES', WEBROOT . '/fluidbook/themes/');\r
 define('ICONS', WEBROOT . '/fluidbook/icones/');\r