Skip to content
Snippets Groups Projects
Commit 062635bc authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Qual: Suppression d'ancien code devenu inutile

parent 64647b3b
No related branches found
No related tags found
No related merge requests found
...@@ -55,6 +55,7 @@ class User ...@@ -55,6 +55,7 @@ class User
var $admin; var $admin;
var $login; var $login;
var $pass; var $pass;
var $lang;
var $datec; var $datec;
var $datem; var $datem;
var $societe_id; var $societe_id;
...@@ -94,7 +95,6 @@ class User ...@@ -94,7 +95,6 @@ class User
function fetch($login='') function fetch($login='')
{ {
$sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note, u.fk_societe, u.fk_socpeople"; $sql = "SELECT u.rowid, u.name, u.firstname, u.email, u.code, u.admin, u.login, u.pass, u.webcal_login, u.note, u.fk_societe, u.fk_socpeople";
$sql .= ", ".$this->db->pdate("u.datec")." as datec, ".$this->db->pdate("u.tms")." as datem"; $sql .= ", ".$this->db->pdate("u.datec")." as datec, ".$this->db->pdate("u.tms")." as datem";
$sql .= " FROM ".MAIN_DB_PREFIX."user as u"; $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
...@@ -126,6 +126,7 @@ class User ...@@ -126,6 +126,7 @@ class User
$this->admin = $obj->admin; $this->admin = $obj->admin;
$this->contact_id = $obj->fk_socpeople; $this->contact_id = $obj->fk_socpeople;
$this->note = stripslashes($obj->note); $this->note = stripslashes($obj->note);
$this->lang = 'fr_FR'; // \todo Grer la langue par dfaut d'un utilisateur Dolibarr
$this->datec = $obj->datec; $this->datec = $obj->datec;
$this->datem = $obj->datem; $this->datem = $obj->datem;
...@@ -209,10 +210,6 @@ class User ...@@ -209,10 +210,6 @@ class User
// Ajout des droits induits // Ajout des droits induits
if ($subperms) $whereforadd.=" OR (module='$module' AND perms='$perms' AND subperms='lire')"; if ($subperms) $whereforadd.=" OR (module='$module' AND perms='$perms' AND subperms='lire')";
if ($perms) $whereforadd.=" OR (module='$module' AND perms='lire' AND subperms IS NULL)"; if ($perms) $whereforadd.=" OR (module='$module' AND perms='lire' AND subperms IS NULL)";
// Pour compatibilit, si lowid = 0, on est en mode ajout de tout
// \todo A virer quand sera gr par l'appelant
if (substr($rid,-1,1) == 0) $whereforadd="module='$module'";
} }
else { else {
// Where pour la liste des droits ajouter // Where pour la liste des droits ajouter
...@@ -306,10 +303,6 @@ class User ...@@ -306,10 +303,6 @@ class User
// Suppression des droits induits // Suppression des droits induits
if ($subperms=='lire') $wherefordel.=" OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)"; if ($subperms=='lire') $wherefordel.=" OR (module='$module' AND perms='$perms' AND subperms IS NOT NULL)";
if ($perms=='lire') $wherefordel.=" OR (module='$module')"; if ($perms=='lire') $wherefordel.=" OR (module='$module')";
// Pour compatibilit, si lowid = 0, on est en mode suppression de tout
// \todo A virer quand sera gr par l'appelant
if (substr($rid,-1,1) == 0) $wherefordel="module='$module'";
} }
else { else {
// Where pour la liste des droits supprimer // Where pour la liste des droits supprimer
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment