|
@@ -1648,85 +1648,90 @@ else
|
|
|
|
|
|
print '<div class="tabsAction">';
|
|
|
|
|
|
- if (! empty($object->email))
|
|
|
- {
|
|
|
- $langs->load("mails");
|
|
|
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- $langs->load("mails");
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
|
|
|
- }
|
|
|
-
|
|
|
- if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
+ $parameters=array();
|
|
|
+ $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
|
|
|
+ if (empty($reshook))
|
|
|
{
|
|
|
- if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
|
|
|
+ if (! empty($object->email))
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
|
|
|
+ $langs->load("mails");
|
|
|
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#presend">'.$langs->trans('SendMail').'</a></div>';
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a></div>';
|
|
|
+ $langs->load("mails");
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
|
|
|
}
|
|
|
- }
|
|
|
- elseif ($caneditpassword && ! $object->ldap_sid &&
|
|
|
- (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
- {
|
|
|
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans("EditPassword").'</a></div>';
|
|
|
- }
|
|
|
|
|
|
- // Si on a un gestionnaire de generation de mot de passe actif
|
|
|
- if ($conf->global->USER_PASSWORD_GENERATED != 'none')
|
|
|
- {
|
|
|
- if ($object->statut == 0)
|
|
|
+ if ($caneditfield && (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
|
|
|
+ if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a></div>';
|
|
|
+ }
|
|
|
}
|
|
|
- elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
|
|
|
- ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
+ elseif ($caneditpassword && ! $object->ldap_sid &&
|
|
|
+ (empty($conf->multicompany->enabled) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=password">'.$langs->trans("ReinitPassword").'</a></div>';
|
|
|
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans("EditPassword").'</a></div>';
|
|
|
}
|
|
|
|
|
|
- if ($object->statut == 0)
|
|
|
+ // Si on a un gestionnaire de generation de mot de passe actif
|
|
|
+ if ($conf->global->USER_PASSWORD_GENERATED != 'none')
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
+ if ($object->statut == 0)
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
|
|
|
+ }
|
|
|
+ elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
|
|
|
+ ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=password">'.$langs->trans("ReinitPassword").'</a></div>';
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($object->statut == 0)
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
+ }
|
|
|
+ else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
|
|
|
+ ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
+ {
|
|
|
+ if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
+ else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
+ }
|
|
|
}
|
|
|
- else if (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
|
|
|
+
|
|
|
+ // Activer
|
|
|
+ if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
|
|
|
((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
{
|
|
|
- if ($object->email) print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
|
|
|
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a></div>';
|
|
|
}
|
|
|
- }
|
|
|
-
|
|
|
- // Activer
|
|
|
- if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
|
|
|
- ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
- {
|
|
|
- print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a></div>';
|
|
|
- }
|
|
|
- // Desactiver
|
|
|
- if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
|
|
|
- ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
- {
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
|
|
|
- }
|
|
|
- // Delete
|
|
|
- if ($user->id <> $id && $candisableuser &&
|
|
|
- ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
- {
|
|
|
- if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
|
|
|
+ // Desactiver
|
|
|
+ if ($user->id <> $id && $candisableuser && $object->statut == 1 &&
|
|
|
+ ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a></div>';
|
|
|
}
|
|
|
- else
|
|
|
+ // Delete
|
|
|
+ if ($user->id <> $id && $candisableuser &&
|
|
|
+ ((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || ! $user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1)))
|
|
|
{
|
|
|
- print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
|
|
|
+ if ($user->admin || ! $object->admin) // If user edited is admin, delete is possible on for an admin
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
print "</div>\n";
|
|
|
|
|
|
|