Mirrors
/
nextcloud-server
mirror of https://github.com/nextcloud/server
3
0
Fork 0
Code Releases Activity
Browse Source

Unify the output of the user commands and use DI

remotes/origin/poc-doctrine-migrations
Joas Schilling 11 years ago
parent
bb5b6e5f63
commit
eec92a16d6
6 changed files with 40 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      core/command/user/add.php
  2. 4
      core/command/user/delete.php
  3. 17
      core/command/user/lastseen.php
  4. 16
      core/command/user/report.php
  5. 9
      core/command/user/resetpassword.php
  6. 8
      core/register_command.php

2
core/command/user/add.php
View File

@ -119,7 +119,7 @@ class Add extends Command {
);
if ($user instanceof IUser) {
$output->writeln('The user "' . $user->getUID() . '" was created successfully');
$output->writeln('<info>The user "' . $user->getUID() . '" was created successfully</info>');
} else {
$output->writeln('<error>An error occurred while creating the user</error>');
return 1;

4
core/command/user/delete.php
View File

@ -54,12 +54,12 @@ class Delete extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$user = $this->userManager->get($input->getArgument('uid'));
if (is_null($user)) {
$output->writeln('User does not exist');
$output->writeln('<error>User does not exist</error>');
return;
}
if ($user->delete()) {
$output->writeln('The specified user was deleted');
$output->writeln('<info>The specified user was deleted</info>');
return;
}

17
core/command/user/lastseen.php
View File

@ -22,12 +22,24 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputArgument;
class LastSeen extends Command {
/** @var IUserManager */
protected $userManager;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
protected function configure() {
$this
->setName('user:lastseen')
@ -40,10 +52,9 @@ class LastSeen extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
$userManager = \OC::$server->getUserManager();
$user = $userManager->get($input->getArgument('uid'));
$user = $this->userManager->get($input->getArgument('uid'));
if(is_null($user)) {
$output->writeln('User does not exist');
$output->writeln('<error>User does not exist</error>');
return;
}

16
core/command/user/report.php
View File

@ -23,11 +23,23 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
class Report extends Command {
/** @var IUserManager */
protected $userManager;
/**
* @param IUserManager $userManager
*/
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
protected function configure() {
$this
->setName('user:report')
@ -35,6 +47,7 @@ class Report extends Command {
}
protected function execute(InputInterface $input, OutputInterface $output) {
/** @var \Symfony\Component\Console\Helper\TableHelper $table */
$table = $this->getHelperSet()->get('table');
$table->setHeaders(array('User Report', ''));
$userCountArray = $this->countUsers();
@ -61,8 +74,7 @@ class Report extends Command {
}
private function countUsers() {
$userManager = \OC::$server->getUserManager();
return $userManager->countUsers();
return $this->userManager->countUsers();
}
private function countUserDirectories() {

9
core/command/user/resetpassword.php
View File

@ -23,6 +23,7 @@
namespace OC\Core\Command\User;
use OCP\IUserManager;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputArgument;
@ -31,10 +32,10 @@ use Symfony\Component\Console\Output\OutputInterface;
class ResetPassword extends Command {
/** @var \OC\User\Manager */
/** @var IUserManager */
protected $userManager;
public function __construct(\OC\User\Manager $userManager) {
public function __construct(IUserManager $userManager) {
$this->userManager = $userManager;
parent::__construct();
}
@ -60,10 +61,10 @@ class ResetPassword extends Command {
protected function execute(InputInterface $input, OutputInterface $output) {
$username = $input->getArgument('user');
/** @var $user \OC\User\User */
/** @var $user \OCP\IUser */
$user = $this->userManager->get($username);
if (is_null($user)) {
$output->writeln("<error>There is no user called " . $username . "</error>");
$output->writeln('<error>User does not exist</error>');
return 1;
}

8
core/register_command.php
View File

@ -42,11 +42,11 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application->add(new OC\Core\Command\App\Enable());
$application->add(new OC\Core\Command\App\ListApps());
$application->add(new OC\Core\Command\Maintenance\Repair($repair, \OC::$server->getConfig()));
$application->add(new OC\Core\Command\User\Report());
$application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\LastSeen());
$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\User\Add(\OC::$server->getUserManager(), \OC::$server->getGroupManager()));
$application->add(new OC\Core\Command\User\Delete(\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(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
$application->add(new OC\Core\Command\Background\Cron(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Background\WebCron(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Background\Ajax(\OC::$server->getConfig()));

Write Preview
Loading…
Cancel
Save