Peter M. Groen / knowledgetree

Commit b2b6f9f844e46b2f0a2a147b07603ffe1e601e1d

Authored by Brad Shuttleworth
1 parent 98bbb71e

don't assume the number of licenses. This now handled by getNumberEnabled etc. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5959 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 48 additions and 49 deletions
plugins/ktcore/admin/userManagement.php
  View file @b2b6f9f
... ... @@ -363,17 +363,18 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
363 363  
364 364  
365 365 function json_getGroups() {
366   - $sFilter = KTUtil::arrayGet($_REQUEST, 'filter', false);
367   - $aGroupList = array('off'=>'-- Please filter --');
368   -
369   - if($sFilter && trim($sFilter)) {
370   - $aGroups = Group::getList(sprintf('name like "%%%s%%"', $sFilter));
371   - $aGroupList = array();
372   - foreach($aGroups as $oGroup) {
373   - $aGroupList[$oGroup->getId()] = $oGroup->getName();
374   - }
375   - }
376   - return $aGroupList;
  366 + $sFilter = KTUtil::arrayGet($_REQUEST, 'filter', false);
  367 + $aGroupList = array('off'=>'-- Please filter --');
  368 +
  369 + if($sFilter && trim($sFilter)) {
  370 + $aGroups = Group::getList(sprintf('name like "%%%s%%"', $sFilter));
  371 + $aGroupList = array();
  372 + foreach($aGroups as $oGroup) {
  373 + $aGroupList[$oGroup->getId()] = $oGroup->getName();
  374 + }
  375 + }
  376 +
  377 + return $aGroupList;
377 378 }
378 379  
379 380  
... ... @@ -630,49 +631,47 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
630 631  
631 632  
632 633  
633   - // change enabled / disabled status of users
634   - function do_change_enabled() {
635   - $this->startTransaction();
636   -
637   - $iLicenses = 0;
638   - if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
639   - require_once(KT_DIR . '/plugins/wintools/baobabkeyutil.inc.php');
640   - $iLicenses = BaobabKeyUtil::getLicenseCount();
641   - }
642   -
643   - // "-2" to account for admin/anonymous
644   - $iEnabledUsers = User::getNumberEnabledUsers() - 2;
  634 + // change enabled / disabled status of users
  635 + function do_change_enabled() {
  636 + $this->startTransaction();
  637 + $iLicenses = 0;
  638 + if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
  639 + require_once(KT_DIR . '/plugins/wintools/baobabkeyutil.inc.php');
  640 + $iLicenses = BaobabKeyUtil::getLicenseCount();
  641 + }
  642 + // admin and anonymous are automatically ignored here.
  643 + $iEnabledUsers = User::getNumberEnabledUsers();
  644 +
  645 + foreach(KTUtil::arrayGet($_REQUEST, 'disable_user', array()) as $sUserId => $v) {
  646 + $oUser = User::get((int)$sUserId);
  647 + if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }
  648 + $oUser->setDisabled(True);
  649 + $res = $oUser->update();
  650 + if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
  651 + $iEnabledUsers--;
  652 + }
645 653  
646   - foreach(KTUtil::arrayGet($_REQUEST, 'disable_user', array()) as $sUserId => $v) {
647   - $oUser = User::get((int)$sUserId);
648   - if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }
649   - $oUser->setDisabled(True);
650   - $res = $oUser->update();
651   - if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
652   - $iEnabledUsers--;
  654 + foreach(KTUtil::arrayGet($_REQUEST, 'enable_user', array()) as $sUserId => $v) {
  655 + // check that we haven't hit max user limit
  656 + if($iLicenses !== 0 && $iEnabledUsers >= $iLicenses) {
  657 + // if so, add to error messages, but commit transaction (break this loop)
  658 + $_SESSION['KTErrorMessage'][] = _kt('You may only have ') . $iLicenses . _kt(' users enabled at one time.');
  659 + break;
653 660 }
654 661  
655   - foreach(KTUtil::arrayGet($_REQUEST, 'enable_user', array()) as $sUserId => $v) {
656   - // check that we haven't hit max user limit
657   - if($iLicenses !== 0 && $iEnabledUsers >= $iLicenses) {
658   - // if so, add to error messages, but commit transaction (break this loop)
659   - $_SESSION['KTErrorMessage'][] = _kt('You may only have ') . $iLicenses . _kt(' users enabled at one time.');
660   - break;
661   - }
662   -
663   - // else enable user
664   - $oUser = User::get((int)$sUserId);
665   - if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }
666   - $oUser->setDisabled(False);
667   - $res = $oUser->update();
668   - if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
669   - $iEnabledUsers++;
670   - }
  662 + // else enable user
  663 + $oUser = User::get((int)$sUserId);
  664 + if(PEAR::isError($oUser)) { $this->errorRedirectToMain(_kt('Error getting user object')); }
  665 + $oUser->setDisabled(False);
  666 + $res = $oUser->update();
  667 + if(PEAR::isError($res)) { $this->errorRedirectToMain(_kt('Error updating user')); }
  668 + $iEnabledUsers++;
  669 + }
671 670  
672   - $this->commitTransaction();
673   - $this->successRedirectToMain(_kt('Users updated'));
  671 + $this->commitTransaction();
  672 + $this->successRedirectToMain(_kt('Users updated'));
674 673  
675   - }
  674 + }
676 675  
677 676 }
678 677  
... ...