Show disabled user count in occ user:report

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/core/Command/User/Report.php b/core/Command/User/Report.php
index b7fecee61bb9705e1707abf069d819a80fc4114e..66bc9bd3de1f009dd65b8707e1d19ae79ff30cfa 100644 (file)
--- a/core/Command/User/Report.php
+++ b/core/Command/User/Report.php
@@ -27,6 +27,7 @@
 
 namespace OC\Core\Command\User;
 
+use OCP\IConfig;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
@@ -36,12 +37,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();
        }
 
@@ -73,6 +77,10 @@ class Report extends Command {
                $rows[] = [' '];
                $rows[] = ['user directories', $userDirectoryCount];
 
+               $disabledUsers = $this->config->getUsersForUserValue('core', 'enabled', 'false');
+               $disabledUsersCount = count($disabledUsers);
+               $rows[] = ['disabled users', $disabledUsersCount];
+
                $table->setRows($rows);
                $table->render();
                return 0;

diff --git a/core/register_command.php b/core/register_command.php
index 412e8ba8678dc0234d59fc3877b1f626c6613b44..c2a3f76b6c32f412efb380b576f522362dbcdf4e 100644 (file)
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -162,7 +162,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->get(\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()));