nextcloud / server

apps/encryption/lib/Command/EnableMasterKey.php

Indentation +42 added lines, -42 removed lines

@@ -33,52 +33,52 @@
 
 class EnableMasterKey extends Command {
 
-	/** @var Util */
-	protected $util;
+    /** @var Util */
+    protected $util;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var  QuestionHelper */
-	protected $questionHelper;
+    /** @var  QuestionHelper */
+    protected $questionHelper;
 
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								QuestionHelper $questionHelper) {
-		$this->util = $util;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-		parent::__construct();
-	}
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                QuestionHelper $questionHelper) {
+        $this->util = $util;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:enable-master-key')
-			->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:enable-master-key')
+            ->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isAlreadyEnabled = $this->util->isMasterKeyEnabled();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isAlreadyEnabled = $this->util->isMasterKeyEnabled();
 
-		if ($isAlreadyEnabled) {
-			$output->writeln('Master key already enabled');
-		} else {
-			$question = new ConfirmationQuestion(
-				'Warning: Only available for fresh installations with no existing encrypted data! '
-			. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->config->setAppValue('encryption', 'useMasterKey', '1');
-				$output->writeln('Master key successfully enabled.');
-			} else {
-				$output->writeln('aborted.');
-				return 1;
-			}
-		}
-		return 0;
-	}
+        if ($isAlreadyEnabled) {
+            $output->writeln('Master key already enabled');
+        } else {
+            $question = new ConfirmationQuestion(
+                'Warning: Only available for fresh installations with no existing encrypted data! '
+            . 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->config->setAppValue('encryption', 'useMasterKey', '1');
+                $output->writeln('Master key successfully enabled.');
+            } else {
+                $output->writeln('aborted.');
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

apps/encryption/lib/Command/DisableMasterKey.php

Indentation +45 added lines, -45 removed lines

@@ -34,55 +34,55 @@
 
 class DisableMasterKey extends Command {
 
-	/** @var Util */
-	protected $util;
+    /** @var Util */
+    protected $util;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/** @var  QuestionHelper */
-	protected $questionHelper;
+    /** @var  QuestionHelper */
+    protected $questionHelper;
 
-	/**
-	 * @param Util $util
-	 * @param IConfig $config
-	 * @param QuestionHelper $questionHelper
-	 */
-	public function __construct(Util $util,
-								IConfig $config,
-								QuestionHelper $questionHelper) {
-		$this->util = $util;
-		$this->config = $config;
-		$this->questionHelper = $questionHelper;
-		parent::__construct();
-	}
+    /**
+     * @param Util $util
+     * @param IConfig $config
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(Util $util,
+                                IConfig $config,
+                                QuestionHelper $questionHelper) {
+        $this->util = $util;
+        $this->config = $config;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('encryption:disable-master-key')
-			->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
-	}
+    protected function configure() {
+        $this
+            ->setName('encryption:disable-master-key')
+            ->setDescription('Disable the master key and use per-user keys instead. Only available for fresh installations with no existing encrypted data! There is no way to enable it again.');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isMasterKeyEnabled = $this->util->isMasterKeyEnabled();
 
-		if (!$isMasterKeyEnabled) {
-			$output->writeln('Master key already disabled');
-		} else {
-			$question = new ConfirmationQuestion(
-				'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
-				. 'There is no way to enable the master key again. '
-				. 'We strongly recommend to keep the master key, it provides significant performance improvements '
-				. 'and is easier to handle for both, users and administrators. '
-				. 'Do you really want to switch to per-user keys? (y/n) ', false);
-			if ($this->questionHelper->ask($input, $output, $question)) {
-				$this->config->setAppValue('encryption', 'useMasterKey', '0');
-				$output->writeln('Master key successfully disabled.');
-			} else {
-				$output->writeln('aborted.');
-				return 1;
-			}
-		}
-		return 0;
-	}
+        if (!$isMasterKeyEnabled) {
+            $output->writeln('Master key already disabled');
+        } else {
+            $question = new ConfirmationQuestion(
+                'Warning: Only perform this operation for a fresh installations with no existing encrypted data! '
+                . 'There is no way to enable the master key again. '
+                . 'We strongly recommend to keep the master key, it provides significant performance improvements '
+                . 'and is easier to handle for both, users and administrators. '
+                . 'Do you really want to switch to per-user keys? (y/n) ', false);
+            if ($this->questionHelper->ask($input, $output, $question)) {
+                $this->config->setAppValue('encryption', 'useMasterKey', '0');
+                $output->writeln('Master key successfully disabled.');
+            } else {
+                $output->writeln('aborted.');
+                return 1;
+            }
+        }
+        return 0;
+    }
 }

apps/dav/lib/Command/SyncSystemAddressBook.php

Indentation +29 added lines, -29 removed lines

@@ -32,37 +32,37 @@
 
 class SyncSystemAddressBook extends Command {
 
-	/** @var SyncService */
-	private $syncService;
+    /** @var SyncService */
+    private $syncService;
 
-	/**
-	 * @param SyncService $syncService
-	 */
-	public function __construct(SyncService $syncService) {
-		parent::__construct();
-		$this->syncService = $syncService;
-	}
+    /**
+     * @param SyncService $syncService
+     */
+    public function __construct(SyncService $syncService) {
+        parent::__construct();
+        $this->syncService = $syncService;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:sync-system-addressbook')
-			->setDescription('Synchronizes users to the system addressbook');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:sync-system-addressbook')
+            ->setDescription('Synchronizes users to the system addressbook');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$output->writeln('Syncing users ...');
-		$progress = new ProgressBar($output);
-		$progress->start();
-		$this->syncService->syncInstance(function () use ($progress) {
-			$progress->advance();
-		});
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $output->writeln('Syncing users ...');
+        $progress = new ProgressBar($output);
+        $progress->start();
+        $this->syncService->syncInstance(function () use ($progress) {
+            $progress->advance();
+        });
 
-		$progress->finish();
-		$output->writeln('');
-		return 0;
-	}
+        $progress->finish();
+        $output->writeln('');
+        return 0;
+    }
 }

apps/dav/lib/Command/RemoveInvalidShares.php

Indentation +39 added lines, -39 removed lines

@@ -38,50 +38,50 @@
  */
 class RemoveInvalidShares extends Command {
 
-	/** @var IDBConnection */
-	private $connection;
-	/** @var Principal */
-	private $principalBackend;
+    /** @var IDBConnection */
+    private $connection;
+    /** @var Principal */
+    private $principalBackend;
 
-	public function __construct(IDBConnection $connection,
-								Principal $principalBackend) {
-		parent::__construct();
+    public function __construct(IDBConnection $connection,
+                                Principal $principalBackend) {
+        parent::__construct();
 
-		$this->connection = $connection;
-		$this->principalBackend = $principalBackend;
-	}
+        $this->connection = $connection;
+        $this->principalBackend = $principalBackend;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:remove-invalid-shares')
-			->setDescription('Remove invalid dav shares');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:remove-invalid-shares')
+            ->setDescription('Remove invalid dav shares');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$query = $this->connection->getQueryBuilder();
-		$result = $query->selectDistinct('principaluri')
-			->from('dav_shares')
-			->execute();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $query = $this->connection->getQueryBuilder();
+        $result = $query->selectDistinct('principaluri')
+            ->from('dav_shares')
+            ->execute();
 
-		while ($row = $result->fetch()) {
-			$principaluri = $row['principaluri'];
-			$p = $this->principalBackend->getPrincipalByPath($principaluri);
-			if ($p === null) {
-				$this->deleteSharesForPrincipal($principaluri);
-			}
-		}
+        while ($row = $result->fetch()) {
+            $principaluri = $row['principaluri'];
+            $p = $this->principalBackend->getPrincipalByPath($principaluri);
+            if ($p === null) {
+                $this->deleteSharesForPrincipal($principaluri);
+            }
+        }
 
-		$result->closeCursor();
-		return 0;
-	}
+        $result->closeCursor();
+        return 0;
+    }
 
-	/**
-	 * @param string $principaluri
-	 */
-	private function deleteSharesForPrincipal($principaluri) {
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('dav_shares')
-			->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
-		$delete->execute();
-	}
+    /**
+     * @param string $principaluri
+     */
+    private function deleteSharesForPrincipal($principaluri) {
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('dav_shares')
+            ->where($delete->expr()->eq('principaluri', $delete->createNamedParameter($principaluri)));
+        $delete->execute();
+    }
 }

apps/dav/lib/Command/SendEventReminders.php

Indentation +40 added lines, -40 removed lines

@@ -37,50 +37,50 @@
  */
 class SendEventReminders extends Command {
 
-	/** @var ReminderService */
-	protected $reminderService;
+    /** @var ReminderService */
+    protected $reminderService;
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	/**
-	 * @param ReminderService $reminderService
-	 * @param IConfig $config
-	 */
-	public function __construct(ReminderService $reminderService,
-								IConfig $config) {
-		parent::__construct();
-		$this->reminderService = $reminderService;
-		$this->config = $config;
-	}
+    /**
+     * @param ReminderService $reminderService
+     * @param IConfig $config
+     */
+    public function __construct(ReminderService $reminderService,
+                                IConfig $config) {
+        parent::__construct();
+        $this->reminderService = $reminderService;
+        $this->config = $config;
+    }
 
-	/**
-	 * @inheritDoc
-	 */
-	protected function configure():void {
-		$this
-			->setName('dav:send-event-reminders')
-			->setDescription('Sends event reminders');
-	}
+    /**
+     * @inheritDoc
+     */
+    protected function configure():void {
+        $this
+            ->setName('dav:send-event-reminders')
+            ->setDescription('Sends event reminders');
+    }
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
-			$output->writeln('<error>Sending event reminders disabled!</error>');
-			$output->writeln('<info>Please run "php occ config:app:set dav sendEventReminders --value yes"');
-			return 1;
-		}
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        if ($this->config->getAppValue('dav', 'sendEventReminders', 'yes') !== 'yes') {
+            $output->writeln('<error>Sending event reminders disabled!</error>');
+            $output->writeln('<info>Please run "php occ config:app:set dav sendEventReminders --value yes"');
+            return 1;
+        }
 
-		if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'occ') {
-			$output->writeln('<error>Sending event reminders mode set to background-job!</error>');
-			$output->writeln('<info>Please run "php occ config:app:set dav sendEventRemindersMode --value occ"');
-			return 1;
-		}
+        if ($this->config->getAppValue('dav', 'sendEventRemindersMode', 'backgroundjob') !== 'occ') {
+            $output->writeln('<error>Sending event reminders mode set to background-job!</error>');
+            $output->writeln('<info>Please run "php occ config:app:set dav sendEventRemindersMode --value occ"');
+            return 1;
+        }
 
-		$this->reminderService->processReminders();
-		return 0;
-	}
+        $this->reminderService->processReminders();
+        return 0;
+    }
 }

apps/dav/lib/Command/ListCalendars.php

Indentation +56 added lines, -56 removed lines

@@ -37,70 +37,70 @@
 
 class ListCalendars extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
+    /** @var IUserManager */
+    protected $userManager;
 
-	/** @var CalDavBackend */
-	private $caldav;
+    /** @var CalDavBackend */
+    private $caldav;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param CalDavBackend $caldav
-	 */
-	public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->caldav = $caldav;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param CalDavBackend $caldav
+     */
+    public function __construct(IUserManager $userManager, CalDavBackend $caldav) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->caldav = $caldav;
+    }
 
-	protected function configure() {
-		$this
-			->setName('dav:list-calendars')
-			->setDescription('List all calendars of a user')
-			->addArgument('uid',
-				InputArgument::REQUIRED,
-				'User for whom all calendars will be listed');
-	}
+    protected function configure() {
+        $this
+            ->setName('dav:list-calendars')
+            ->setDescription('List all calendars of a user')
+            ->addArgument('uid',
+                InputArgument::REQUIRED,
+                'User for whom all calendars will be listed');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('uid');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> is unknown.");
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('uid');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> is unknown.");
+        }
 
-		$calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
+        $calendars = $this->caldav->getCalendarsForUser("principals/users/$user");
 
-		$calendarTableData = [];
-		foreach ($calendars as $calendar) {
-			// skip birthday calendar
-			if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
-				continue;
-			}
+        $calendarTableData = [];
+        foreach ($calendars as $calendar) {
+            // skip birthday calendar
+            if ($calendar['uri'] === BirthdayService::BIRTHDAY_CALENDAR_URI) {
+                continue;
+            }
 
-			$readOnly = false;
-			$readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
-			if (isset($calendar[$readOnlyIndex])) {
-				$readOnly = $calendar[$readOnlyIndex];
-			}
+            $readOnly = false;
+            $readOnlyIndex = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
+            if (isset($calendar[$readOnlyIndex])) {
+                $readOnly = $calendar[$readOnlyIndex];
+            }
 
-			$calendarTableData[] = [
-				$calendar['uri'],
-				$calendar['{DAV:}displayname'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
-				$calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
-				$readOnly ? ' x ' : ' ✓ ',
-			];
-		}
+            $calendarTableData[] = [
+                $calendar['uri'],
+                $calendar['{DAV:}displayname'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal'],
+                $calendar['{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname'],
+                $readOnly ? ' x ' : ' ✓ ',
+            ];
+        }
 
-		if (count($calendarTableData) > 0) {
-			$table = new Table($output);
-			$table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
-				->setRows($calendarTableData);
+        if (count($calendarTableData) > 0) {
+            $table = new Table($output);
+            $table->setHeaders(['uri', 'displayname', 'owner\'s userid', 'owner\'s displayname', 'writable'])
+                ->setRows($calendarTableData);
 
-			$table->render();
-		} else {
-			$output->writeln("<info>User <$user> has no calendars</info>");
-		}
-		return 0;
-	}
+            $table->render();
+        } else {
+            $output->writeln("<info>User <$user> has no calendars</info>");
+        }
+        return 0;
+    }
 }

apps/dav/lib/Command/CreateAddressBook.php

Indentation +35 added lines, -35 removed lines

@@ -34,44 +34,44 @@
 
 class CreateAddressBook extends Command {
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var CardDavBackend */
-	private $cardDavBackend;
+    /** @var CardDavBackend */
+    private $cardDavBackend;
 
-	/**
-	 * @param IUserManager $userManager
-	 * @param CardDavBackend $cardDavBackend
-	 */
-	public function __construct(IUserManager $userManager,
-						 CardDavBackend $cardDavBackend
-	) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->cardDavBackend = $cardDavBackend;
-	}
+    /**
+     * @param IUserManager $userManager
+     * @param CardDavBackend $cardDavBackend
+     */
+    public function __construct(IUserManager $userManager,
+                            CardDavBackend $cardDavBackend
+    ) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->cardDavBackend = $cardDavBackend;
+    }
 
-	protected function configure() {
-		$this
-				->setName('dav:create-addressbook')
-				->setDescription('Create a dav addressbook')
-				->addArgument('user',
-						InputArgument::REQUIRED,
-						'User for whom the addressbook will be created')
-				->addArgument('name',
-						InputArgument::REQUIRED,
-						'Name of the addressbook');
-	}
+    protected function configure() {
+        $this
+                ->setName('dav:create-addressbook')
+                ->setDescription('Create a dav addressbook')
+                ->addArgument('user',
+                        InputArgument::REQUIRED,
+                        'User for whom the addressbook will be created')
+                ->addArgument('name',
+                        InputArgument::REQUIRED,
+                        'Name of the addressbook');
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$user = $input->getArgument('user');
-		if (!$this->userManager->userExists($user)) {
-			throw new \InvalidArgumentException("User <$user> in unknown.");
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $user = $input->getArgument('user');
+        if (!$this->userManager->userExists($user)) {
+            throw new \InvalidArgumentException("User <$user> in unknown.");
+        }
 
-		$name = $input->getArgument('name');
-		$this->cardDavBackend->createAddressBook("principals/users/$user", $name, []);
-		return 0;
-	}
+        $name = $input->getArgument('name');
+        $this->cardDavBackend->createAddressBook("principals/users/$user", $name, []);
+        return 0;
+    }
 }

apps/dav/lib/Command/SyncBirthdayCalendar.php

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
 
 class SyncBirthdayCalendar extends Command {
 
-	/** @var BirthdayService */
-	private $birthdayService;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 * @param BirthdayService $birthdayService
-	 */
-	public function __construct(IUserManager $userManager, IConfig $config,
-						 BirthdayService $birthdayService) {
-		parent::__construct();
-		$this->birthdayService = $birthdayService;
-		$this->config = $config;
-		$this->userManager = $userManager;
-	}
-
-	protected function configure() {
-		$this
-			->setName('dav:sync-birthday-calendar')
-			->setDescription('Synchronizes the birthday calendar')
-			->addArgument('user',
-				InputArgument::OPTIONAL,
-				'User for whom the birthday calendar will be synchronized');
-	}
-
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$this->verifyEnabled();
-
-		$user = $input->getArgument('user');
-		if (!is_null($user)) {
-			if (!$this->userManager->userExists($user)) {
-				throw new \InvalidArgumentException("User <$user> in unknown.");
-			}
-
-			// re-enable the birthday calendar in case it's called directly with a user name
-			$isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				$this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
-				$output->writeln("Re-enabling birthday calendar for $user");
-			}
-
-			$output->writeln("Start birthday calendar sync for $user");
-			$this->birthdayService->syncUser($user);
-			return 0;
-		}
-		$output->writeln("Start birthday calendar sync for all users ...");
-		$p = new ProgressBar($output);
-		$p->start();
-		$this->userManager->callForSeenUsers(function ($user) use ($p) {
-			$p->advance();
-
-			$userId = $user->getUID();
-			$isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
-			if ($isEnabled !== 'yes') {
-				return;
-			}
-
-			/** @var IUser $user */
-			$this->birthdayService->syncUser($user->getUID());
-		});
-
-		$p->finish();
-		$output->writeln('');
-		return 0;
-	}
-
-	protected function verifyEnabled() {
-		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
-
-		if ($isEnabled !== 'yes') {
-			throw new \InvalidArgumentException('Birthday calendars are disabled');
-		}
-	}
+    /** @var BirthdayService */
+    private $birthdayService;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     * @param BirthdayService $birthdayService
+     */
+    public function __construct(IUserManager $userManager, IConfig $config,
+                            BirthdayService $birthdayService) {
+        parent::__construct();
+        $this->birthdayService = $birthdayService;
+        $this->config = $config;
+        $this->userManager = $userManager;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('dav:sync-birthday-calendar')
+            ->setDescription('Synchronizes the birthday calendar')
+            ->addArgument('user',
+                InputArgument::OPTIONAL,
+                'User for whom the birthday calendar will be synchronized');
+    }
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $this->verifyEnabled();
+
+        $user = $input->getArgument('user');
+        if (!is_null($user)) {
+            if (!$this->userManager->userExists($user)) {
+                throw new \InvalidArgumentException("User <$user> in unknown.");
+            }
+
+            // re-enable the birthday calendar in case it's called directly with a user name
+            $isEnabled = $this->config->getUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                $this->config->setUserValue($user, 'dav', 'generateBirthdayCalendar', 'yes');
+                $output->writeln("Re-enabling birthday calendar for $user");
+            }
+
+            $output->writeln("Start birthday calendar sync for $user");
+            $this->birthdayService->syncUser($user);
+            return 0;
+        }
+        $output->writeln("Start birthday calendar sync for all users ...");
+        $p = new ProgressBar($output);
+        $p->start();
+        $this->userManager->callForSeenUsers(function ($user) use ($p) {
+            $p->advance();
+
+            $userId = $user->getUID();
+            $isEnabled = $this->config->getUserValue($userId, 'dav', 'generateBirthdayCalendar', 'yes');
+            if ($isEnabled !== 'yes') {
+                return;
+            }
+
+            /** @var IUser $user */
+            $this->birthdayService->syncUser($user->getUID());
+        });
+
+        $p->finish();
+        $output->writeln('');
+        return 0;
+    }
+
+    protected function verifyEnabled() {
+        $isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
+
+        if ($isEnabled !== 'yes') {
+            throw new \InvalidArgumentException('Birthday calendars are disabled');
+        }
+    }
 }

apps/user_ldap/lib/Command/DeleteConfig.php

Indentation +31 added lines, -31 removed lines

@@ -33,41 +33,41 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class DeleteConfig extends Command {
-	/** @var \OCA\User_LDAP\Helper */
-	protected $helper;
+    /** @var \OCA\User_LDAP\Helper */
+    protected $helper;
 
-	/**
-	 * @param Helper $helper
-	 */
-	public function __construct(Helper $helper) {
-		$this->helper = $helper;
-		parent::__construct();
-	}
+    /**
+     * @param Helper $helper
+     */
+    public function __construct(Helper $helper) {
+        $this->helper = $helper;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:delete-config')
-			->setDescription('deletes an existing LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::REQUIRED,
-					'the configuration ID'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:delete-config')
+            ->setDescription('deletes an existing LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::REQUIRED,
+                    'the configuration ID'
+                        )
+        ;
+    }
 
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$configPrefix = $input->getArgument('configID');
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configPrefix = $input->getArgument('configID');
 
-		$success = $this->helper->deleteServerConfiguration($configPrefix);
+        $success = $this->helper->deleteServerConfiguration($configPrefix);
 
-		if ($success) {
-			$output->writeln("Deleted configuration with configID '{$configPrefix}'");
-			return 0;
-		} else {
-			$output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
-			return 1;
-		}
-	}
+        if ($success) {
+            $output->writeln("Deleted configuration with configID '{$configPrefix}'");
+            return 0;
+        } else {
+            $output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
+            return 1;
+        }
+    }
 }