Merge pull request #22301 from nextcloud/backport/22299/stable18

[stable18] Show disabled user count in occ user:report
This commit is contained in:
Morris Jobke 2020-08-19 20:38:05 +02:00 committed by GitHub
commit 8a8ce8eb7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions

View file

@ -26,6 +26,7 @@
namespace OC\Core\Command\User;
use OCP\IConfig;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Table;
@ -35,12 +36,15 @@ use Symfony\Component\Console\Output\OutputInterface;
class Report extends Command {
/** @var IUserManager */
protected $userManager;
/** @var IConfig */
private $config;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
public function __construct(IUserManager $userManager, IConfig $config) {
$this->userManager = $userManager;
$this->config = $config;
parent::__construct();
}
@ -72,6 +76,10 @@ class Report extends Command {
$rows[] = array(' ');
$rows[] = array('user directories', $userDirectoryCount);
$disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
$disabledUsersCount = count($disabledUsers);
$rows[] = ['disabled users', $disabledUsersCount];
$table->setRows($rows);
$table->render();
}

View file

@ -159,7 +159,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\User\Disable(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Enable(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\LastSeen(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Report(\OC::$server->getUserManager()));
$application->add(\OC::$server->query(\OC\Core\Command\User\Report::class));
$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Setting(\OC::$server->getUserManager(), \OC::$server->getConfig(), \OC::$server->getDatabaseConnection()));
$application->add(new OC\Core\Command\User\ListCommand(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));