From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 19 Jan 2011 14:48:46 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=a6a83e829c7d1d2f8d1743774c994dc84daa50da;p=cubeextranet.git

---

diff --git a/inc/commons/DAO/class.common.dao.client.php b/inc/commons/DAO/class.common.dao.client.php
index a0f948ba3..98e147d16 100644
--- a/inc/commons/DAO/class.common.dao.client.php
+++ b/inc/commons/DAO/class.common.dao.client.php
@@ -38,6 +38,7 @@ class commonDAOClient extends commonDAOUtilisateur {
 	public function getListe($orderby = null, $sens = null, $limit = null, $where = null, $limitedToUserRights = false)
 	{
 		$sql = $this->getQueryList('clients', $orderby, $sens, $limit, $where,$limitedToUserRights);
+		fb($sql);
 		$r = $this->con->select($sql);
 		return $this->factory($r);
 	}
diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 481b455ea..9066a3d23 100644
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -16,6 +16,7 @@ class commonDAOEntreprise extends commonDAO {
 		$entreprise->adresse_facturation = $r->adresse_facturation;
 		$entreprise->ws_admin = $r->ws_admin;
 		$entreprise->ws_grade = $r->ws_grade;
+		$entreprise->ws_signatures = $r->ws_signatures;
 
 		return $entreprise;
 	}
@@ -61,16 +62,18 @@ class commonDAOEntreprise extends commonDAO {
 
 	public function getListe($orderby = null, $sens = null, $limit = null, $limitedToUserRights = false)
 	{
+		$where = '(';
 		if (!is_null($this->q)) {
 			$daoClients = new commonDAOClient($this->con);
-			$where = '';
+
 			$where .= 'entreprise_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			$where .= 'nom LIKE \'%' . $this->con->escape($this->q) . '%\' OR ';
 			$where .= 'entreprise_id IN (SELECT entreprise FROM utilisateurs WHERE(' . $daoClients->whereSearchByName($this->q, false) . ') AND grade=0) ';
 			$limit = null;
 		} else {
-			$where = $this->makeWhereFromFiltres();
+			$where .= $this->makeWhereFromFiltres();
 		}
+		$where .= ') ';
 
 		$where .= $this->limitToUserRights($limitedToUserRights);
 
@@ -79,6 +82,9 @@ class commonDAOEntreprise extends commonDAO {
 		$limit = is_null($limit)?'':$this->con->limit($limit[0], $limit[1]);
 
 		$sql = 'SELECT * FROM entreprises_vue WHERE ' . $where . ' ORDER BY ' . $orderby . ' ' . $sens . ' ' . $limit;
+
+		fb($sql);
+
 		$r = $this->con->select($sql);
 		$ids = array();
 		while ($r->fetch()) {
@@ -136,6 +142,13 @@ class commonDAOEntreprise extends commonDAO {
 		if (isset($data['ws_grade'])) {
 			$c->ws_grade = $data['ws_grade'];
 		}
+		if (isset($data['ws_signatures'])) {
+			$signatures = $data['ws_signatures'];
+			if (!in_array(1, $signatures)) {
+				$signatures[] = 1;
+			}
+			$c->ws_signatures = implode(',', $signatures);
+		}
 
 		if ($data['entreprise_id'] == 'new' || $data['entreprise_id'] == '') {
 			$c->date_creation = TIME;
diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 2f6688d19..38c943f59 100644
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -54,7 +54,9 @@ class commonDAOUtilisateur extends commonDAO {
 		if (isset($r->ws_rights)) {
 			$utilisateur->ws_rights = $r->ws_rights;
 		}
-
+		if (isset($r->ws_signatures)) {
+			$utilisateur->ws_signatures = $r->ws_signatures;
+		}
 		return $utilisateur;
 	}
 
@@ -131,8 +133,6 @@ class commonDAOUtilisateur extends commonDAO {
 		$wherec = $where;
 		$where = '(';
 		if (!is_null($this->q)) {
-
-
 			if ($this->search_id) {
 				$where .= 'utilisateur_id=\'' . $this->con->escape($this->q) . '\' OR ';
 			}
@@ -163,6 +163,7 @@ class commonDAOUtilisateur extends commonDAO {
 	public function getListe($orderby = null, $sens = null, $limit = null, $where = null, $limitedToUserRights = false)
 	{
 		$sql = $this->getQueryList('utilisateurs_entreprise', $orderby, $sens, $limit, $where, $limitedToUserRights);
+		fb($sql);
 		$r = $this->con->select($sql);
 		return $this->factory($r);
 	}
diff --git a/inc/commons/Metier/class.common.entreprise.php b/inc/commons/Metier/class.common.entreprise.php
index 1f4f220ee..d102aaf38 100644
--- a/inc/commons/Metier/class.common.entreprise.php
+++ b/inc/commons/Metier/class.common.entreprise.php
@@ -13,6 +13,7 @@ class commonEntreprise extends cubeMetier {
 	protected $adresse_facturation;
 	protected $ws_admin;
 	protected $ws_grade;
+	protected $ws_signatures;
 	// Composés
 	protected $ca;
 	protected $impaye;
diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index ec731e90b..518fcbf2d 100644
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -27,6 +27,7 @@ class commonUtilisateur extends cubeMetier {
 	protected $ws_grade;
 	protected $ws_settings;
 	protected $ws_rights;
+	protected $ws_signatures;
 
 	public function getEmail()
 	{
@@ -40,7 +41,7 @@ class commonUtilisateur extends cubeMetier {
 
 	public function getSettings($liste)
 	{
-		$cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'books' => 'book_id');
+		$cles = array('clients' => 'entreprise_id', 'equipiers' => 'utilisateur_id', 'devis' => 'devis_id', 'projets' => 'projet_id', 'factures' => 'facture_id', 'timereport' => 'projet_id', 'fichiers' => 'nom', 'publications' => 'book_id');
 		if (!isset($this->settings['search'][$liste]) || !is_array($this->settings['search'][$liste])) {
 			$this->settings['search'][$liste] = array();
 		}
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index aed223723..87655d801 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -162,6 +162,7 @@ class commonCore extends cubeCore {
 		$db->entreprises->date_creation('integer', 0, false);
 		$db->entreprises->notes('text', 0, false);
 		$db->entreprises->site('varchar', 256, false);
+		$db->entreprises->ws_signatures('text', 0, false);
 		// Clés
 		$db->entreprises->primary('pk_entreprises', 'entreprise_id');
 		$db->entreprises->index('index_entreprises_nom', 'BTREE', 'nom');
@@ -417,7 +418,7 @@ class commonCore extends cubeCore {
 		$this->views->createView('clients_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation '
 			 . 'FROM entreprises e LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id AND u.grade=0');
 		$this->views->createView('utilisateurs_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, '
-			 . 'e.ws_grade, e.ws_admin '
+			 . 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures '
 			 . 'FROM entreprises e LEFT JOIN utilisateurs u ON u.entreprise=e.entreprise_id');
 		$this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, i.impaye, '
 			 . 'SUM(f.total_ht) AS ca '
diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
index 62a1269b6..4a81a4eac 100644
--- a/inc/commons/class.common.droits.php
+++ b/inc/commons/class.common.droits.php
@@ -35,8 +35,16 @@ class commonDroits {
 	public static function recherche($page)
 	{
 		global $core;
-		$droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0, 'books' => 0);
-		return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);
+		if (MODE == 'extranet') {
+			$droits = array('projets' => 1, 'factures' => 1, 'devis' => 1, 'clients' => 1, 'timereport' => 1, 'fichiers' => 0);
+		} elseif (MODE == 'ws') {
+			$droits = array('clients' => 3, 'fichiers' => 0, 'publications' => 3);
+		}
+		if (MODE == 'extranet') {
+			return (isset($droits[$page]) && $droits[$page] <= $core->user->grade);
+		} else {
+			return (isset($droits[$page]) && $droits[$page] <= $core->user->ws_grade);
+		}
 	}
 
 	public static function telecharger($utilisateur_id)
diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 1ea161cbf..41000c8db 100644
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -75,7 +75,7 @@ class commonPage {
 			}
 		}
 
-		$supp = array('stats' => 'publication');
+		$supp = array('stats' => 'publications');
 
 		$res = '<div id="nav">';
 		foreach($onglets as $titre => $url) {
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index d8ebbce80..21cd6316a 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -123,7 +123,7 @@ class wsAjax extends cubeAjax {
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 	}
 
-	public static function searchBooks($args, &$x)
+	public static function searchPublications($args, &$x)
 	{
 		$x->addContent('listeBooks', wsUrl::listeBooks());
 	}
diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index b3c885a24..b3743c7d2 100644
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -67,11 +67,19 @@ class wsDroits {
 	{
 		global $core;
 
+		$mySignatures = explode(',', $core->user->ws_signatures);
+		$mySignatures[] = 1;
+
+		$admin = wsDroits::admin(false);
+
 		$dao = new wsDAOSignature($core->con);
 
 		$signatures = $dao->selectAll();
 		$res = array();
 		foreach($signatures as $signature) {
+			if (!$admin && !in_array($signature->signature_id, $mySignatures)) {
+				continue;
+			}
 			$res[$signature->nom] = $signature->signature_id;
 		}
 		return $res;
diff --git a/inc/ws/Controlleur/class.ws.flash.php b/inc/ws/Controlleur/class.ws.flash.php
index 0a15911d8..342f462b9 100644
--- a/inc/ws/Controlleur/class.ws.flash.php
+++ b/inc/ws/Controlleur/class.ws.flash.php
@@ -7,6 +7,12 @@ class wsFlash extends cubeFlashGateway {
 		$args = cubePage::getArgs($args);
 		$n = self::CNAME;
 		$gateway = new $n($core->con, $args);
+
+		$droits = wsDroits::getDroits();
+		$gateway->addAttribute('creation', $droits->creation?'1':'0');
+		$gateway->addAttribute('revendeur', $droits->revendeur?'1':'0');
+		$gateway->addAttribute('admin', $droits->admin?'1':'0');
+		$gateway->addAttribute('grade', $core->user->ws_grade);
 	}
 
 	public function saveConversionSettings()
@@ -547,7 +553,7 @@ class wsFlash extends cubeFlashGateway {
 		if (isset($this->args['book_id'])) {
 			$dao = new wsDAOBook($core->con);
 			$book = $dao->selectById($this->args['book_id']);
-			$book->traductions=wsLang::checkTranslations($book->traductions);
+			$book->traductions = wsLang::checkTranslations($book->traductions);
 			fb($book->traductions);
 			if ($book->traductions != array()) {
 				$bookLang = $this->xml->addChild('book_lang', json_encode($book->traductions));
@@ -584,6 +590,11 @@ class wsFlash extends cubeFlashGateway {
 		$dao->setComposition($this->args['book_id'], json_decode($this->args['pages']));
 	}
 
+	public function getTexts()
+	{
+		$this->xml->addChild('texts', json_encode($GLOBALS['__l10n']));
+	}
+
 	public function compile()
 	{
 		global $core;
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index e1e1984e6..6645a7be7 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -56,15 +56,15 @@ class wsUrl {
 		if ($droits->admin) {
 			$res .= '<th>' . commonUrl::orderby(__('Facturation'), 'facturable', $settings, 'sort' . $change) . '</th>';
 		}
-		$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';
-
-		$res .= '<th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th><th class="min"></th></tr>';
+		if ($droits->revendeur) {
+			$res .= '<th>' . commonUrl::orderby(__('Status'), 'status', $settings, 'sort' . $change) . '</th>';
+		}
+		$res .= str_repeat('<th class="min"></th>', $droits->creation?5:4);
+		$res .= '</tr>';
 		$i = 0;
 
 		$btVoir = cubeMedia::cssRollover($core->typo->Voir('voir', '', false));
-		if ($droits->creation) {
-			$btEdit = cubeMedia::cssRollover($core->typo->Editer('éditer', '', false));
-		}
+		$btEdit = cubeMedia::cssRollover($core->typo->Editer('éditer', '', false));
 		$btStats = cubeMedia::cssRollover($core->typo->Stats('stats', '', false));
 		$btDownload = cubeMedia::cssRollover($core->typo->BookTelecharger('télécharger', '', false));
 		if ($droits->creation) {
@@ -87,11 +87,11 @@ class wsUrl {
 			if ($droits->admin) {
 				$res .= '<td>' . $book->facturable . '</td>';
 			}
-			$res .= '<td>' . $core->books_status[$book->status] . '</td>';
-			$res .= '<td class="bouton"><a class="popupFS" rev="viewer_' . $book->book_id . '" href="' . SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash . '/">' . $btVoir . '</a></td>';
-			if ($droits->creation) {
-				$res .= '<td class="bouton"><a class="popupFS" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '">' . $btEdit . '</a></td>';
+			if ($droits->revendeur) {
+				$res .= '<td>' . $core->books_status[$book->status] . '</td>';
 			}
+			$res .= '<td class="bouton"><a class="popupFS" rev="viewer_' . $book->book_id . '" href="' . SITE_PATH . 'viewer/' . $book->book_id . '_' . $book->hash . '/">' . $btVoir . '</a></td>';
+			$res .= '<td class="bouton"><a class="popupFS" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '">' . $btEdit . '</a></td>';
 			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'stats/' . $book->book_id . '">' . $btStats . '</a></td>';
 			$res .= '<td class="bouton"><a href="' . SITE_PATH . 'supprimebook/' . $book->book_id . '">' . $btDownload . '</a></td>';
 			if ($droits->creation) {
@@ -534,6 +534,16 @@ html{height:100%}' . "\n";
 				$res .= '<tr class="odd"><td>' . __('Entité facturable') . '</td><td>' . $d->facturable->prenom . ' ' . $d->facturable->nom . ' (' . $d->facturable->rs . ')</td></tr>';
 				$res .= '<tr class="odd"><td>' . __('Administrateur responsable') . '</td><td>' . $d->administrateur->prenom . ' ' . $d->administrateur->nom . ' (' . $d->administrateur->rs . ')</td></tr>';
 			}
+
+			$daoSignature = new wsDAOSignature($core->con);
+			$signaturesList = $daoSignature->selectAll();
+
+			$signatures = array();
+			foreach($signaturesList as $s) {
+				$signatures[$s->nom] = $s->signature_id;
+			}
+
+			$res .= '<tr class="odd"><td>' . __('Signatures Fluidbook') . '</td><td>' . cubeForm::checkMultiple('ws_signatures', $signatures, 5, explode(',', $client->ws_signatures)) . '</td></tr>';
 		}
 		if ($entreprise_id == 'new') {
 			$daoContact = new commonDAOClient($core->con);
diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index be19a1a61..f8931c018 100644
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -43,14 +43,11 @@ class wsDAOTheme extends commonDAO {
 
 	public function getAllThemes($user, $order = '')
 	{
-		if ($user->ws_grade >= 3) {
+		if (wsDroits::admin(false)) {
 			$sql = 'SELECT * FROM themes_vue';
-		} else if ($user->ws_grade == 2) {
-			$sql = 'SELECT * FROM themes_vue WHERE theme_id IN (SELECT theme_id FROM themes_droits WHERE utilisateur_id=\'' . $user->utilisateur_id . '\')';
 		} else {
-			return array();
+			$sql = 'SELECT * FROM themes_vue WHERE theme_id IN (SELECT theme_id FROM books WHERE proprietaire IN(' . $user->ws_rights . ') OR proprietaire IN (' . $user->ws_rights . '))';
 		}
-
 		$r = $this->con->select($sql . ' ' . $order);
 		return $this->factory($r);
 	}
@@ -86,7 +83,7 @@ class wsDAOTheme extends commonDAO {
 		return $r->theme_id + 1;
 	}
 
-	public function delete($theme_id, $onlyFiles=false)
+	public function delete($theme_id, $onlyFiles = false)
 	{
 		if (is_null($theme_id) || $theme_id == '') {
 			return;