From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 18 Jan 2011 15:05:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=e1a7cf157a469051f47bdb37a50ff94cad8f0acc;p=cubeextranet.git

---

diff --git a/importWs.php b/importWs.php
index b661fb96d..470965ba7 100644
--- a/importWs.php
+++ b/importWs.php
@@ -153,6 +153,34 @@ try {
 				$utilisateur_id++;
 			}
 		}
+
+		$lastuid = 1;
+
+		for($i = 4;$i >= 1;$i--) {
+			$c = $core->con->openCursor('entreprises');
+			$c->nom = 'Entreprise Test - Grade ' . $i;
+			$c->ws_grade = $i;
+			$c->ws_admin = $lastuid;
+			$c->entreprise_id = $entreprise_id;
+			$c->pays = 'FR';
+			$c->insert();
+
+			$c = $core->con->openCursor('utilisateurs');
+			$c->prenom = 'Utilisateur Test';
+			$c->nom = 'Grade ' . $i;
+			$c->email = 'grade' . $i . "@fluidbook.com";
+			$c->password = 'atacama';
+			$c->utilisateur_id = $utilisateur_id;
+			$c->entreprise = $entreprise_id;
+
+			$c->lang = 'fr';
+			$c->insert();
+
+			$lastuid = $utilisateur_id;
+
+			$entreprise_id++;
+			$utilisateur_id++;
+		}
 		// Mets à jour les utilisateurs reliés à l'extranet
 		$r = $core->con->select('SELECT * FROM ws.user WHERE extranet!=0');
 		while ($r->fetch()) {
@@ -188,7 +216,6 @@ try {
 		}
 		// Set cubedesigners AS admin
 		$core->con->execute('UPDATE entreprises SET ws_grade=5, ws_admin=1 WHERE entreprise_id=7');
-
 		// Some entreprises are themeselves revendeurs. It's not normal
 		$core->con->execute('UPDATE entreprises e SET ws_admin=1 WHERE ws_admin IN (SELECT utilisateur_id FROM utilisateurs u WHERE e.entreprise_id=u.entreprise)');
 	} else {
@@ -340,12 +367,18 @@ try {
 			$parametres = new wsBookParametres(new stdClass());
 			$r->signature = $signatures[$r->tid];
 			$parametres->fromRecord($r);
-			$parametres->fromXML(simplexml_load_string('<extras>' . $r->extras . '</extras>'));
+
+			$xml = @simplexml_load_string('<extras>' . $r->extras . '</extras>');
+			if ($xml !== false) {
+				$parametres->fromXML($xml);
+			} else {
+				fb('error on extras (Fluidbook # ' . $r->bid);
+			}
 			$c->parametres = serialize($parametres);
 			$c->insert();
 		}
 		// Importe les pages des fluidbooks
-		$r = $core->con->select('SELECT * FROM ws.book_pages ORDER BY bid,bpid');
+		$r = $core->con->select('SELECT bid,did FROM ws.book_pages GROUP BY did');
 		while ($r->fetch()) {
 			if (!isset($docs[$r->did])) {
 				$c = $core->con->openCursor('documents');
@@ -354,14 +387,9 @@ try {
 				$c->insert();
 				$docs[$r->did] = true;
 			}
-
-			$c = $core->con->openCursor('book_pages');
-			$c->book_id = $r->bid;
-			$c->document_id = $r->did;
-			$c->book_page = $r->bpid;
-			$c->document_page = $r->dpid;
-			$c->insert();
 		}
+
+		$core->con->execute('INSERT INTO book_pages (book_id,book_page,document_id,document_page) SELECT bid,bpid,did,dpid FROM ws.book_pages');
 	}
 
 	foreach($tables as $t) {
diff --git a/inc/commons/class.common.droits.php b/inc/commons/class.common.droits.php
index c1d440535..4c5b38459 100644
--- a/inc/commons/class.common.droits.php
+++ b/inc/commons/class.common.droits.php
@@ -21,6 +21,16 @@ class commonDroits {
 		}
 	}
 
+	public static function dashboard($error = true)
+	{
+		if (MODE == 'extranet') {
+			$grade = 1;
+		} elseif (MODE == 'ws') {
+			$grade = 5;
+		}
+		return commonDroits::min($grade, $error);
+	}
+
 	public static function recherche($page)
 	{
 		global $core;
diff --git a/inc/commons/class.common.page.php b/inc/commons/class.common.page.php
index 756998b7a..80d3401b4 100644
--- a/inc/commons/class.common.page.php
+++ b/inc/commons/class.common.page.php
@@ -78,7 +78,7 @@ class commonPage {
 		foreach($onglets as $titre => $url) {
 			// Si cet onglet correspond à la page active, on le place actif
 			$active = ($args[0] == $url)?' class="active"':'';
-			$res.='<a href="' . SITE_PATH . $url . '">'.cubeMedia::cssRollover($core->typo->Onglet($titre,'',false)).'</a>';
+			$res .= '<a href="' . SITE_PATH . $url . '">' . cubeMedia::cssRollover($core->typo->Onglet($titre, '', false)) . '</a>';
 		}
 		$res .= '</div>';
 		return $res;
@@ -107,7 +107,11 @@ class commonPage {
 				}
 			}
 			if ($hasRealFilters) {
-				$res .= '<div class="efface_filtres"><a href="#" class="ajax" id="efface_filtres" rel="' . $action . '/efface">' . __('Effacer les filtres') . '</a><br /><a href="#" class="popup" rel="formDashboard/' . $dashboard . '">' . __('Ajouter à mon tableau de bord') . '</a></div>';
+				$res .= '<div class="efface_filtres"><a href="#" class="ajax" id="efface_filtres" rel="' . $action . '/efface">' . __('Effacer les filtres') . '</a>';
+				if (commonDroits::dashboard(false)) {
+					$res .= '<br /><a href="#" class="popup" rel="formDashboard/' . $dashboard . '">' . __('Ajouter à mon tableau de bord') . '</a>';
+				}
+				$res .= '</div>';
 			}
 			$res .= '</form>';
 		}
@@ -147,16 +151,16 @@ class commonPage {
 		return $res;
 	}
 
-	public static function bf($max=false)
+	public static function bf($max = false)
 	{
 		$res = '</div></td><td class="b-e"></td>';
 		$res .= '</tr>';
 		$res .= '<tr class="b-footer">';
 		$res .= '<td class="b-sw"></td><td class="b-s">';
-		if($max){
-			$res.=cubeMedia::spacer(960,1);
+		if ($max) {
+			$res .= cubeMedia::spacer(960, 1);
 		}
-		$res.='</td><td class="b-se"></td>';
+		$res .= '</td><td class="b-se"></td>';
 		$res .= '</tr>';
 		$res .= '</table>';
 		return $res;
diff --git a/inc/commons/class.common.url.php b/inc/commons/class.common.url.php
index 625df3bcd..32377e3c5 100644
--- a/inc/commons/class.common.url.php
+++ b/inc/commons/class.common.url.php
@@ -111,7 +111,7 @@ class commonUrl {
 			$res .= '<tr><td>' . __('Numéro de mobile') . ' : </td><td>' . $utilisateur->mobile . '</td></tr>';
 			$res .= '<tr><td>' . __('Numéro de fax') . ' : </td><td>' . $utilisateur->fax . '</td></tr>';
 			$res .= '<tr><td>' . __('Numéro de TVA intracommunautaire') . ' : </td><td>' . $utilisateur->tva_intra . '</td></tr>';
-			$res .= '<tr><td colspan="2"><em>' . __('Si les informations ci-dessus sont incomplètes ou erronées, veuillez nous<br />en informer en nous écrivant à ') . '<a href="mailto:contact@cubedesigners.com">contact@cubedesigners.com</a></em></td></tr>';
+			$res .= '<tr><td colspan="2"><em>' . __('Si les informations ci-dessus sont incomplètes ou erronées, veuillez nous<br />en informer en nous écrivant à ') . '<a href="mailto:'.FROM_EMAIL.'">'.FROM_EMAIL.'</a></em></td></tr>';
 		}
 
 		return $res;
@@ -208,6 +208,8 @@ class commonUrl {
 
 	public static function dashboard($args)
 	{
+		commonDroits::dashboard();
+
 		cubePage::ui('Sortable');
 		$res = commonPage::barre();
 		$res .= commonPage::tMain('dash');
@@ -218,6 +220,7 @@ class commonUrl {
 
 	public static function listeDashboard($args)
 	{
+		commonDroits::dashboard();
 		global $core;
 		$r = $core->con->select('SELECT * FROM dashboard WHERE equipier=\'' . $core->user->utilisateur_id . '\' AND site=\'' . MODE . '\' ORDER BY sort');
 		$res = '';
@@ -231,6 +234,7 @@ class commonUrl {
 
 	public static function displayDashboard($r)
 	{
+		commonDroits::dashboard();
 		global $core;
 		$res = '<div class="caption">' . $core->typo->OngletBlanc($r->nom);
 
@@ -263,6 +267,7 @@ class commonUrl {
 
 	public static function getDashboardSettings($s)
 	{
+		commonDroits::dashboard();
 		$s = unserialize($s);
 		if (isset($s['filtres']['annee'])) {
 			$s['filtres']['annee'] = range(2006, date('Y'), 1);
@@ -272,6 +277,7 @@ class commonUrl {
 
 	public static function formDashboard($args)
 	{
+		commonDroits::dashboard();
 		global $core;
 		$rub = $args[1];
 		$dashboard_id = isset($args[2])?$args[2]:'new';
diff --git a/inc/prepend.php b/inc/prepend.php
index b5dd8f0e4..e5b976500 100644
--- a/inc/prepend.php
+++ b/inc/prepend.php
@@ -10,7 +10,7 @@ if ($ws) {
 	define('GA', 'UA-4339912-5');
 	define('TITLE', 'Fuidbook Workshop');
 
-	define('FROM_EMAIL', 'workshop@fluidbook.com');
+	define('FROM_EMAIL', 'contact@fluidbook.com');
 	define('FROM_NAME', 'Fluidbook Workshop');
 	define('EMAIL_SUBJECT', 'Fluidbook Workshop');
 	define('TEAM_EMAIL', 'team@fluidbook.com');
@@ -21,7 +21,7 @@ if ($ws) {
 	define('GA', 'UA-4339912-4');
 	define('TITLE', 'Extranet Cubedesigners');
 
-	define('FROM_EMAIL', 'extranet@cubedesigners.com');
+	define('FROM_EMAIL', 'contact@cubedesigners.com');
 	define('FROM_NAME', 'Extranet Cubedesigners');
 	define('EMAIL_SUBJECT', 'Extranet Cubedesigners');
 	define('TEAM_EMAIL', 'team@cubedesigners.com');
diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index 79246d1ef..e0e9c2075 100644
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -1,5 +1,9 @@
 <?php
 class wsDroits {
+	public static $creation = array(2, 4, 5);
+	public static $revendeur = 3;
+	public static $admin = 5;
+
 	public static function navigation()
 	{
 		global $core;
@@ -23,6 +27,42 @@ class wsDroits {
 		return $nav;
 	}
 
+	public static function getRights()
+	{
+		$res = new stdClass();
+		$res->creation = self::creation(false);
+		$res->revendeur = self::revendeur(false);
+		$res->admin = self::admin(false);
+		return $res;
+	}
+
+	public static function creation($error = false)
+	{
+		return self::gradeIn(self::$creation, $error);
+	}
+
+	public static function revendeur($error = false)
+	{
+		return commonDroits::min(self::$revendeur, $error);
+	}
+
+	public static function admin($error = false)
+	{
+		return commonDroits::min(self::$admin, $error);
+	}
+
+	protected static function gradeIn($list, $error = false)
+	{
+		global $core;
+		if (!in_array($core->user->grade, $list)) {
+			if ($error) {
+				commonDroits::error();
+			}
+			return false;
+		}
+		return true;
+	}
+
 	public static function getSignatures()
 	{
 		global $core;
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ea149617c..0fe3fb0c1 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -7,7 +7,9 @@ class wsUrl {
 		$settings = $core->user->getSettings('books');
 
 		$shortcuts = array();
-		$shortcuts[] = '<a href="#" class="popup" rel="newBookForm">' . $core->typo->Ajouter(__('Créer une nouvelle publication')) . '</a>';
+		if (wsDroits::creation()) {
+			$shortcuts[] = '<a href="#" class="popup" rel="newBookForm">' . $core->typo->Ajouter(__('Créer une nouvelle publication')) . '</a>';
+		}
 
 		$filtres = array();
 		$filtres[] = new commonFiltre(__('Status'), 'status_book', $settings['filtres']);
@@ -29,6 +31,8 @@ class wsUrl {
 		cubePage::truePopup();
 		cubePage::autocomplete();
 
+		$creation = wsDroits::creation();
+
 		commonDroits::min(1);
 		$settings = is_null($settings)?$core->user->getSettings('books'):$settings;
 		$change = is_null($dashboard)?'Books':'Dashboard/' . $dashboard;
@@ -51,10 +55,14 @@ class wsUrl {
 		$i = 0;
 
 		$btVoir = cubeMedia::cssRollover($core->typo->Voir('voir', '', false));
-		$btEdit = cubeMedia::cssRollover($core->typo->Editer('éditer', '', false));
+		if ($creation) {
+			$btEdit = cubeMedia::cssRollover($core->typo->Editer('éditer', '', false));
+		}
 		$btStats = cubeMedia::cssRollover($core->typo->Stats('stats', '', false));
 		$btDownload = cubeMedia::cssRollover($core->typo->Telecharger('télécharger', '', false));
-		$btDel = cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false));
+		if ($creation) {
+			$btDel = cubeMedia::cssRollover($core->typo->Supprimer('suppr.', '', false));
+		}
 
 		foreach($liste as $id => $book) {
 			$odd = cubeMath::isOdd($i)?' class="odd"':'';
@@ -68,10 +76,14 @@ class wsUrl {
 			$res .= '<td>' ./* $f .*/ '</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>';
-			$res .= '<td class="bouton"><a class="popupFS" rev="editor_' . $book->book_id . '" href="' . SITE_PATH . 'editor/' . $book->book_id . '">' . $btEdit . '</a></td>';
+			if ($creation) {
+				$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>';
-			$res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . $btDel . '</a></td>';
+			if ($creation) {
+				$res .= '<td class="bouton"><a href="#" rel="supprimeBook/' . $book->book_id . '" class="ajax" title="' . __('Êtes-vous certain de vouloir supprimer cette publication ?') . '">' . $btDel . '</a></td>';
+			}
 			$res .= '</tr>';
 			$i++;
 		}