lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: wrong user count

Browse Source
This commit is contained in:
Regis Houssin 2012-08-14 19:52:51 +02:00
parent 640f001bba
commit f1cbb10edc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/user/class/user.class.php
View File

@ -1984,10 +1984,10 @@ class User extends CommonObject
* Return number of existing users * Return number of existing users
* *
* @param string $limitTo Limit to 'active' or 'superadmin' users * @param string $limitTo Limit to 'active' or 'superadmin' users
* @param int $all Return for all entities * @param bool $all Return for all entities
* @return int Number of users * @return int Number of users
*/ */
function getNbOfUsers($limitTo='',$all=0) function getNbOfUsers($limitTo='active', $all=false)
{ {
global $conf; global $conf;
@ -1999,7 +1999,7 @@ class User extends CommonObject
} }
else else
{ {
if ($all) $sql.= " WHERE entity IS NOT NULL"; // all users except superadmin if ($all) $sql.= " WHERE entity > 0"; // all users except superadmins
else $sql.= " WHERE entity = ".$conf->entity; else $sql.= " WHERE entity = ".$conf->entity;
if ($limitTo == 'active') $sql.= " AND statut = 1"; if ($limitTo == 'active') $sql.= " AND statut = 1";
} }

4
htdocs/user/fiche.php
View File

@ -123,7 +123,7 @@ if ($action == 'confirm_enable' && $confirm == "yes" && $candisableuser)
if (!empty($conf->file->main_limit_users)) if (!empty($conf->file->main_limit_users))
{ {
$nb = $edituser->getNbOfUsers("active",1); $nb = $edituser->getNbOfUsers("active");
if ($nb >= $conf->file->main_limit_users) if ($nb >= $conf->file->main_limit_users)
{ {
$message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>'; $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';
@ -178,7 +178,7 @@ if ($action == 'add' && $canadduser)
if (! empty($conf->file->main_limit_users)) // If option to limit users is set if (! empty($conf->file->main_limit_users)) // If option to limit users is set
{ {
$nb = $edituser->getNbOfUsers("active",1); $nb = $edituser->getNbOfUsers("active");
if ($nb >= $conf->file->main_limit_users) if ($nb >= $conf->file->main_limit_users)
{ {
$message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>'; $message='<div class="error">'.$langs->trans("YourQuotaOfUsersIsReached").'</div>';