diff --git a/htdocs/user/card.php b/htdocs/user/card.php index e4617a4f4e8..05e6e6f54d3 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -149,7 +149,7 @@ if (empty($reshook)) { if ($id <> $user->id) { $object = new User($db); $object->fetch($id); - $result = $object->delete(); + $result = $object->delete($user); if ($result < 0) { $langs->load("errors"); setEventMessages($langs->trans("ErrorUserCannotBeDelete"), null, 'errors'); @@ -1249,7 +1249,7 @@ else $object->getrights(); if (empty($object->nb_rights) && $object->statut != 0 && empty($object->admin)) setEventMessages($langs->trans('UserHasNoPermissions'), null, 'warnings'); } - + // Connexion ldap // pour recuperer passDoNotExpire et userChangePassNextLogon if (! empty($conf->ldap->enabled) && ! empty($object->ldap_sid)) diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php index 74e30ad3e88..3b7d7ee5b00 100644 --- a/htdocs/user/class/api_users.class.php +++ b/htdocs/user/class/api_users.class.php @@ -302,7 +302,7 @@ class Users extends DolibarrApi throw new RestException(401, 'Access not allowed for login ' . DolibarrApiAccess::$user->login); } - return $this->useraccount->delete($id); + return $this->useraccount->delete(DolibarrApiAccess::$user); } /** diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 4aaaff7ed21..217211dde4e 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1005,13 +1005,14 @@ class User extends CommonObject } /** - * Delete the user + * Delete the user * - * @return int <0 if KO, >0 if OK + * @param User $user User than delete + * @return int <0 if KO, >0 if OK */ - function delete() + function delete(User $user) { - global $user,$conf,$langs; + global $conf,$langs; $error=0; diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php index cfc6d13427c..f70f61e2ed6 100644 --- a/htdocs/user/class/usergroup.class.php +++ b/htdocs/user/class/usergroup.class.php @@ -617,13 +617,14 @@ class UserGroup extends CommonObject } /** - * Efface un groupe de la base + * Delete a group * - * @return <0 if KO, > 0 if OK + * @param User $user User that delete + * @return <0 if KO, > 0 if OK */ - function delete() + function delete(User $user) { - global $user,$conf,$langs; + global $conf,$langs; $error=0; diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 1be76e8fb4d..61c817a4c72 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -110,7 +110,7 @@ if (empty($reshook)) { if ($caneditperms) { $object->fetch($id); - $object->delete(); + $object->delete($user); header("Location: ".DOL_URL_ROOT."/user/group/list.php?restore_lastsearch_values=1"); exit; }