From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 25 Apr 2023 10:10:28 +0000 (+0000)
Subject: wip #5873 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=5bf2b7697a840f3a1cf16235d46b961476769c31;p=cubeextranet.git

wip #5873 @1
---

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 756bdddb8..646e7a95e 100644
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -80,6 +80,7 @@ class commonDAOUtilisateur extends commonDAO
             $utilisateur->tva_intra = $r->tva_intra;
         }
         $utilisateur->reset_password = $r->reset_password;
+        $utilisateur->fluidbooks_managed = $r->fluidbooks_managed;
         return $utilisateur;
     }
 
@@ -109,6 +110,7 @@ class commonDAOUtilisateur extends commonDAO
         $utilisateur->enabled = 1;
         $utilisateur->reset_password = '';
         $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);
+        $utilisateur->fluidbooks_managed = '';
         return $utilisateur;
     }
 
@@ -125,7 +127,7 @@ class commonDAOUtilisateur extends commonDAO
         return $utilisateur;
     }
 
-    public function selectById($utilisateur_id, $table = 'e2_u')
+    public function selectById($utilisateur_id, $table = 'utilisateurs_entreprise')
     {
         $r = $this->con->select('SELECT * FROM `' . $table . '` WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\' LIMIT 1');
         return $this->singleton($r);
@@ -148,7 +150,7 @@ class commonDAOUtilisateur extends commonDAO
 
     public function selectByEmail($email)
     {
-        $r = $this->con->select('SELECT * FROM e2_u WHERE email=\'' . $this->con->escape($email) . '\'');
+        $r = $this->con->select('SELECT * FROM utilisateurs_entreprise WHERE email=\'' . $this->con->escape($email) . '\'');
         if ($r->count()) {
             return $this->singleton($r);
         }
diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index 0414b8359..6db36f78b 100644
--- a/inc/commons/Metier/class.common.utilisateur.php
+++ b/inc/commons/Metier/class.common.utilisateur.php
@@ -37,6 +37,7 @@ class commonUtilisateur extends cubeMetier {
 	protected $ca;
 	protected $enabled;
 	protected $reset_password;
+    protected $fluidbooks_managed;
 
 	public function getEmail() {
 		return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');
@@ -108,5 +109,3 @@ class commonUtilisateur extends cubeMetier {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 68752e18b..7cc84524a 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -573,7 +573,7 @@ LEFT JOIN ws_entreprises_tree wet ON wet.entreprise_id=r.entreprise_id
 LEFT JOIN e2_u a ON ri.administrateur_id=a.utilisateur_id');
         $this->views->createView('clients_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site, e.type AS type, e.impaye AS impaye, e.ca AS ca '
             . 'FROM e2_c e JOIN e2_u 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, '
+        $this->views->createView('utilisateurs_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.fluidbooks_managed AS fluidbooks_managed, '
             . 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures, e.site AS site '
             . 'FROM e2_c e JOIN e2_u u ON u.entreprise=e.entreprise_id');
         $this->views->createView('clients', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.site AS site, e.tva_intra AS tva_intra, e.impaye AS impaye, e.ca AS ca '
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 06dc43709..1e8c03037 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -559,7 +559,12 @@ class wsDAOBook extends commonDAO
             if (wsDroits::admin()) {
                 return '';
             }
-            return ' AND proprietaire IN (' . $utilisateur->ws_rights . ')';
+            $res = ' AND proprietaire IN (' . $utilisateur->ws_rights . ') ';
+            if ($utilisateur->fluidbooks_managed) {
+                $range = cubeArray::parseRange($utilisateur->fluidbooks_managed);
+                $res .= ' AND book_id IN (' . implode(',', $range) . ')';
+            }
+            return $res;
         }
         return '';
     }