From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 28 Mar 2011 08:11:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=3d7b2ada867bba88da2c2c9a272663e5631e2d2e;p=cubeextranet.git

---

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 34fb157c7..6cb6d6e00 100644
--- 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');
 		$db->utilisateurs->index('index_utilisateurs_prenom', 'BTREE', 'prenom');
 		$db->utilisateurs->index('index_utilisateurs_grade', 'BTREE', 'grade');
-		$db->utilisateurs->reference('fk_utilisateurs_entreprise', 'entreprise', 'entreprises', 'entreprise_id', false, false);
 		// Table entreprises
 		$db->entreprises->entreprise_id('integer', 0, false);
 		$db->entreprises->nom('varchar', 64, false);
@@ -178,8 +177,6 @@ class commonCore extends cubeCore {
 		$db->projets->primary('pk_projets', 'projet_id');
 		$db->projets->index('index_projets_status', 'BTREE', 'status');
 		$db->projets->index('index_projets_nom', 'BTREE', 'nom');
-		// $db->projets->reference('fk_projets_client', 'client', 'utilisateurs', 'utilisateur_id', false, false);
-		$db->projets->reference('fk_projets_chef', 'chef', 'utilisateurs', 'utilisateur_id', false, false);
 		// .
 		// Table taches
 		$db->taches->tache_id('integer', 0, false);
@@ -191,7 +188,6 @@ class commonCore extends cubeCore {
 		$db->taches->projet('integer', 0, false);
 		// Clés
 		$db->taches->primary('pk_taches', 'tache_id');
-		// $db->taches->reference('fk_taches_projet', 'projet', 'projets', 'projet_id');
 		$db->taches->index('index_taches_nom', 'BTREE', 'nom');
 		$db->taches->index('index_taches_categorie', 'BTREE', 'categorie');
 		// .
@@ -202,8 +198,6 @@ class commonCore extends cubeCore {
 		$db->timereport->heures('integer', 2, false);
 		// Clés
 		$db->timereport->primary('pk_timereport', 'utilisateur_id', 'tache_id', 'date');
-		$db->timereport->reference('fk_timereport_utilisateur_id', 'utilisateur_id', 'utilisateurs', 'utilisateur_id');
-		$db->timereport->reference('fk_timereport_tache_id', 'tache_id', 'taches', 'tache_id');
 		$db->timereport->index('index_timereport_date', 'BTREE', 'date');
 		// .
 		// Table devis
@@ -221,8 +215,6 @@ class commonCore extends cubeCore {
 		$db->devis->primary('pk_devis', 'devis_id');
 		$db->devis->index('index_devis_status', 'BTREE', 'status');
 		$db->devis->index('index_devis_nom', 'BTREE', 'nom');
-		$db->devis->reference('fk_devis_client', 'client', 'utilisateurs', 'utilisateur_id');
-		$db->devis->reference('fk_devis_createur', 'createur', 'utilisateurs', 'utilisateur_id');
 		// .
 		// Table factures
 		$db->factures->facture_id('varchar', 8, false);
@@ -242,8 +234,6 @@ class commonCore extends cubeCore {
 		$db->factures->primary('pk_factures', 'facture_id');
 		$db->factures->index('index_factures_status', 'BTREE', 'status');
 		$db->factures->index('index_factures_nom', 'BTREE', 'nom');
-		// $db->factures->reference('fk_factures_projet', 'projet', 'projets', 'projet_id');
-		$db->factures->reference('fk_factures_createur', 'createur', 'utilisateurs', 'utilisateur_id');
 		// .
 		// Table dashboard
 		$db->dashboard->dashboard_id('integer', 0, false);
@@ -256,7 +246,6 @@ class commonCore extends cubeCore {
 		$db->dashboard->site('varchar', 32, false, '\'extranet\'');
 		// Clés
 		$db->dashboard->primary('pk_dashboard', 'dashboard_id');
-		$db->dashboard->reference('fk_dashboard_equipier', 'equipier', 'utilisateurs', 'utilisateur_id');
 		// .
 		// Table Signatures
 		$db->signatures->signature_id('integer', 0, false);
@@ -277,7 +266,6 @@ class commonCore extends cubeCore {
 		$db->icones->primary('pk_icones', 'icone_id');
 		$db->icones->index('index_icones_nom', 'BTREE', 'nom');
 		$db->icones->index('index_icones_date', 'BTREE', 'date');
-		$db->icones->reference('fk_icones_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');
 		// Table thèmes
 		$db->themes->theme_id('integer', 0, false);
 		$db->themes->icones('integer', 0, false);
@@ -289,8 +277,6 @@ class commonCore extends cubeCore {
 		$db->themes->primary('pk_themes', 'theme_id');
 		$db->themes->index('index_themes_nom', 'BTREE', 'nom');
 		$db->themes->index('index_themes_date', 'BTREE', 'date');
-		$db->themes->reference('fk_themes_icones', 'icones', 'icones', 'icone_id');
-		$db->themes->reference('fk_themes_proprietaires', 'proprietaire', 'utilisateurs', 'utilisateur_id');
 		// Table des langues
 		$db->langues->lang_id('varchar', 20, false);
 		$db->langues->font('varchar', 64, false);
@@ -318,7 +304,6 @@ class commonCore extends cubeCore {
 		$db->documents->index('index_documents_file', 'BTREE', 'file');
 		$db->documents->index('index_documents_date', 'BTREE', 'date');
 		$db->documents->index('index_documents_localHash', 'BTREE', 'localHash');
-		// $db->documents->reference('fk_documents_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');
 		// .
 		// Table pages des documents
 		$db->document_links->document_id('integer', 0, false);
@@ -350,13 +335,10 @@ class commonCore extends cubeCore {
 		$db->books->numerotation('text', 0, false);
 		$db->books->changedate('integer', 0, false);
 		$db->books->compiledate('integer', 0, false);
-		$db->books->syncv1('integer',0,false,0);
+		$db->books->syncv1('integer', 0, false, 0);
 		// Clés
 		$db->books->primary('pk_books', 'book_id');
 		$db->books->index('index_books_nom', 'BTREE', 'nom');
-		$db->books->reference('fk_books_proprietaire', 'proprietaire', 'utilisateurs', 'utilisateur_id');
-		// $db->books->reference('fk_books_projet', 'projet', 'projets', 'projet_id');
-		// $db->books->reference('fk_books_lang', 'lang', 'langues', 'lang');
 		// .
 		// Table pages des publications
 		$db->book_pages->book_id('integer', 0, false);
@@ -365,8 +347,6 @@ class commonCore extends cubeCore {
 		$db->book_pages->document_page('integer', 0, false);
 		// Clés
 		$db->book_pages->primary('pk_book_pages', 'book_id', 'book_page');
-		$db->book_pages->reference('fk_book_pages_book_id', 'book_id', 'books', 'book_id');
-		$db->book_pages->reference('fk_book_pages_document_id', 'document_id', 'documents', 'document_id');
 		// .
 		// Table de cache des urls courtes
 		$db->book_short_url->long_url('varchar', 255, false);
diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 7973878b7..0ea55f72e 100644
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -93,7 +93,7 @@ class wsMaintenance {
 	{
 		global $core, $signatures;
 
-		$r = $core->con->select('SELECT tid,sigid FROM theme');
+		$r = $core->con->select('SELECT tid,sigid FROM ws.theme');
 		while ($r->fetch()) {
 			$signatures[$r->tid] = $r->sigid;
 		}
@@ -251,12 +251,15 @@ class wsMaintenance {
 		if (!isset($ws2ext[$oldid])) {
 			self::_importOldUser($oldid);
 		}
+		if (!isset($ws2ext[$oldid])) {
+			$ws2ext[$oldid] = 1;
+		}
 		return $ws2ext[$oldid];
 	}
 
 	protected static function _getAllUsers()
 	{
-		global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades;
+		global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;
 		$grades = array(0 => 1, 0.4 => 1, '0.4' => 1, 0.5 => 1, '0.5' => 1, 1 => 1, 2 => 2, 3 => 3, 4 => 5);
 		// Contrôle des entreprises déjà dans la base extranet
 		$entreprises = array();
@@ -295,7 +298,7 @@ class wsMaintenance {
 
 	protected static function _importOldUser($oldid)
 	{
-		global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades;
+		global $core, $entreprises, $entreprise_id, $utilisateurs_entreprises, $utilisateur_id, $ws2ext, $grades, $utilisateurs;
 		// Get user from old
 		$r = $core->con->select('SELECT * FROM ws.user WHERE uid=\'' . $core->con->escape($oldid) . '\'');
 		if ($r->extranet != 0) {
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index cc7d4e086..871fe5152 100644
--- 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;
 		$book->tache = $r->tache;
 		$book->projet = $r->projet;
-		$book->syncv1 = $r->syncv1;
 
 		return $book;
 	}
@@ -56,7 +55,6 @@ class wsDAOBook extends commonDAO {
 		$book->parametres = new wsBookParametres();
 		$book->tache = 0;
 		$book->pages = array();
-		$book->syncv1 = 0;
 		return $book;
 	}
 
@@ -108,13 +106,11 @@ class wsDAOBook extends commonDAO {
 			$c->compteur_visites = 20;
 			$c->parametres = serialize(new wsParametres());
 			$c->changedate = TIME;
-			$c->syncv1 = 0;
 			$book_id = $c->book_id = $this->getNextId();
 
 			$c->insert();
 		} else {
 			$c->changedate = TIME;
-			$c->syncv1 = 0;
 			$book_id = $data['book_id'];
 			$c->update('WHERE book_id=\'' . $this->con->escape($data['book_id']) . '\'');
 		}
@@ -143,7 +139,6 @@ class wsDAOBook extends commonDAO {
 		$c->theme = $r->theme;
 		$c->changedate = TIME;
 		$c->compiledate = 0;
-		$c->syncv1 = 0;
 		$book_id = $c->book_id = $this->getNextId();
 		$c->insert();
 
@@ -192,7 +187,7 @@ class wsDAOBook extends commonDAO {
 	public function getPagesOfBook($book_id)
 	{
 		$pages = array();
-		$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 = $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');
 		while ($r->fetch()) {
 			$n = explode(',', $r->num);
 			if ($r->conversion != '') {
@@ -278,8 +273,6 @@ class wsDAOBook extends commonDAO {
 		$c = $this->con->openCursor('books');
 		$c->numerotation = json_encode($num);
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
-
-		fb('Insert Document ! ' . $book_id . ' ' . $after_page . ' ' . $document_id);
 	}
 
 	protected function decalePages($book_id, $after_page, $decalage)
@@ -343,7 +336,6 @@ class wsDAOBook extends commonDAO {
 		$c = $this->con->openCursor('books');
 		$c->chapters = json_encode(json_decode($json, false));
 		$c->changedate = TIME;
-		$c->syncv1 = 0;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
 
@@ -352,7 +344,6 @@ class wsDAOBook extends commonDAO {
 		$c = $this->con->openCursor('books');
 		$c->theme = $theme;
 		$c->changedate = TIME;
-		$c->syncv1 = 0;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
 
@@ -417,7 +408,6 @@ class wsDAOBook extends commonDAO {
 		$c->lang = $base;
 		$c->traductions = $t;
 		$c->changedate = TIME;
-		$c->syncv1 = 0;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
 
@@ -436,7 +426,6 @@ class wsDAOBook extends commonDAO {
 		$c->nom = $parametres->title;
 		$c->parametres = serialize($parametres);
 		$c->changedate = TIME;
-		$c->syncv1 = 0;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 	}
 
@@ -492,7 +481,6 @@ class wsDAOBook extends commonDAO {
 		$c->parametres = serialize($parametres);
 		$c->numerotation = implode(',', $numerotation);
 		$c->changedate = TIME;
-		$c->syncv1 = 0;
 		$c->update('WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
 
 		$this->con->execute('DELETE FROM book_pages WHERE book_id=\'' . $this->con->escape($book_id) . '\'');
@@ -635,7 +623,7 @@ class wsDAOBook extends commonDAO {
 		$flex->addVariable('extras', '<extras>' . $book->extras . '</extras>', false, true, 'XML');
 		$flex->addVariable('numerotation', $book->numerotation, false, true, 'String');
 		$flexLight->addVariable('theme', $theme->parametres->toStandardObject(), false, true, 'JSONObject');
-		$flexLight->addVariable('pages', count($pages));
+		$flexLight->addVariable('pages', $book->pages);
 		$flexLight->addVariable('fwidth', round($size[0]), false, true, 'Number');
 		$flexLight->addVariable('fheight', round($size[1]), false, true, 'Number');
 		$flexLight->addVariable('pagesInDatas', $complete, false, true, 'Boolean');
@@ -643,12 +631,17 @@ class wsDAOBook extends commonDAO {
 		$flex->addVariable('textes', $textes, false, true, 'JSONObject');
 		foreach($pages as $i => $infos) {
 			$swffile = WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.swf';
+			if (file_exists($swffile)) {
+				$fsize = filesize($swffile);
+			} else {
+				$fsize = 0;
+			}
 			if ($i == 1) {
 				$flexLight->addBitmap(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb1');
-				$flexLight->addVariable('size_p_' . $i, filesize($swffile), false, true, 'Number');
+				$flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');
 			} else {
 				$flex->addBitmap(WS_DOCS . '/' . $infos['document_id'] . '/p' . $infos['document_page'] . '.jpg', 'thumb' . $i);
-				$flexLight->addVariable('size_p_' . $i, filesize($swffile), false, true, 'Number');
+				$flexLight->addVariable('size_p_' . $i, $fsize, false, true, 'Number');
 			}
 		}