nextcloud / server

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/CheckUser.php

Indentation +129 added lines, -129 removed lines

@@ -37,133 +37,133 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CheckUser extends Command {
-	/** @var User_Proxy */
-	protected $backend;
-
-	/** @var Helper */
-	protected $helper;
-
-	/** @var DeletedUsersIndex */
-	protected $dui;
-
-	/** @var UserMapping */
-	protected $mapping;
-
-	/**
-	 * @param User_Proxy $uBackend
-	 * @param Helper $helper
-	 * @param DeletedUsersIndex $dui
-	 * @param UserMapping $mapping
-	 */
-	public function __construct(User_Proxy $uBackend, Helper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
-		$this->backend = $uBackend;
-		$this->helper = $helper;
-		$this->dui = $dui;
-		$this->mapping = $mapping;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('ldap:check-user')
-			->setDescription('checks whether a user exists on LDAP.')
-			->addArgument(
-					'ocName',
-					InputArgument::REQUIRED,
-					'the user name as used in Nextcloud'
-					 )
-			->addOption(
-					'force',
-					null,
-					InputOption::VALUE_NONE,
-					'ignores disabled LDAP configuration'
-					 )
-			->addOption(
-				'update',
-				null,
-				InputOption::VALUE_NONE,
-				'syncs values from LDAP'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		try {
-			$uid = $input->getArgument('ocName');
-			$this->isAllowed($input->getOption('force'));
-			$this->confirmUserIsMapped($uid);
-			$exists = $this->backend->userExistsOnLDAP($uid);
-			if ($exists === true) {
-				$output->writeln('The user is still available on LDAP.');
-				if ($input->getOption('update')) {
-					$this->updateUser($uid, $output);
-				}
-				return 0;
-			}
-
-			$this->dui->markUser($uid);
-			$output->writeln('The user does not exists on LDAP anymore.');
-			$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
-				. $uid . '"');
-			return 0;
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
-			return 1;
-		}
-	}
-
-	/**
-	 * checks whether a user is actually mapped
-	 * @param string $ocName the username as used in Nextcloud
-	 * @throws \Exception
-	 * @return true
-	 */
-	protected function confirmUserIsMapped($ocName) {
-		$dn = $this->mapping->getDNByName($ocName);
-		if ($dn === false) {
-			throw new \Exception('The given user is not a recognized LDAP user.');
-		}
-
-		return true;
-	}
-
-	/**
-	 * checks whether the setup allows reliable checking of LDAP user existence
-	 * @throws \Exception
-	 * @return true
-	 */
-	protected function isAllowed($force) {
-		if ($this->helper->haveDisabledConfigurations() && !$force) {
-			throw new \Exception('Cannot check user existence, because '
-				. 'disabled LDAP configurations are present.');
-		}
-
-		// we don't check ldapUserCleanupInterval from config.php because this
-		// action is triggered manually, while the setting only controls the
-		// background job.
-
-		return true;
-	}
-
-	private function updateUser(string $uid, OutputInterface $output): void {
-		try {
-			$access = $this->backend->getLDAPAccess($uid);
-			$attrs = $access->userManager->getAttributes();
-			$user = $access->userManager->get($uid);
-			$avatarAttributes = $access->getConnection()->resolveRule('avatar');
-			$result = $access->search('objectclass=*', $user->getDN(), $attrs, 1, 0);
-			foreach ($result[0] as $attribute => $valueSet) {
-				$output->writeln('  ' . $attribute . ': ');
-				foreach ($valueSet as $value) {
-					if (in_array($attribute, $avatarAttributes)) {
-						$value = '{ImageData}';
-					}
-					$output->writeln('    ' . $value);
-				}
-			}
-			$access->batchApplyUserAttributes($result);
-		} catch (\Exception $e) {
-			$output->writeln('<error>Error while trying to lookup and update attributes from LDAP</error>');
-		}
-	}
+    /** @var User_Proxy */
+    protected $backend;
+
+    /** @var Helper */
+    protected $helper;
+
+    /** @var DeletedUsersIndex */
+    protected $dui;
+
+    /** @var UserMapping */
+    protected $mapping;
+
+    /**
+     * @param User_Proxy $uBackend
+     * @param Helper $helper
+     * @param DeletedUsersIndex $dui
+     * @param UserMapping $mapping
+     */
+    public function __construct(User_Proxy $uBackend, Helper $helper, DeletedUsersIndex $dui, UserMapping $mapping) {
+        $this->backend = $uBackend;
+        $this->helper = $helper;
+        $this->dui = $dui;
+        $this->mapping = $mapping;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('ldap:check-user')
+            ->setDescription('checks whether a user exists on LDAP.')
+            ->addArgument(
+                    'ocName',
+                    InputArgument::REQUIRED,
+                    'the user name as used in Nextcloud'
+                        )
+            ->addOption(
+                    'force',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'ignores disabled LDAP configuration'
+                        )
+            ->addOption(
+                'update',
+                null,
+                InputOption::VALUE_NONE,
+                'syncs values from LDAP'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        try {
+            $uid = $input->getArgument('ocName');
+            $this->isAllowed($input->getOption('force'));
+            $this->confirmUserIsMapped($uid);
+            $exists = $this->backend->userExistsOnLDAP($uid);
+            if ($exists === true) {
+                $output->writeln('The user is still available on LDAP.');
+                if ($input->getOption('update')) {
+                    $this->updateUser($uid, $output);
+                }
+                return 0;
+            }
+
+            $this->dui->markUser($uid);
+            $output->writeln('The user does not exists on LDAP anymore.');
+            $output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
+                . $uid . '"');
+            return 0;
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage(). '</error>');
+            return 1;
+        }
+    }
+
+    /**
+     * checks whether a user is actually mapped
+     * @param string $ocName the username as used in Nextcloud
+     * @throws \Exception
+     * @return true
+     */
+    protected function confirmUserIsMapped($ocName) {
+        $dn = $this->mapping->getDNByName($ocName);
+        if ($dn === false) {
+            throw new \Exception('The given user is not a recognized LDAP user.');
+        }
+
+        return true;
+    }
+
+    /**
+     * checks whether the setup allows reliable checking of LDAP user existence
+     * @throws \Exception
+     * @return true
+     */
+    protected function isAllowed($force) {
+        if ($this->helper->haveDisabledConfigurations() && !$force) {
+            throw new \Exception('Cannot check user existence, because '
+                . 'disabled LDAP configurations are present.');
+        }
+
+        // we don't check ldapUserCleanupInterval from config.php because this
+        // action is triggered manually, while the setting only controls the
+        // background job.
+
+        return true;
+    }
+
+    private function updateUser(string $uid, OutputInterface $output): void {
+        try {
+            $access = $this->backend->getLDAPAccess($uid);
+            $attrs = $access->userManager->getAttributes();
+            $user = $access->userManager->get($uid);
+            $avatarAttributes = $access->getConnection()->resolveRule('avatar');
+            $result = $access->search('objectclass=*', $user->getDN(), $attrs, 1, 0);
+            foreach ($result[0] as $attribute => $valueSet) {
+                $output->writeln('  ' . $attribute . ': ');
+                foreach ($valueSet as $value) {
+                    if (in_array($attribute, $avatarAttributes)) {
+                        $value = '{ImageData}';
+                    }
+                    $output->writeln('    ' . $value);
+                }
+            }
+            $access->batchApplyUserAttributes($result);
+        } catch (\Exception $e) {
+            $output->writeln('<error>Error while trying to lookup and update attributes from LDAP</error>');
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -104,10 +104,10 @@ 
 			$this->dui->markUser($uid);
 			$output->writeln('The user does not exists on LDAP anymore.');
 			$output->writeln('Clean up the user\'s remnants by: ./occ user:delete "'
-				. $uid . '"');
+				. $uid.'"');
 			return 0;
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage(). '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 			return 1;
 		}
 	}
@@ -153,12 +153,12 @@ 
 			$avatarAttributes = $access->getConnection()->resolveRule('avatar');
 			$result = $access->search('objectclass=*', $user->getDN(), $attrs, 1, 0);
 			foreach ($result[0] as $attribute => $valueSet) {
-				$output->writeln('  ' . $attribute . ': ');
+				$output->writeln('  '.$attribute.': ');
 				foreach ($valueSet as $value) {
 					if (in_array($attribute, $avatarAttributes)) {
 						$value = '{ImageData}';
 					}
-					$output->writeln('    ' . $value);
+					$output->writeln('    '.$value);
 				}
 			}
 			$access->batchApplyUserAttributes($result);

apps/user_ldap/lib/Command/ShowRemnants.php

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
 
-	/** @var \OCP\IDateTimeFormatter */
-	protected $dateFormatter;
+    /** @var \OCP\IDateTimeFormatter */
+    protected $dateFormatter;
 
-	/**
-	 * @param DeletedUsersIndex $dui
-	 * @param IDateTimeFormatter $dateFormatter
-	 */
-	public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
-		$this->dui = $dui;
-		$this->dateFormatter = $dateFormatter;
-		parent::__construct();
-	}
+    /**
+     * @param DeletedUsersIndex $dui
+     * @param IDateTimeFormatter $dateFormatter
+     */
+    public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
+        $this->dui = $dui;
+        $this->dateFormatter = $dateFormatter;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
-			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
-			->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-remnants')
+            ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
+            ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
+            ->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
+    }
 
-	protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
-		if (!($timestamp > 0)) {
-			return $default;
-		}
-		if ($showShortDate) {
-			return date('Y-m-d', $timestamp);
-		}
-		return $this->dateFormatter->formatDate($timestamp);
-	}
+    protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
+        if (!($timestamp > 0)) {
+            return $default;
+        }
+        if ($showShortDate) {
+            return date('Y-m-d', $timestamp);
+        }
+        return $this->dateFormatter->formatDate($timestamp);
+    }
 
-	/**
-	 * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
-	 *
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var \Symfony\Component\Console\Helper\Table $table */
-		$table = new Table($output);
-		$table->setHeaders([
-			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
-			'Detected on', 'Dir', 'Sharer'
-		]);
-		$rows = [];
-		$resultSet = $this->dui->getUsers();
-		foreach ($resultSet as $user) {
-			$rows[] = [
-				'ocName' => $user->getOCName(),
-				'displayName' => $user->getDisplayName(),
-				'uid' => $user->getUID(),
-				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
-				'homePath' => $user->getHomePath(),
-				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
-			];
-		}
+    /**
+     * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
+     *
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var \Symfony\Component\Console\Helper\Table $table */
+        $table = new Table($output);
+        $table->setHeaders([
+            'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+            'Detected on', 'Dir', 'Sharer'
+        ]);
+        $rows = [];
+        $resultSet = $this->dui->getUsers();
+        foreach ($resultSet as $user) {
+            $rows[] = [
+                'ocName' => $user->getOCName(),
+                'displayName' => $user->getDisplayName(),
+                'uid' => $user->getUID(),
+                'dn' => $user->getDN(),
+                'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
+                'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+                'homePath' => $user->getHomePath(),
+                'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
+            ];
+        }
 
-		if ($input->getOption('json')) {
-			$output->writeln(json_encode($rows));
-		} else {
-			$table->setRows($rows);
-			$table->render($output);
-		}
-		return 0;
-	}
+        if ($input->getOption('json')) {
+            $output->writeln(json_encode($rows));
+        } else {
+            $table->setRows($rows);
+            $table->render($output);
+        }
+        return 0;
+    }
 }

apps/user_ldap/lib/Command/Search.php

Indentation +95 added lines, -95 removed lines

@@ -41,106 +41,106 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Search extends Command {
-	/** @var \OCP\IConfig */
-	protected $ocConfig;
+    /** @var \OCP\IConfig */
+    protected $ocConfig;
 
-	/**
-	 * @param \OCP\IConfig $ocConfig
-	 */
-	public function __construct(IConfig $ocConfig) {
-		$this->ocConfig = $ocConfig;
-		parent::__construct();
-	}
+    /**
+     * @param \OCP\IConfig $ocConfig
+     */
+    public function __construct(IConfig $ocConfig) {
+        $this->ocConfig = $ocConfig;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:search')
-			->setDescription('executes a user or group search')
-			->addArgument(
-					'search',
-					InputArgument::REQUIRED,
-					'the search string (can be empty)'
-					 )
-			->addOption(
-					'group',
-					null,
-					InputOption::VALUE_NONE,
-					'searches groups instead of users'
-					 )
-			->addOption(
-					'offset',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'The offset of the result set. Needs to be a multiple of limit. defaults to 0.',
-					0
-					 )
-			->addOption(
-					'limit',
-					null,
-					InputOption::VALUE_REQUIRED,
-					'limit the results. 0 means no limit, defaults to 15',
-					15
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:search')
+            ->setDescription('executes a user or group search')
+            ->addArgument(
+                    'search',
+                    InputArgument::REQUIRED,
+                    'the search string (can be empty)'
+                        )
+            ->addOption(
+                    'group',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'searches groups instead of users'
+                        )
+            ->addOption(
+                    'offset',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'The offset of the result set. Needs to be a multiple of limit. defaults to 0.',
+                    0
+                        )
+            ->addOption(
+                    'limit',
+                    null,
+                    InputOption::VALUE_REQUIRED,
+                    'limit the results. 0 means no limit, defaults to 15',
+                    15
+                        )
+        ;
+    }
 
-	/**
-	 * Tests whether the offset and limit options are valid
-	 * @param int $offset
-	 * @param int $limit
-	 * @throws \InvalidArgumentException
-	 */
-	protected function validateOffsetAndLimit($offset, $limit) {
-		if ($limit < 0) {
-			throw new \InvalidArgumentException('limit must be  0 or greater');
-		}
-		if ($offset  < 0) {
-			throw new \InvalidArgumentException('offset must be 0 or greater');
-		}
-		if ($limit === 0 && $offset !== 0) {
-			throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0');
-		}
-		if ($offset > 0 && ($offset % $limit !== 0)) {
-			throw new \InvalidArgumentException('offset must be a multiple of limit');
-		}
-	}
+    /**
+     * Tests whether the offset and limit options are valid
+     * @param int $offset
+     * @param int $limit
+     * @throws \InvalidArgumentException
+     */
+    protected function validateOffsetAndLimit($offset, $limit) {
+        if ($limit < 0) {
+            throw new \InvalidArgumentException('limit must be  0 or greater');
+        }
+        if ($offset  < 0) {
+            throw new \InvalidArgumentException('offset must be 0 or greater');
+        }
+        if ($limit === 0 && $offset !== 0) {
+            throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0');
+        }
+        if ($offset > 0 && ($offset % $limit !== 0)) {
+            throw new \InvalidArgumentException('offset must be a multiple of limit');
+        }
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = new Helper($this->ocConfig);
-		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
-		$ldapWrapper = new LDAP();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $helper = new Helper($this->ocConfig);
+        $configPrefixes = $helper->getServerConfigurationPrefixes(true);
+        $ldapWrapper = new LDAP();
 
-		$offset = (int)$input->getOption('offset');
-		$limit = (int)$input->getOption('limit');
-		$this->validateOffsetAndLimit($offset, $limit);
+        $offset = (int)$input->getOption('offset');
+        $limit = (int)$input->getOption('limit');
+        $this->validateOffsetAndLimit($offset, $limit);
 
-		if ($input->getOption('group')) {
-			$proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query('LDAPGroupPluginManager'));
-			$getMethod = 'getGroups';
-			$printID = false;
-			// convert the limit of groups to null. This will show all the groups available instead of
-			// nothing, and will match the same behaviour the search for users has.
-			if ($limit === 0) {
-				$limit = null;
-			}
-		} else {
-			$proxy = new User_Proxy(
-				$configPrefixes,
-				$ldapWrapper,
-				$this->ocConfig,
-				\OC::$server->getNotificationManager(),
-				\OC::$server->getUserSession(),
-				\OC::$server->query('LDAPUserPluginManager')
-			);
-			$getMethod = 'getDisplayNames';
-			$printID = true;
-		}
+        if ($input->getOption('group')) {
+            $proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query('LDAPGroupPluginManager'));
+            $getMethod = 'getGroups';
+            $printID = false;
+            // convert the limit of groups to null. This will show all the groups available instead of
+            // nothing, and will match the same behaviour the search for users has.
+            if ($limit === 0) {
+                $limit = null;
+            }
+        } else {
+            $proxy = new User_Proxy(
+                $configPrefixes,
+                $ldapWrapper,
+                $this->ocConfig,
+                \OC::$server->getNotificationManager(),
+                \OC::$server->getUserSession(),
+                \OC::$server->query('LDAPUserPluginManager')
+            );
+            $getMethod = 'getDisplayNames';
+            $printID = true;
+        }
 
-		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
-		foreach ($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
-			$output->writeln($line);
-		}
-		return 0;
-	}
+        $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
+        foreach ($result as $id => $name) {
+            $line = $name . ($printID ? ' ('.$id.')' : '');
+            $output->writeln($line);
+        }
+        return 0;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -94,7 +94,7 @@ 
 		if ($limit < 0) {
 			throw new \InvalidArgumentException('limit must be  0 or greater');
 		}
-		if ($offset  < 0) {
+		if ($offset < 0) {
 			throw new \InvalidArgumentException('offset must be 0 or greater');
 		}
 		if ($limit === 0 && $offset !== 0) {
@@ -110,8 +110,8 @@ 
 		$configPrefixes = $helper->getServerConfigurationPrefixes(true);
 		$ldapWrapper = new LDAP();
 
-		$offset = (int)$input->getOption('offset');
-		$limit = (int)$input->getOption('limit');
+		$offset = (int) $input->getOption('offset');
+		$limit = (int) $input->getOption('limit');
 		$this->validateOffsetAndLimit($offset, $limit);
 
 		if ($input->getOption('group')) {
@@ -138,7 +138,7 @@ 
 
 		$result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset);
 		foreach ($result as $id => $name) {
-			$line = $name . ($printID ? ' ('.$id.')' : '');
+			$line = $name.($printID ? ' ('.$id.')' : '');
 			$output->writeln($line);
 		}
 		return 0;

apps/user_ldap/lib/Command/TestConfig.php

Indentation +52 added lines, -52 removed lines

@@ -35,61 +35,61 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class TestConfig extends Command {
-	protected function configure() {
-		$this
-			->setName('ldap:test-config')
-			->setDescription('tests an LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::REQUIRED,
-					'the configuration ID'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:test-config')
+            ->setDescription('tests an LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::REQUIRED,
+                    'the configuration ID'
+                        )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = new Helper(\OC::$server->getConfig());
-		$availableConfigs = $helper->getServerConfigurationPrefixes();
-		$configID = $input->getArgument('configID');
-		if (!in_array($configID, $availableConfigs)) {
-			$output->writeln("Invalid configID");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $helper = new Helper(\OC::$server->getConfig());
+        $availableConfigs = $helper->getServerConfigurationPrefixes();
+        $configID = $input->getArgument('configID');
+        if (!in_array($configID, $availableConfigs)) {
+            $output->writeln("Invalid configID");
+            return 1;
+        }
 
-		$result = $this->testConfig($configID);
-		if ($result === 0) {
-			$output->writeln('The configuration is valid and the connection could be established!');
-		} elseif ($result === 1) {
-			$output->writeln('The configuration is invalid. Please have a look at the logs for further details.');
-			return 1;
-		} elseif ($result === 2) {
-			$output->writeln('The configuration is valid, but the Bind failed. Please check the server settings and credentials.');
-		} else {
-			$output->writeln('Your LDAP server was kidnapped by aliens.');
-		}
-		return 0;
-	}
+        $result = $this->testConfig($configID);
+        if ($result === 0) {
+            $output->writeln('The configuration is valid and the connection could be established!');
+        } elseif ($result === 1) {
+            $output->writeln('The configuration is invalid. Please have a look at the logs for further details.');
+            return 1;
+        } elseif ($result === 2) {
+            $output->writeln('The configuration is valid, but the Bind failed. Please check the server settings and credentials.');
+        } else {
+            $output->writeln('Your LDAP server was kidnapped by aliens.');
+        }
+        return 0;
+    }
 
-	/**
-	 * tests the specified connection
-	 * @param string $configID
-	 * @return int
-	 */
-	protected function testConfig($configID) {
-		$lw = new \OCA\User_LDAP\LDAP();
-		$connection = new Connection($lw, $configID);
+    /**
+     * tests the specified connection
+     * @param string $configID
+     * @return int
+     */
+    protected function testConfig($configID) {
+        $lw = new \OCA\User_LDAP\LDAP();
+        $connection = new Connection($lw, $configID);
 
-		//ensure validation is run before we attempt the bind
-		$connection->getConfiguration();
+        //ensure validation is run before we attempt the bind
+        $connection->getConfiguration();
 
-		if (!$connection->setConfiguration([
-			'ldap_configuration_active' => 1,
-		])) {
-			return 1;
-		}
-		if ($connection->bind()) {
-			return 0;
-		}
-		return 2;
-	}
+        if (!$connection->setConfiguration([
+            'ldap_configuration_active' => 1,
+        ])) {
+            return 1;
+        }
+        if ($connection->bind()) {
+            return 0;
+        }
+        return 2;
+    }
 }

apps/user_ldap/lib/Command/SetConfig.php

Indentation +49 added lines, -49 removed lines

@@ -37,57 +37,57 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetConfig extends Command {
-	protected function configure() {
-		$this
-			->setName('ldap:set-config')
-			->setDescription('modifies an LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::REQUIRED,
-					'the configuration ID'
-					 )
-			->addArgument(
-					'configKey',
-					InputArgument::REQUIRED,
-					'the configuration key'
-					 )
-			->addArgument(
-					'configValue',
-					InputArgument::REQUIRED,
-					'the new configuration value'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:set-config')
+            ->setDescription('modifies an LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::REQUIRED,
+                    'the configuration ID'
+                        )
+            ->addArgument(
+                    'configKey',
+                    InputArgument::REQUIRED,
+                    'the configuration key'
+                        )
+            ->addArgument(
+                    'configValue',
+                    InputArgument::REQUIRED,
+                    'the new configuration value'
+                        )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$helper = new Helper(\OC::$server->getConfig());
-		$availableConfigs = $helper->getServerConfigurationPrefixes();
-		$configID = $input->getArgument('configID');
-		if (!in_array($configID, $availableConfigs)) {
-			$output->writeln("Invalid configID");
-			return 1;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $helper = new Helper(\OC::$server->getConfig());
+        $availableConfigs = $helper->getServerConfigurationPrefixes();
+        $configID = $input->getArgument('configID');
+        if (!in_array($configID, $availableConfigs)) {
+            $output->writeln("Invalid configID");
+            return 1;
+        }
 
-		$this->setValue(
-			$configID,
-			$input->getArgument('configKey'),
-			$input->getArgument('configValue')
-		);
-		return 0;
-	}
+        $this->setValue(
+            $configID,
+            $input->getArgument('configKey'),
+            $input->getArgument('configValue')
+        );
+        return 0;
+    }
 
-	/**
-	 * save the configuration value as provided
-	 * @param string $configID
-	 * @param string $configKey
-	 * @param string $configValue
-	 */
-	protected function setValue($configID, $key, $value) {
-		$configHolder = new Configuration($configID);
-		$configHolder->$key = $value;
-		$configHolder->saveConfiguration();
+    /**
+     * save the configuration value as provided
+     * @param string $configID
+     * @param string $configKey
+     * @param string $configValue
+     */
+    protected function setValue($configID, $key, $value) {
+        $configHolder = new Configuration($configID);
+        $configHolder->$key = $value;
+        $configHolder->saveConfiguration();
 
-		$connectionFactory = new ConnectionFactory(new LDAP());
-		$connectionFactory->get($configID)->clearCache();
-	}
+        $connectionFactory = new ConnectionFactory(new LDAP());
+        $connectionFactory->get($configID)->clearCache();
+    }
 }

apps/user_ldap/lib/Command/ShowConfig.php

Indentation +68 added lines, -68 removed lines

@@ -37,78 +37,78 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowConfig 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:show-config')
-			->setDescription('shows the LDAP configuration')
-			->addArgument(
-					'configID',
-					InputArgument::OPTIONAL,
-					'will show the configuration of the specified id'
-					 )
-			->addOption(
-					'show-password',
-					null,
-					InputOption::VALUE_NONE,
-					'show ldap bind password'
-					 )
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-config')
+            ->setDescription('shows the LDAP configuration')
+            ->addArgument(
+                    'configID',
+                    InputArgument::OPTIONAL,
+                    'will show the configuration of the specified id'
+                        )
+            ->addOption(
+                    'show-password',
+                    null,
+                    InputOption::VALUE_NONE,
+                    'show ldap bind password'
+                        )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$availableConfigs = $this->helper->getServerConfigurationPrefixes();
-		$configID = $input->getArgument('configID');
-		if (!is_null($configID)) {
-			$configIDs[] = $configID;
-			if (!in_array($configIDs[0], $availableConfigs)) {
-				$output->writeln("Invalid configID");
-				return 1;
-			}
-		} else {
-			$configIDs = $availableConfigs;
-		}
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $availableConfigs = $this->helper->getServerConfigurationPrefixes();
+        $configID = $input->getArgument('configID');
+        if (!is_null($configID)) {
+            $configIDs[] = $configID;
+            if (!in_array($configIDs[0], $availableConfigs)) {
+                $output->writeln("Invalid configID");
+                return 1;
+            }
+        } else {
+            $configIDs = $availableConfigs;
+        }
 
-		$this->renderConfigs($configIDs, $output, $input->getOption('show-password'));
-		return 0;
-	}
+        $this->renderConfigs($configIDs, $output, $input->getOption('show-password'));
+        return 0;
+    }
 
-	/**
-	 * prints the LDAP configuration(s)
-	 * @param string[] configID(s)
-	 * @param OutputInterface $output
-	 * @param bool $withPassword      Set to TRUE to show plaintext passwords in output
-	 */
-	protected function renderConfigs($configIDs, $output, $withPassword) {
-		foreach ($configIDs as $id) {
-			$configHolder = new Configuration($id);
-			$configuration = $configHolder->getConfiguration();
-			ksort($configuration);
+    /**
+     * prints the LDAP configuration(s)
+     * @param string[] configID(s)
+     * @param OutputInterface $output
+     * @param bool $withPassword      Set to TRUE to show plaintext passwords in output
+     */
+    protected function renderConfigs($configIDs, $output, $withPassword) {
+        foreach ($configIDs as $id) {
+            $configHolder = new Configuration($id);
+            $configuration = $configHolder->getConfiguration();
+            ksort($configuration);
 
-			$table = new Table($output);
-			$table->setHeaders(['Configuration', $id]);
-			$rows = [];
-			foreach ($configuration as $key => $value) {
-				if ($key === 'ldapAgentPassword' && !$withPassword) {
-					$value = '***';
-				}
-				if (is_array($value)) {
-					$value = implode(';', $value);
-				}
-				$rows[] = [$key, $value];
-			}
-			$table->setRows($rows);
-			$table->render($output);
-		}
-	}
+            $table = new Table($output);
+            $table->setHeaders(['Configuration', $id]);
+            $rows = [];
+            foreach ($configuration as $key => $value) {
+                if ($key === 'ldapAgentPassword' && !$withPassword) {
+                    $value = '***';
+                }
+                if (is_array($value)) {
+                    $value = implode(';', $value);
+                }
+                $rows[] = [$key, $value];
+            }
+            $table->setRows($rows);
+            $table->render($output);
+        }
+    }
 }

apps/user_ldap/lib/Command/CreateEmptyConfig.php

Indentation +32 added lines, -32 removed lines

@@ -34,40 +34,40 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class CreateEmptyConfig 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:create-empty-config')
-			->setDescription('creates an empty LDAP configuration')
-			->addOption(
-				'only-print-prefix',
-				'p',
-				InputOption::VALUE_NONE,
-				'outputs only the prefix'
-			)
-		;
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:create-empty-config')
+            ->setDescription('creates an empty LDAP configuration')
+            ->addOption(
+                'only-print-prefix',
+                'p',
+                InputOption::VALUE_NONE,
+                'outputs only the prefix'
+            )
+        ;
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$configPrefix = $this->helper->getNextServerConfigurationPrefix();
-		$configHolder = new Configuration($configPrefix);
-		$configHolder->saveConfiguration();
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $configPrefix = $this->helper->getNextServerConfigurationPrefix();
+        $configHolder = new Configuration($configPrefix);
+        $configHolder->saveConfiguration();
 
-		$prose = '';
-		if (!$input->getOption('only-print-prefix')) {
-			$prose = 'Created new configuration with configID ';
-		}
-		$output->writeln($prose . "{$configPrefix}");
-		return 0;
-	}
+        $prose = '';
+        if (!$input->getOption('only-print-prefix')) {
+            $prose = 'Created new configuration with configID ';
+        }
+        $output->writeln($prose . "{$configPrefix}");
+        return 0;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		if (!$input->getOption('only-print-prefix')) {
 			$prose = 'Created new configuration with configID ';
 		}
-		$output->writeln($prose . "{$configPrefix}");
+		$output->writeln($prose."{$configPrefix}");
 		return 0;
 	}
 }