(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 34fb157c740a4026bfa8a0e9982e357a8b95563e..6cb6d6e00b584f469611ed049ddaed88bb579bc2 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -143,7 +143,6 @@ class commonCore extends cubeCore {
                $db->utilisateurs->index('index_utilisateurs_nom', 'BTREE', 'nom');\r
                $db->utilisateurs->index('index_utilisateurs_prenom', 'BTREE', 'prenom');\r
                $db->utilisateurs->index('index_utilisateurs_grade', 'BTREE', 'grade');\r
-               $db->utilisateurs->reference('fk_utilisateurs_entreprise', 'entreprise', 'entreprises', 'entreprise_id', false, false);\r
                // Table entreprises\r
                $db->entreprises->entreprise_id('integer', 0, false);\r
                $db->entreprises->nom('varchar', 64, false);\r
@@ -178,8 +177,6 @@ class commonCore extends cubeCore {
                $db->projets->primary('pk_projets', 'projet_id');\r
                $db->projets->index('index_projets_status', 'BTREE', 'status');\r
                $db->projets->index('index_projets_nom', 'BTREE', 'nom');\r
-               // $db->projets->reference('fk_projets_client', 'client', 'utilisateurs', 'utilisateur_id', false, false);\r
-               $db->projets->reference('fk_projets_chef', 'chef', 'utilisateurs', 'utilisateur_id', false, false);\r
                // .\r
                // Table taches\r
                $db->taches->tache_id('integer', 0, false);\r
@@ -191,7 +188,6 @@ class commonCore extends cubeCore {
                $db->taches->projet('integer', 0, false);\r
                // Clés\r
                $db->taches->primary('pk_taches', 'tache_id');\r
-               // $db->taches->reference('fk_taches_projet', 'projet', 'projets', 'projet_id');\r
                $db->taches->index('index_taches_nom', 'BTREE', 'nom');\r
                $db->taches->index('index_taches_categorie', 'BTREE', 'categorie');\r
                // .\r
@@ -202,8 +198,6 @@ class commonCore extends cubeCore {
                $db->timereport->heures('integer', 2, false);\r
                // Clés\r
                $db->timereport->primary('pk_timereport', 'utilisateur_id', 'tache_id', 'date');\r
-               $db->timereport->reference('fk_timereport_utilisateur_id', 'utilisateur_id', 'utilisateurs', 'utilisateur_id');\r
-               $db->timereport->reference('fk_timereport_tache_id', 'tache_id', 'taches', 'tache_id');\r
                $db->timereport->index('index_timereport_date', 'BTREE', 'date');\r
                // .\r
                // Table devis\r
@@ -221,8 +215,6 @@ class commonCore extends cubeCore {
                $db->devis->primary('pk_devis', 'devis_id');\r
                $db->devis->index('index_devis_status', 'BTREE', 'status');\r
                $db->devis->index('index_devis_nom', 'BTREE', 'nom');\r
-               $db->devis->reference('fk_devis_client', 'client', 'utilisateurs', 'utilisateur_id');\r
-               $db->devis->reference('fk_devis_createur', 'createur', 'utilisateurs', 'utilisateur_id');\r
                // .\r
                // Table factures\r
                $db->factures->facture_id('varchar', 8, false);\r
@@ -242,8 +234,6 @@ class commonCore extends cubeCore {
                $db->factures->primary('pk_factures', 'facture_id');\r
                $db->factures->index('index_factures_status', 'BTREE', 'status');\r
                $db->factures->index('index_factures_nom', 'BTREE', 'nom');\r
-               // $db->factures->reference('fk_factures_projet', 'projet', 'projets', 'projet_id');\r
-               $db->factures->reference('fk_factures_createur', 'createur', 'utilisateurs', 'utilisateur_id');\r
                // .\r
                // Table dashboard\r
                $db->dashboard->dashboard_id('integer', 0, false);\r
@@ -256,7 +246,6 @@ class commonCore extends cubeCore {
                $db->dashboard->site('varchar', 32, false, '\'extranet\'');\r
                // Clés\r
                $db->dashboard->primary('pk_dashboard', 'dashboard_id');\r
-               $db->dashboard->reference('fk_dashboard_equipier', 'equipier', 'utilisateurs', 'utilisateur_id');\r
                // .\r
                // Table Signatures\r
                $db->signatures->signature_id('integer', 0, false);\r
@@ -277,7 +266,6 @@ class commonCore extends cubeCore {
                $db->icones->primary('pk_icones', 'icone_id');\r
                $db->icones->index('index_icones_nom', 'BTREE', 'nom');\r
                $db->icones->index('index_icones_date', 'BTREE', 'date');\r
-               $db->icones->reference('fk_icones_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');\r
                // Table thèmes\r
                $db->themes->theme_id('integer', 0, false);\r
                $db->themes->icones('integer', 0, false);\r
@@ -289,8 +277,6 @@ class commonCore extends cubeCore {
                $db->themes->primary('pk_themes', 'theme_id');\r
                $db->themes->index('index_themes_nom', 'BTREE', 'nom');\r
                $db->themes->index('index_themes_date', 'BTREE', 'date');\r
-               $db->themes->reference('fk_themes_icones', 'icones', 'icones', 'icone_id');\r
-               $db->themes->reference('fk_themes_proprietaires', 'proprietaire', 'utilisateurs', 'utilisateur_id');\r
                // Table des langues\r
                $db->langues->lang_id('varchar', 20, false);\r
                $db->langues->font('varchar', 64, false);\r
@@ -318,7 +304,6 @@ class commonCore extends cubeCore {
                $db->documents->index('index_documents_file', 'BTREE', 'file');\r
                $db->documents->index('index_documents_date', 'BTREE', 'date');\r
                $db->documents->index('index_documents_localHash', 'BTREE', 'localHash');\r
-               // $db->documents->reference('fk_documents_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');\r
                // .\r
                // Table pages des documents\r
                $db->document_links->document_id('integer', 0, false);\r
@@ -350,13 +335,10 @@ class commonCore extends cubeCore {
                $db->books->numerotation('text', 0, false);\r
                $db->books->changedate('integer', 0, false);\r
                $db->books->compiledate('integer', 0, false);\r
-               $db->books->syncv1('integer',0,false,0);\r
+               $db->books->syncv1('integer', 0, false, 0);\r
                // Clés\r
                $db->books->primary('pk_books', 'book_id');\r
                $db->books->index('index_books_nom', 'BTREE', 'nom');\r
-               $db->books->reference('fk_books_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');\r
-               // $db->books->reference('fk_books_projet', 'projet', 'projets', 'projet_id');\r
-               // $db->books->reference('fk_books_lang', 'lang', 'langues', 'lang');\r
                // .\r
                // Table pages des publications\r
                $db->book_pages->book_id('integer', 0, false);\r
@@ -365,8 +347,6 @@ class commonCore extends cubeCore {
                $db->book_pages->document_page('integer', 0, false);\r
                // Clés\r
                $db->book_pages->primary('pk_book_pages', 'book_id', 'book_page');\r
-               $db->book_pages->reference('fk_book_pages_book_id', 'book_id', 'books', 'book_id');\r
-               $db->book_pages->reference('fk_book_pages_document_id', 'document_id', 'documents', 'document_id');\r
                // .\r
                // Table de cache des urls courtes\r
                $db->book_short_url->long_url('varchar', 255, false);\r

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 7973878b79abccce889cee2c60f14dab877cbafb..0ea55f72e5353a67a6a8733b85af820a3a3b8c1f 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -93,7 +93,7 @@ class wsMaintenance {
        {\r
                global $core, $signatures;\r
 \r
-               $r = $core->con->select('SELECT tid,sigid FROM theme');\r
+               $r = $core->con->select('SELECT tid,sigid FROM ws.theme');\r
                while ($r->fetch()) {\r
                        $signatures[$r->tid] = $r->sigid;\r
                }\r
@@ -251,12 +251,15 @@ class wsMaintenance {
                if (!isset($ws2ext[$oldid])) {\r
                        self::_importOldUser($oldid);\r
                }\r
+               if (!isset($ws2ext[$oldid])) {\r
+                       $ws2ext[$oldid] = 1;\r
+               }\r
                return $ws2ext[$oldid];\r
        }\r
 \r
        protected static function _getAllUsers()\r
        {\r
-               global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades;\r
+               global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;\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
                // Contrôle des entreprises déjà dans la base extranet\r
                $entreprises = array();\r
@@ -295,7 +298,7 @@ class wsMaintenance {
 \r
        protected static function _importOldUser($oldid)\r
        {\r
-               global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades;\r
+               global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;\r
                // Get user from old\r
                $r = $core->con->select('SELECT * FROM ws.user WHERE uid=\'' . $core->con->escape($oldid) . '\'');\r
                if ($r->extranet != 0) {\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index cc7d4e086c4dd099b1a08a8a8509497ae7260c97..871fe515267d17949d2d7cf262d376367ce1a817 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -33,7 +33,6 @@ class wsDAOBook extends commonDAO {
                $book->facturable_id = $r->facturable_id;\r
                $book->tache = $r->tache;\r
                $book->projet = $r->projet;\r
-               $book->syncv1 = $r->syncv1;\r
 \r
                return $book;\r
        }\r
@@ -56,7 +55,6 @@ class wsDAOBook extends commonDAO {
                $book->parametres = new wsBookParametres();\r
                $book->tache = 0;\r
                $book->pages = array();\r
-               $book->syncv1 = 0;\r
                return $book;\r
        }\r
 \r
@@ -108,13 +106,11 @@ class wsDAOBook extends commonDAO {
                        $c->compteur_visites = 20;\r
                        $c->parametres = serialize(new wsParametres());\r
                        $c->changedate = TIME;\r
-                       $c->syncv1 = 0;\r
                        $book_id = $c->book_id = $this->getNextId();\r
 \r
                        $c->insert();\r
                } else {\r
                        $c->changedate = TIME;\r
-                       $c->syncv1 = 0;\r
                        $book_id = $data['book_id'];\r
                        $c->update('WHERE book_id=\'' . $this->con->escape($data['book_id']) . '\'');\r
                }\r
@@ -143,7 +139,6 @@ class wsDAOBook extends commonDAO {
                $c->theme = $r->theme;\r
                $c->changedate = TIME;\r
                $c->compiledate = 0;\r
-               $c->syncv1 = 0;\r
                $book_id = $c->book_id = $this->getNextId();\r
                $c->insert();\r
 \r
@@ -192,7 +187,7 @@ class wsDAOBook extends commonDAO {
        public function getPagesOfBook($book_id)\r
        {\r
                $pages = array();\r
-               $r = $this->con->select('SELECT b.*,d.numberSections AS num,d.conversionInfos AS conversion,d.pages AS doc_pages,d.version AS version FROM book_pages b LEFT JOIN documents d ON d.document_id=b.document_id WHERE b.book_id=\'' . $this->con->escape($book_id) . '\' ORDER BY book_page');\r
+               $r = $this->con->select('SELECT b.*,d.numberSections AS num,d.conversionInfos AS conversion,d.pages AS doc_pages,d.version AS version FROM book_pages b JOIN documents d ON d.document_id=b.document_id WHERE b.book_id=\'' . $this->con->escape($book_id) . '\' ORDER BY book_page');\r
                while ($r->fetch()) {\r
                        $n = explode(',', $r->num);\r
                        if ($r->conversion != '') {\r
@@ -278,8 +273,6 @@ class wsDAOBook extends commonDAO {
                $c = $this->con->openCursor('books');\r
                $c->numerotation = json_encode($num);\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
-\r
-               fb('Insert Document ! ' . $book_id . ' ' . $after_page . ' ' . $document_id);\r
        }\r
 \r
        protected function decalePages($book_id, $after_page, $decalage)\r
@@ -343,7 +336,6 @@ class wsDAOBook extends commonDAO {
                $c = $this->con->openCursor('books');\r
                $c->chapters = json_encode(json_decode($json, false));\r
                $c->changedate = TIME;\r
-               $c->syncv1 = 0;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
@@ -352,7 +344,6 @@ class wsDAOBook extends commonDAO {
                $c = $this->con->openCursor('books');\r
                $c->theme = $theme;\r
                $c->changedate = TIME;\r
-               $c->syncv1 = 0;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
@@ -417,7 +408,6 @@ class wsDAOBook extends commonDAO {
                $c->lang = $base;\r
                $c->traductions = $t;\r
                $c->changedate = TIME;\r
-               $c->syncv1 = 0;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
@@ -436,7 +426,6 @@ class wsDAOBook extends commonDAO {
                $c->nom = $parametres->title;\r
                $c->parametres = serialize($parametres);\r
                $c->changedate = TIME;\r
-               $c->syncv1 = 0;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
        }\r
 \r
@@ -492,7 +481,6 @@ class wsDAOBook extends commonDAO {
                $c->parametres = serialize($parametres);\r
                $c->numerotation = implode(',', $numerotation);\r
                $c->changedate = TIME;\r
-               $c->syncv1 = 0;\r
                $c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
 \r
                $this->con->execute('DELETE FROM book_pages WHERE book_id=\'' . $this->con->escape($book_id) . '\'');\r
@@ -635,7 +623,7 @@ class wsDAOBook extends commonDAO {
                $flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');\r
                $flex->addVariable('numerotation', $book->numerotation, false, true, 'String');\r
                $flexLight->addVariable('theme', $theme->parametres->toStandardObject(), false, true, 'JSONObject');\r
-               $flexLight->addVariable('pages', count($pages));\r
+               $flexLight->addVariable('pages', $book->pages);\r
                $flexLight->addVariable('fwidth', round($size[0]), false, true, 'Number');\r
                $flexLight->addVariable('fheight', round($size[1]), false, true, 'Number');\r
                $flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');\r
@@ -643,12 +631,17 @@ class wsDAOBook extends commonDAO {
                $flex->addVariable('textes', $textes, false, true, 'JSONObject');\r
                foreach($pages as $i => $infos) {\r
                        $swffile = WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf';\r
+                       if (file_exists($swffile)) {\r
+                               $fsize = filesize($swffile);\r
+                       } else {\r
+                               $fsize = 0;\r
+                       }\r
                        if ($i == 1) {\r
                                $flexLight->addBitmap(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb1');\r
-                               $flexLight->addVariable('size_p_' . $i, filesize($swffile), false, true, 'Number');\r
+                               $flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');\r
                        } else {\r
                                $flex->addBitmap(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);\r
-                               $flexLight->addVariable('size_p_' . $i, filesize($swffile), false, true, 'Number');\r
+                               $flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');\r
                        }\r
                }\r
 \r