inject IDateTimeFormatter to show-remnants command

This commit is contained in:
Arthur Schiwon 2015-01-06 23:40:00 +01:00
parent 40ecd30fba
commit 64f0b055e6
2 changed files with 11 additions and 4 deletions

View File

@ -31,7 +31,9 @@ $application->add(new OCA\user_ldap\Command\TestConfig());
$application->add(new OCA\user_ldap\Command\CreateEmptyConfig());
$application->add(new OCA\user_ldap\Command\DeleteConfig());
$application->add(new OCA\user_ldap\Command\Search($ocConfig));
$application->add(new OCA\user_ldap\Command\ShowRemnants($deletedUsersIndex));
$application->add(new OCA\user_ldap\Command\ShowRemnants(
$deletedUsersIndex, \OC::$server->getDateTimeFormatter())
);
$application->add(new OCA\user_ldap\Command\CheckUser(
$uBackend, $helper, $deletedUsersIndex, $userMapping)
);

View File

@ -17,16 +17,21 @@ use Symfony\Component\Console\Output\OutputInterface;
use OCA\user_ldap\lib\user\DeletedUsersIndex;
use OCA\User_LDAP\lib\Connection;
use OCA\User_LDAP\Mapping\UserMapping;
use OCP\IDateTimeFormatter;
class ShowRemnants extends Command {
/** @var use OCA\User_LDAP\lib\User\DeletedUsersIndex; */
/** @var OCA\User_LDAP\lib\User\DeletedUsersIndex */
protected $dui;
/** @var OCP\IDateTimeFormatter */
protected $dateFormatter;
/**
* @param OCA\user_ldap\lib\user\DeletedUsersIndex $dui
*/
public function __construct(DeletedUsersIndex $dui) {
public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
$this->dui = $dui;
$this->dateFormatter = $dateFormatter;
parent::__construct();
}
@ -53,7 +58,7 @@ class ShowRemnants extends Command {
foreach($resultSet as $user) {
$hAS = $user->getHasActiveShares() ? 'Y' : 'N';
$lastLogin = ($user->getLastLogin() > 0) ?
\OCP\Util::formatDate($user->getLastLogin()) : '-';
$this->dateFormatter->formatDate($user->getLastLogin()) : '-';
$rows[] = array(
$user->getOCName(),
$user->getDisplayName(),