wip #5873 @1

diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 756bdddb8da841693d30e9a1640bf686addeae7d..646e7a95e49590c0a6ff1cc5b9f7351b8f150935 100644 (file)
--- 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;\r
         }\r
         $utilisateur->reset_password = $r->reset_password;\r
+        $utilisateur->fluidbooks_managed = $r->fluidbooks_managed;\r
         return $utilisateur;\r
     }\r
 \r
@@ -109,6 +110,7 @@ class commonDAOUtilisateur extends commonDAO
         $utilisateur->enabled = 1;\r
         $utilisateur->reset_password = '';\r
         $utilisateur->ws_settings = array('resolution' => 150, 'method' => 0, 'quality' => 85, 'objects' => 1800);\r
+        $utilisateur->fluidbooks_managed = '';\r
         return $utilisateur;\r
     }\r
 \r
@@ -125,7 +127,7 @@ class commonDAOUtilisateur extends commonDAO
         return $utilisateur;\r
     }\r
 \r
-    public function selectById($utilisateur_id, $table = 'e2_u')\r
+    public function selectById($utilisateur_id, $table = 'utilisateurs_entreprise')\r
     {\r
         $r = $this->con->select('SELECT * FROM `' . $table . '` WHERE utilisateur_id=\'' . $this->con->escape($utilisateur_id) . '\' LIMIT 1');\r
         return $this->singleton($r);\r
@@ -148,7 +150,7 @@ class commonDAOUtilisateur extends commonDAO
 \r
     public function selectByEmail($email)\r
     {\r
-        $r = $this->con->select('SELECT * FROM e2_u WHERE email=\'' . $this->con->escape($email) . '\'');\r
+        $r = $this->con->select('SELECT * FROM utilisateurs_entreprise WHERE email=\'' . $this->con->escape($email) . '\'');\r
         if ($r->count()) {\r
             return $this->singleton($r);\r
         }\r

diff --git a/inc/commons/Metier/class.common.utilisateur.php b/inc/commons/Metier/class.common.utilisateur.php
index 0414b835989f31e3f49e30262d7330c84557425c..6db36f78bb7d2ed97942dfb303c489c814efee69 100644 (file)
--- 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;\r
        protected $enabled;\r
        protected $reset_password;\r
+    protected $fluidbooks_managed;\r
 \r
        public function getEmail() {\r
                return trim($this->prenom . ' ' . $this->nom . '<' . $this->email . '>');\r
@@ -108,5 +109,3 @@ class commonUtilisateur extends cubeMetier {
        }\r
 \r
 }\r
-\r
-?>
\ No newline at end of file

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 68752e18b0cc459cb52af7ff44aa15d84a81a8d2..7cc84524ad7763d9f8ca66881c778f6b030f5670 100644 (file)
--- 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');\r
         $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 '\r
             . 'FROM e2_c e JOIN e2_u u ON u.entreprise=e.entreprise_id AND u.grade=0');\r
-        $this->views->createView('utilisateurs_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, '\r
+        $this->views->createView('utilisateurs_entreprise', 'SELECT u.*,e.nom AS rs, e.adresse_facturation AS adresse_facturation, e.fluidbooks_managed AS fluidbooks_managed, '\r
             . 'e.ws_grade, e.ws_admin, e.ws_signatures AS ws_signatures, e.site AS site '\r
             . 'FROM e2_c e JOIN e2_u u ON u.entreprise=e.entreprise_id');\r
         $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 '\r

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 06dc43709c2132939316467faff7cb47983db0c2..1e8c03037714b55bc199a07c97e51e35d0e91f55 100644 (file)
--- 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 '';
     }