From 30b4679522318b6188ad1edae97817787af3c2bd Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 7 Jun 2010 06:00:25 +0000 Subject: [PATCH] Add possibility to limit active users --- htdocs/langs/en_US/users.lang | 2 +- htdocs/langs/fr_FR/users.lang | 2 +- htdocs/user/fiche.php | 22 ++++++++++++++++++---- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index d9faa4b5a1a..50f0bd01d77 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -108,4 +108,4 @@ ConfirmCreateThirdParty=Are you sure you want to create a third party for this m LoginToCreate=Login to create NameToCreate=Name of third party to create YourRole=Your roles -YourQuotaOfUsersIsReached=Your quota of users is reached ! \ No newline at end of file +YourQuotaOfUsersIsReached=Your quota of active users is reached ! \ No newline at end of file diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang index 0eed4607c43..c4ed6fa572e 100755 --- a/htdocs/langs/fr_FR/users.lang +++ b/htdocs/langs/fr_FR/users.lang @@ -108,4 +108,4 @@ ConfirmCreateThirdParty=Êtes-vous sûr de vouloir créer un tiers pour cet adh LoginToCreate=Login à créer NameToCreate=Nom du tiers à créer YourRole=Vos rôles -YourQuotaOfUsersIsReached=Votre quota d'utilisateurs est atteint ! \ No newline at end of file +YourQuotaOfUsersIsReached=Votre quota d'utilisateurs actifs est atteint ! \ No newline at end of file diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 1cf79b24cc1..5f0427463cd 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -110,11 +110,26 @@ if ($_REQUEST["action"] == 'confirm_enable' && $_REQUEST["confirm"] == "yes") { if ($_GET["id"] <> $user->id) { + $message=''; + $edituser = new User($db); $edituser->fetch($_GET["id"]); - $edituser->setstatus(1); - Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$_GET["id"]); - exit; + + if (!empty($conf->file->main_limit_users)) + { + $nb = $edituser->getNbOfUsers(1); + if ($nb >= $conf->file->main_limit_users) + { + $message='
'.$langs->trans("YourQuotaOfUsersIsReached").'
'; + } + } + + if (! $message) + { + $edituser->setstatus(1); + Header("Location: ".DOL_URL_ROOT.'/user/fiche.php?id='.$_GET["id"]); + exit; + } } } @@ -816,7 +831,6 @@ else $title = $langs->trans("User"); dol_fiche_head($head, 'user', $title, 0, 'user'); - /* * Confirmation reinitialisation mot de passe */