nextcloud / server

lib/private/Repair/RemoveLinkShares.php

Spacing +4 added lines, -4 removed lines

@@ -112,7 +112,7 @@ 
 
 		$subQuery = $this->connection->getQueryBuilder();
 		$subQuery->select('s1.id')
-			->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
+			->from($subQuery->createFunction('('.$subSubQuery->getSQL().')'), 's1')
 			->join(
 				's1', 'share', 's2',
 				$subQuery->expr()->eq('s1.parent', 's2.id')
@@ -126,7 +126,7 @@ 
 		$query = $this->connection->getQueryBuilder();
 		$query->select($query->func()->count('*', 'total'))
 			->from('share')
-			->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
+			->where($query->expr()->in('id', $query->createFunction('('.$subQuery->getSQL().')')));
 
 		$result = $query->execute();
 		$data = $result->fetch();
@@ -149,7 +149,7 @@ 
 
 		$query = $this->connection->getQueryBuilder();
 		$query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
-			->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
+			->from($query->createFunction('('.$subQuery->getSQL().')'), 's1')
 			->join(
 				's1', 'share', 's2',
 				$query->expr()->eq('s1.parent', 's2.id')
@@ -173,7 +173,7 @@ 
 		$this->addToNotify($data['uid_owner']);
 		$this->addToNotify($data['uid_initiator']);
 
-		$this->deleteShare((int)$id);
+		$this->deleteShare((int) $id);
 	}
 
 	/**

Indentation +198 added lines, -198 removed lines

@@ -40,202 +40,202 @@
 use OCP\Notification\IManager;
 
 class RemoveLinkShares implements IRepairStep {
-	/** @var IDBConnection */
-	private $connection;
-	/** @var IConfig */
-	private $config;
-	/** @var string[] */
-	private $userToNotify = [];
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IManager */
-	private $notificationManager;
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	public function __construct(IDBConnection $connection,
-								IConfig $config,
-								IGroupManager $groupManager,
-								IManager $notificationManager,
-								ITimeFactory $timeFactory) {
-		$this->connection = $connection;
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-		$this->notificationManager = $notificationManager;
-		$this->timeFactory = $timeFactory;
-	}
-
-
-	public function getName(): string {
-		return 'Remove potentially over exposing share links';
-	}
-
-	private function shouldRun(): bool {
-		$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		if (version_compare($versionFromBeforeUpdate, '14.0.11', '<')) {
-			return true;
-		}
-		if (version_compare($versionFromBeforeUpdate, '15.0.8', '<')) {
-			return true;
-		}
-		if (version_compare($versionFromBeforeUpdate, '16.0.0', '<=')) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Delete the share
-	 *
-	 * @param int $id
-	 */
-	private function deleteShare(int $id): void {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->delete('share')
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-		$qb->execute();
-	}
-
-	/**
-	 * Get the total of affected shares
-	 *
-	 * @return int
-	 */
-	private function getTotal(): int {
-		$subSubQuery = $this->connection->getQueryBuilder();
-		$subSubQuery->select('*')
-			->from('share')
-			->where($subSubQuery->expr()->isNotNull('parent'))
-			->andWhere($subSubQuery->expr()->eq('share_type', $subSubQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
-
-		$subQuery = $this->connection->getQueryBuilder();
-		$subQuery->select('s1.id')
-			->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
-			->join(
-				's1', 'share', 's2',
-				$subQuery->expr()->eq('s1.parent', 's2.id')
-			)
-			->where($subQuery->expr()->orX(
-				$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(1, IQueryBuilder::PARAM_INT)),
-				$subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(2, IQueryBuilder::PARAM_INT))
-			))
-			->andWhere($subQuery->expr()->eq('s1.item_source', 's2.item_source'));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select($query->func()->count('*', 'total'))
-			->from('share')
-			->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
-
-		$result = $query->execute();
-		$data = $result->fetch();
-		$result->closeCursor();
-
-		return (int) $data['total'];
-	}
-
-	/**
-	 * Get the cursor to fetch all the shares
-	 */
-	private function getShares(): IResult {
-		$subQuery = $this->connection->getQueryBuilder();
-		$subQuery->select('*')
-			->from('share')
-			->where($subQuery->expr()->isNotNull('parent'))
-			->andWhere($subQuery->expr()->eq('share_type', $subQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
-			->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
-			->join(
-				's1', 'share', 's2',
-				$query->expr()->eq('s1.parent', 's2.id')
-			)
-			->where($query->expr()->orX(
-				$query->expr()->eq('s2.share_type', $query->expr()->literal(1, IQueryBuilder::PARAM_INT)),
-				$query->expr()->eq('s2.share_type', $query->expr()->literal(2, IQueryBuilder::PARAM_INT))
-			))
-			->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
-		/** @var IResult $result */
-		$result = $query->execute();
-		return $result;
-	}
-
-	/**
-	 * Process a single share
-	 *
-	 * @param array $data
-	 */
-	private function processShare(array $data): void {
-		$id = $data['id'];
-
-		$this->addToNotify($data['uid_owner']);
-		$this->addToNotify($data['uid_initiator']);
-
-		$this->deleteShare((int)$id);
-	}
-
-	/**
-	 * Update list of users to notify
-	 *
-	 * @param string $uid
-	 */
-	private function addToNotify(string $uid): void {
-		if (!isset($this->userToNotify[$uid])) {
-			$this->userToNotify[$uid] = true;
-		}
-	}
-
-	/**
-	 * Send all notifications
-	 */
-	private function sendNotification(): void {
-		$time = $this->timeFactory->getDateTime();
-
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('core')
-			->setDateTime($time)
-			->setObject('repair', 'exposing_links')
-			->setSubject('repair_exposing_links');
-
-		$users = array_keys($this->userToNotify);
-		foreach ($users as $user) {
-			$notification->setUser((string) $user);
-			$this->notificationManager->notify($notification);
-		}
-	}
-
-	private function repair(IOutput $output, int $total): void {
-		$output->startProgress($total);
-
-		$shareResult = $this->getShares();
-		while ($data = $shareResult->fetch()) {
-			$this->processShare($data);
-			$output->advance();
-		}
-		$output->finishProgress();
-		$shareResult->closeCursor();
-
-		// Notify all admins
-		$adminGroup = $this->groupManager->get('admin');
-		$adminUsers = $adminGroup->getUsers();
-		foreach ($adminUsers as $user) {
-			$this->addToNotify($user->getUID());
-		}
-
-		$output->info('Sending notifications to admins and affected users');
-		$this->sendNotification();
-	}
-
-	public function run(IOutput $output): void {
-		if ($this->shouldRun() === false || ($total = $this->getTotal()) === 0) {
-			$output->info('No need to remove link shares.');
-			return;
-		}
-
-		$output->info('Removing potentially over exposing link shares');
-		$this->repair($output, $total);
-		$output->info('Removed potentially over exposing link shares');
-	}
+    /** @var IDBConnection */
+    private $connection;
+    /** @var IConfig */
+    private $config;
+    /** @var string[] */
+    private $userToNotify = [];
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IManager */
+    private $notificationManager;
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    public function __construct(IDBConnection $connection,
+                                IConfig $config,
+                                IGroupManager $groupManager,
+                                IManager $notificationManager,
+                                ITimeFactory $timeFactory) {
+        $this->connection = $connection;
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+        $this->notificationManager = $notificationManager;
+        $this->timeFactory = $timeFactory;
+    }
+
+
+    public function getName(): string {
+        return 'Remove potentially over exposing share links';
+    }
+
+    private function shouldRun(): bool {
+        $versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        if (version_compare($versionFromBeforeUpdate, '14.0.11', '<')) {
+            return true;
+        }
+        if (version_compare($versionFromBeforeUpdate, '15.0.8', '<')) {
+            return true;
+        }
+        if (version_compare($versionFromBeforeUpdate, '16.0.0', '<=')) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete the share
+     *
+     * @param int $id
+     */
+    private function deleteShare(int $id): void {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->delete('share')
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
+        $qb->execute();
+    }
+
+    /**
+     * Get the total of affected shares
+     *
+     * @return int
+     */
+    private function getTotal(): int {
+        $subSubQuery = $this->connection->getQueryBuilder();
+        $subSubQuery->select('*')
+            ->from('share')
+            ->where($subSubQuery->expr()->isNotNull('parent'))
+            ->andWhere($subSubQuery->expr()->eq('share_type', $subSubQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
+
+        $subQuery = $this->connection->getQueryBuilder();
+        $subQuery->select('s1.id')
+            ->from($subQuery->createFunction('(' . $subSubQuery->getSQL() . ')'), 's1')
+            ->join(
+                's1', 'share', 's2',
+                $subQuery->expr()->eq('s1.parent', 's2.id')
+            )
+            ->where($subQuery->expr()->orX(
+                $subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(1, IQueryBuilder::PARAM_INT)),
+                $subQuery->expr()->eq('s2.share_type', $subQuery->expr()->literal(2, IQueryBuilder::PARAM_INT))
+            ))
+            ->andWhere($subQuery->expr()->eq('s1.item_source', 's2.item_source'));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select($query->func()->count('*', 'total'))
+            ->from('share')
+            ->where($query->expr()->in('id', $query->createFunction('(' . $subQuery->getSQL() . ')')));
+
+        $result = $query->execute();
+        $data = $result->fetch();
+        $result->closeCursor();
+
+        return (int) $data['total'];
+    }
+
+    /**
+     * Get the cursor to fetch all the shares
+     */
+    private function getShares(): IResult {
+        $subQuery = $this->connection->getQueryBuilder();
+        $subQuery->select('*')
+            ->from('share')
+            ->where($subQuery->expr()->isNotNull('parent'))
+            ->andWhere($subQuery->expr()->eq('share_type', $subQuery->expr()->literal(3, IQueryBuilder::PARAM_INT)));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.id', 's1.uid_owner', 's1.uid_initiator')
+            ->from($query->createFunction('(' . $subQuery->getSQL() . ')'), 's1')
+            ->join(
+                's1', 'share', 's2',
+                $query->expr()->eq('s1.parent', 's2.id')
+            )
+            ->where($query->expr()->orX(
+                $query->expr()->eq('s2.share_type', $query->expr()->literal(1, IQueryBuilder::PARAM_INT)),
+                $query->expr()->eq('s2.share_type', $query->expr()->literal(2, IQueryBuilder::PARAM_INT))
+            ))
+            ->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
+        /** @var IResult $result */
+        $result = $query->execute();
+        return $result;
+    }
+
+    /**
+     * Process a single share
+     *
+     * @param array $data
+     */
+    private function processShare(array $data): void {
+        $id = $data['id'];
+
+        $this->addToNotify($data['uid_owner']);
+        $this->addToNotify($data['uid_initiator']);
+
+        $this->deleteShare((int)$id);
+    }
+
+    /**
+     * Update list of users to notify
+     *
+     * @param string $uid
+     */
+    private function addToNotify(string $uid): void {
+        if (!isset($this->userToNotify[$uid])) {
+            $this->userToNotify[$uid] = true;
+        }
+    }
+
+    /**
+     * Send all notifications
+     */
+    private function sendNotification(): void {
+        $time = $this->timeFactory->getDateTime();
+
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('core')
+            ->setDateTime($time)
+            ->setObject('repair', 'exposing_links')
+            ->setSubject('repair_exposing_links');
+
+        $users = array_keys($this->userToNotify);
+        foreach ($users as $user) {
+            $notification->setUser((string) $user);
+            $this->notificationManager->notify($notification);
+        }
+    }
+
+    private function repair(IOutput $output, int $total): void {
+        $output->startProgress($total);
+
+        $shareResult = $this->getShares();
+        while ($data = $shareResult->fetch()) {
+            $this->processShare($data);
+            $output->advance();
+        }
+        $output->finishProgress();
+        $shareResult->closeCursor();
+
+        // Notify all admins
+        $adminGroup = $this->groupManager->get('admin');
+        $adminUsers = $adminGroup->getUsers();
+        foreach ($adminUsers as $user) {
+            $this->addToNotify($user->getUID());
+        }
+
+        $output->info('Sending notifications to admins and affected users');
+        $this->sendNotification();
+    }
+
+    public function run(IOutput $output): void {
+        if ($this->shouldRun() === false || ($total = $this->getTotal()) === 0) {
+            $output->info('No need to remove link shares.');
+            return;
+        }
+
+        $output->info('Removing potentially over exposing link shares');
+        $this->repair($output, $total);
+        $output->info('Removed potentially over exposing link shares');
+    }
 }

lib/private/legacy/OC_Response.php

Spacing +4 added lines, -4 removed lines

@@ -40,10 +40,10 @@ 
 				\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
 				\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
 			])) {
-			header('Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode($filename) . '"');
+			header('Content-Disposition: '.rawurlencode($type).'; filename="'.rawurlencode($filename).'"');
 		} else {
-			header('Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode($filename)
-												 . '; filename="' . rawurlencode($filename) . '"');
+			header('Content-Disposition: '.rawurlencode($type).'; filename*=UTF-8\'\''.rawurlencode($filename)
+												 . '; filename="'.rawurlencode($filename).'"');
 		}
 	}
 
@@ -90,7 +90,7 @@ 
 			. 'connect-src *; '
 			. 'object-src \'none\'; '
 			. 'base-uri \'self\'; ';
-		header('Content-Security-Policy:' . $policy);
+		header('Content-Security-Policy:'.$policy);
 
 		// Send fallback headers for installations that don't have the possibility to send
 		// custom headers on the webserver side

Indentation +59 added lines, -59 removed lines

@@ -28,66 +28,66 @@
  *
  */
 class OC_Response {
-	/**
-	 * Sets the content disposition header (with possible workarounds)
-	 * @param string $filename file name
-	 * @param string $type disposition type, either 'attachment' or 'inline'
-	 */
-	public static function setContentDispositionHeader($filename, $type = 'attachment') {
-		if (\OC::$server->getRequest()->isUserAgent(
-			[
-				\OC\AppFramework\Http\Request::USER_AGENT_IE,
-				\OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
-				\OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
-			])) {
-			header('Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode($filename) . '"');
-		} else {
-			header('Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode($filename)
-												 . '; filename="' . rawurlencode($filename) . '"');
-		}
-	}
+    /**
+     * Sets the content disposition header (with possible workarounds)
+     * @param string $filename file name
+     * @param string $type disposition type, either 'attachment' or 'inline'
+     */
+    public static function setContentDispositionHeader($filename, $type = 'attachment') {
+        if (\OC::$server->getRequest()->isUserAgent(
+            [
+                \OC\AppFramework\Http\Request::USER_AGENT_IE,
+                \OC\AppFramework\Http\Request::USER_AGENT_ANDROID_MOBILE_CHROME,
+                \OC\AppFramework\Http\Request::USER_AGENT_FREEBOX,
+            ])) {
+            header('Content-Disposition: ' . rawurlencode($type) . '; filename="' . rawurlencode($filename) . '"');
+        } else {
+            header('Content-Disposition: ' . rawurlencode($type) . '; filename*=UTF-8\'\'' . rawurlencode($filename)
+                                                    . '; filename="' . rawurlencode($filename) . '"');
+        }
+    }
 
-	/**
-	 * Sets the content length header (with possible workarounds)
-	 * @param string|int|float $length Length to be sent
-	 */
-	public static function setContentLengthHeader($length) {
-		header('Content-Length: '.$length);
-	}
+    /**
+     * Sets the content length header (with possible workarounds)
+     * @param string|int|float $length Length to be sent
+     */
+    public static function setContentLengthHeader($length) {
+        header('Content-Length: '.$length);
+    }
 
-	/**
-	 * This function adds some security related headers to all requests served via base.php
-	 * The implementation of this function has to happen here to ensure that all third-party
-	 * components (e.g. SabreDAV) also benefit from this headers.
-	 */
-	public static function addSecurityHeaders() {
-		/**
-		 * FIXME: Content Security Policy for legacy ownCloud components. This
-		 * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
-		 * is used everywhere.
-		 * @see \OCP\AppFramework\Http\Response::getHeaders
-		 */
-		$policy = 'default-src \'self\'; '
-			. 'script-src \'self\' \'nonce-'.\OC::$server->getContentSecurityPolicyNonceManager()->getNonce().'\'; '
-			. 'style-src \'self\' \'unsafe-inline\'; '
-			. 'frame-src *; '
-			. 'img-src * data: blob:; '
-			. 'font-src \'self\' data:; '
-			. 'media-src *; '
-			. 'connect-src *; '
-			. 'object-src \'none\'; '
-			. 'base-uri \'self\'; ';
-		header('Content-Security-Policy:' . $policy);
+    /**
+     * This function adds some security related headers to all requests served via base.php
+     * The implementation of this function has to happen here to ensure that all third-party
+     * components (e.g. SabreDAV) also benefit from this headers.
+     */
+    public static function addSecurityHeaders() {
+        /**
+         * FIXME: Content Security Policy for legacy ownCloud components. This
+         * can be removed once \OCP\AppFramework\Http\Response from the AppFramework
+         * is used everywhere.
+         * @see \OCP\AppFramework\Http\Response::getHeaders
+         */
+        $policy = 'default-src \'self\'; '
+            . 'script-src \'self\' \'nonce-'.\OC::$server->getContentSecurityPolicyNonceManager()->getNonce().'\'; '
+            . 'style-src \'self\' \'unsafe-inline\'; '
+            . 'frame-src *; '
+            . 'img-src * data: blob:; '
+            . 'font-src \'self\' data:; '
+            . 'media-src *; '
+            . 'connect-src *; '
+            . 'object-src \'none\'; '
+            . 'base-uri \'self\'; ';
+        header('Content-Security-Policy:' . $policy);
 
-		// Send fallback headers for installations that don't have the possibility to send
-		// custom headers on the webserver side
-		if (getenv('modHeadersAvailable') !== 'true') {
-			header('Referrer-Policy: no-referrer'); // https://www.w3.org/TR/referrer-policy/
-			header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
-			header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
-			header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
-			header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
-			header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
-		}
-	}
+        // Send fallback headers for installations that don't have the possibility to send
+        // custom headers on the webserver side
+        if (getenv('modHeadersAvailable') !== 'true') {
+            header('Referrer-Policy: no-referrer'); // https://www.w3.org/TR/referrer-policy/
+            header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+            header('X-Frame-Options: SAMEORIGIN'); // Disallow iFraming from other domains
+            header('X-Permitted-Cross-Domain-Policies: none'); // https://www.adobe.com/devnet/adobe-media-server/articles/cross-domain-xml-for-streaming.html
+            header('X-Robots-Tag: none'); // https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
+            header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
+        }
+    }
 }

lib/private/legacy/OC_EventSource.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
 		header('X-Accel-Buffering: no');
 		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
 		if ($this->fallback) {
-			$this->fallBackId = (int)$_GET['fallback_id'];
+			$this->fallBackId = (int) $_GET['fallback_id'];
 			/**
 			 * FIXME: The default content-security-policy of ownCloud forbids inline
 			 * JavaScript for security reasons. IE starting on Windows 10 will
@@ -73,7 +73,7 @@ 
 			 */
 			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
 			header("Content-Type: text/html");
-			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
+			echo str_repeat('<span></span>'.PHP_EOL, 10); //dummy data to keep IE happy
 		} else {
 			header("Content-Type: text/event-stream");
 		}
@@ -101,7 +101,7 @@ 
 	 */
 	public function send($type, $data = null) {
 		if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
-			throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
+			throw new BadMethodCallException('Type needs to be alphanumeric ('.$type.')');
 		}
 		$this->init();
 		if (is_null($data)) {
@@ -110,13 +110,13 @@ 
 		}
 		if ($this->fallback) {
 			$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				. $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
+				. $this->fallBackId.',"'.$type.'",'.OC_JSON::encode($data).')</script>'.PHP_EOL;
 			echo $response;
 		} else {
 			if ($type) {
-				echo 'event: ' . $type . PHP_EOL;
+				echo 'event: '.$type.PHP_EOL;
 			}
-			echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
+			echo 'data: '.OC_JSON::encode($data).PHP_EOL;
 		}
 		echo PHP_EOL;
 		flush();

Indentation +89 added lines, -89 removed lines

@@ -27,99 +27,99 @@
  *
  */
 class OC_EventSource implements \OCP\IEventSource {
-	/**
-	 * @var bool
-	 */
-	private $fallback;
+    /**
+     * @var bool
+     */
+    private $fallback;
 
-	/**
-	 * @var int
-	 */
-	private $fallBackId = 0;
+    /**
+     * @var int
+     */
+    private $fallBackId = 0;
 
-	/**
-	 * @var bool
-	 */
-	private $started = false;
+    /**
+     * @var bool
+     */
+    private $started = false;
 
-	protected function init() {
-		if ($this->started) {
-			return;
-		}
-		$this->started = true;
+    protected function init() {
+        if ($this->started) {
+            return;
+        }
+        $this->started = true;
 
-		// prevent php output buffering, caching and nginx buffering
-		OC_Util::obEnd();
-		header('Cache-Control: no-cache');
-		header('X-Accel-Buffering: no');
-		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
-		if ($this->fallback) {
-			$this->fallBackId = (int)$_GET['fallback_id'];
-			/**
-			 * FIXME: The default content-security-policy of ownCloud forbids inline
-			 * JavaScript for security reasons. IE starting on Windows 10 will
-			 * however also obey the CSP which will break the event source fallback.
-			 *
-			 * As a workaround thus we set a custom policy which allows the execution
-			 * of inline JavaScript.
-			 *
-			 * @link https://github.com/owncloud/core/issues/14286
-			 */
-			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
-			header("Content-Type: text/html");
-			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
-		} else {
-			header("Content-Type: text/event-stream");
-		}
-		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-			header('Location: '.\OC::$WEBROOT);
-			exit();
-		}
-		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
-			$this->send('error', 'Possible CSRF attack. Connection will be closed.');
-			$this->close();
-			exit();
-		}
-		flush();
-	}
+        // prevent php output buffering, caching and nginx buffering
+        OC_Util::obEnd();
+        header('Cache-Control: no-cache');
+        header('X-Accel-Buffering: no');
+        $this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
+        if ($this->fallback) {
+            $this->fallBackId = (int)$_GET['fallback_id'];
+            /**
+             * FIXME: The default content-security-policy of ownCloud forbids inline
+             * JavaScript for security reasons. IE starting on Windows 10 will
+             * however also obey the CSP which will break the event source fallback.
+             *
+             * As a workaround thus we set a custom policy which allows the execution
+             * of inline JavaScript.
+             *
+             * @link https://github.com/owncloud/core/issues/14286
+             */
+            header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
+            header("Content-Type: text/html");
+            echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
+        } else {
+            header("Content-Type: text/event-stream");
+        }
+        if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+            header('Location: '.\OC::$WEBROOT);
+            exit();
+        }
+        if (!\OC::$server->getRequest()->passesCSRFCheck()) {
+            $this->send('error', 'Possible CSRF attack. Connection will be closed.');
+            $this->close();
+            exit();
+        }
+        flush();
+    }
 
-	/**
-	 * send a message to the client
-	 *
-	 * @param string $type
-	 * @param mixed $data
-	 *
-	 * @throws \BadMethodCallException
-	 * if only one parameter is given, a typeless message will be send with that parameter as data
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public function send($type, $data = null) {
-		if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
-			throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
-		}
-		$this->init();
-		if (is_null($data)) {
-			$data = $type;
-			$type = null;
-		}
-		if ($this->fallback) {
-			$response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				. $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
-			echo $response;
-		} else {
-			if ($type) {
-				echo 'event: ' . $type . PHP_EOL;
-			}
-			echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
-		}
-		echo PHP_EOL;
-		flush();
-	}
+    /**
+     * send a message to the client
+     *
+     * @param string $type
+     * @param mixed $data
+     *
+     * @throws \BadMethodCallException
+     * if only one parameter is given, a typeless message will be send with that parameter as data
+     * @suppress PhanDeprecatedFunction
+     */
+    public function send($type, $data = null) {
+        if ($data and !preg_match('/^[A-Za-z0-9_]+$/', $type)) {
+            throw new BadMethodCallException('Type needs to be alphanumeric ('. $type .')');
+        }
+        $this->init();
+        if (is_null($data)) {
+            $data = $type;
+            $type = null;
+        }
+        if ($this->fallback) {
+            $response = '<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
+                . $this->fallBackId . ',"' . $type . '",' . OC_JSON::encode($data) . ')</script>' . PHP_EOL;
+            echo $response;
+        } else {
+            if ($type) {
+                echo 'event: ' . $type . PHP_EOL;
+            }
+            echo 'data: ' . OC_JSON::encode($data) . PHP_EOL;
+        }
+        echo PHP_EOL;
+        flush();
+    }
 
-	/**
-	 * close the connection of the event source
-	 */
-	public function close() {
-		$this->send('__internal__', 'close'); //server side closing can be an issue, let the client do it
-	}
+    /**
+     * close the connection of the event source
+     */
+    public function close() {
+        $this->send('__internal__', 'close'); //server side closing can be an issue, let the client do it
+    }
 }

lib/private/legacy/OC_JSON.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
 	public static function checkAppEnabled($app) {
 		if (!\OC::$server->getAppManager()->isEnabledForUser($app)) {
 			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' ]]);
+			self::error(['data' => ['message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled']]);
 			exit();
 		}
 	}
@@ -60,7 +60,7 @@ 
 			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
 			$l = \OC::$server->getL10N('lib');
 			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
+			self::error(['data' => ['message' => $l->t('Authentication error'), 'error' => 'authentication_error']]);
 			exit();
 		}
 	}
@@ -78,7 +78,7 @@ 
 
 		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
 			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' ]]);
+			self::error(['data' => ['message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired']]);
 			exit();
 		}
 	}
@@ -91,7 +91,7 @@ 
 	public static function checkAdminUser() {
 		if (!OC_User::isAdminUser(OC_User::getUser())) {
 			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
+			self::error(['data' => ['message' => $l->t('Authentication error'), 'error' => 'authentication_error']]);
 			exit();
 		}
 	}
@@ -123,7 +123,7 @@ 
 	 */
 	protected static function to_string(&$value) {
 		if ($value instanceof \OC\L10N\L10NString) {
-			$value = (string)$value;
+			$value = (string) $value;
 		}
 	}
 

Indentation +96 added lines, -96 removed lines

@@ -28,108 +28,108 @@
  *
  */
 class OC_JSON {
-	/**
-	 * Check if the app is enabled, send json error msg if not
-	 * @param string $app
-	 * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAppEnabled($app) {
-		if (!\OC::$server->getAppManager()->isEnabledForUser($app)) {
-			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' ]]);
-			exit();
-		}
-	}
+    /**
+     * Check if the app is enabled, send json error msg if not
+     * @param string $app
+     * @deprecated Use the AppFramework instead. It will automatically check if the app is enabled.
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAppEnabled($app) {
+        if (!\OC::$server->getAppManager()->isEnabledForUser($app)) {
+            $l = \OC::$server->getL10N('lib');
+            self::error([ 'data' => [ 'message' => $l->t('Application is not enabled'), 'error' => 'application_not_enabled' ]]);
+            exit();
+        }
+    }
 
-	/**
-	 * Check if the user is logged in, send json error msg if not
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkLoggedIn() {
-		$twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
-		if (!\OC::$server->getUserSession()->isLoggedIn()
-			|| $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
-			$l = \OC::$server->getL10N('lib');
-			http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
-			self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
-			exit();
-		}
-	}
+    /**
+     * Check if the user is logged in, send json error msg if not
+     * @deprecated Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkLoggedIn() {
+        $twoFactorAuthManger = \OC::$server->getTwoFactorAuthManager();
+        if (!\OC::$server->getUserSession()->isLoggedIn()
+            || $twoFactorAuthManger->needsSecondFactor(\OC::$server->getUserSession()->getUser())) {
+            $l = \OC::$server->getL10N('lib');
+            http_response_code(\OCP\AppFramework\Http::STATUS_UNAUTHORIZED);
+            self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
+            exit();
+        }
+    }
 
-	/**
-	 * Check an ajax get/post call if the request token is valid, send json error msg if not.
-	 * @deprecated Use annotation based CSRF checks from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function callCheck() {
-		if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
-			header('Location: '.\OC::$WEBROOT);
-			exit();
-		}
+    /**
+     * Check an ajax get/post call if the request token is valid, send json error msg if not.
+     * @deprecated Use annotation based CSRF checks from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function callCheck() {
+        if (!\OC::$server->getRequest()->passesStrictCookieCheck()) {
+            header('Location: '.\OC::$WEBROOT);
+            exit();
+        }
 
-		if (!\OC::$server->getRequest()->passesCSRFCheck()) {
-			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' ]]);
-			exit();
-		}
-	}
+        if (!\OC::$server->getRequest()->passesCSRFCheck()) {
+            $l = \OC::$server->getL10N('lib');
+            self::error([ 'data' => [ 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' ]]);
+            exit();
+        }
+    }
 
-	/**
-	 * Check if the user is a admin, send json error msg if not.
-	 * @deprecated Use annotation based ACLs from the AppFramework instead
-	 * @suppress PhanDeprecatedFunction
-	 */
-	public static function checkAdminUser() {
-		if (!OC_User::isAdminUser(OC_User::getUser())) {
-			$l = \OC::$server->getL10N('lib');
-			self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
-			exit();
-		}
-	}
+    /**
+     * Check if the user is a admin, send json error msg if not.
+     * @deprecated Use annotation based ACLs from the AppFramework instead
+     * @suppress PhanDeprecatedFunction
+     */
+    public static function checkAdminUser() {
+        if (!OC_User::isAdminUser(OC_User::getUser())) {
+            $l = \OC::$server->getL10N('lib');
+            self::error([ 'data' => [ 'message' => $l->t('Authentication error'), 'error' => 'authentication_error' ]]);
+            exit();
+        }
+    }
 
-	/**
-	 * Send json error msg
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 * @psalm-taint-escape html
-	 */
-	public static function error($data = []) {
-		$data['status'] = 'error';
-		header('Content-Type: application/json; charset=utf-8');
-		echo self::encode($data);
-	}
+    /**
+     * Send json error msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     * @psalm-taint-escape html
+     */
+    public static function error($data = []) {
+        $data['status'] = 'error';
+        header('Content-Type: application/json; charset=utf-8');
+        echo self::encode($data);
+    }
 
-	/**
-	 * Send json success msg
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 * @suppress PhanDeprecatedFunction
-	 * @psalm-taint-escape html
-	 */
-	public static function success($data = []) {
-		$data['status'] = 'success';
-		header('Content-Type: application/json; charset=utf-8');
-		echo self::encode($data);
-	}
+    /**
+     * Send json success msg
+     * @deprecated Use a AppFramework JSONResponse instead
+     * @suppress PhanDeprecatedFunction
+     * @psalm-taint-escape html
+     */
+    public static function success($data = []) {
+        $data['status'] = 'success';
+        header('Content-Type: application/json; charset=utf-8');
+        echo self::encode($data);
+    }
 
-	/**
-	 * Convert OC_L10N_String to string, for use in json encodings
-	 */
-	protected static function to_string(&$value) {
-		if ($value instanceof \OC\L10N\L10NString) {
-			$value = (string)$value;
-		}
-	}
+    /**
+     * Convert OC_L10N_String to string, for use in json encodings
+     */
+    protected static function to_string(&$value) {
+        if ($value instanceof \OC\L10N\L10NString) {
+            $value = (string)$value;
+        }
+    }
 
-	/**
-	 * Encode JSON
-	 * @deprecated Use a AppFramework JSONResponse instead
-	 */
-	public static function encode($data) {
-		if (is_array($data)) {
-			array_walk_recursive($data, ['OC_JSON', 'to_string']);
-		}
-		return json_encode($data, JSON_HEX_TAG);
-	}
+    /**
+     * Encode JSON
+     * @deprecated Use a AppFramework JSONResponse instead
+     */
+    public static function encode($data) {
+        if (is_array($data)) {
+            array_walk_recursive($data, ['OC_JSON', 'to_string']);
+        }
+        return json_encode($data, JSON_HEX_TAG);
+    }
 }

apps/user_ldap/lib/Notification/Notifier.php

Indentation +61 added lines, -61 removed lines

@@ -31,72 +31,72 @@
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	protected $l10nFactory;
+    /** @var IFactory */
+    protected $l10nFactory;
 
-	/**
-	 * @param IFactory $l10nFactory
-	 */
-	public function __construct(\OCP\L10N\IFactory $l10nFactory) {
-		$this->l10nFactory = $l10nFactory;
-	}
+    /**
+     * @param IFactory $l10nFactory
+     */
+    public function __construct(\OCP\L10N\IFactory $l10nFactory) {
+        $this->l10nFactory = $l10nFactory;
+    }
 
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'user_ldap';
-	}
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'user_ldap';
+    }
 
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->l10nFactory->get('user_ldap')->t('LDAP User backend');
-	}
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->l10nFactory->get('user_ldap')->t('LDAP User backend');
+    }
 
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 */
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'user_ldap') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     */
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'user_ldap') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
 
-		// Read the language from the notification
-		$l = $this->l10nFactory->get('user_ldap', $languageCode);
+        // Read the language from the notification
+        $l = $this->l10nFactory->get('user_ldap', $languageCode);
 
-		switch ($notification->getSubject()) {
-			// Deal with known subjects
-			case 'pwd_exp_warn_days':
-				$params = $notification->getSubjectParameters();
-				$days = (int) $params[0];
-				if ($days === 2) {
-					$notification->setParsedSubject($l->t('Your password will expire tomorrow.'));
-				} elseif ($days === 1) {
-					$notification->setParsedSubject($l->t('Your password will expire today.'));
-				} else {
-					$notification->setParsedSubject($l->n(
-						'Your password will expire within %n day.',
-						'Your password will expire within %n days.',
-						$days
-					));
-				}
-				return $notification;
+        switch ($notification->getSubject()) {
+            // Deal with known subjects
+            case 'pwd_exp_warn_days':
+                $params = $notification->getSubjectParameters();
+                $days = (int) $params[0];
+                if ($days === 2) {
+                    $notification->setParsedSubject($l->t('Your password will expire tomorrow.'));
+                } elseif ($days === 1) {
+                    $notification->setParsedSubject($l->t('Your password will expire today.'));
+                } else {
+                    $notification->setParsedSubject($l->n(
+                        'Your password will expire within %n day.',
+                        'Your password will expire within %n days.',
+                        $days
+                    ));
+                }
+                return $notification;
 
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
 }

apps/user_ldap/lib/GroupPluginManager.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		$this->respondToActions |= $respondToActions;
 
 		foreach ($this->which as $action => $v) {
-			if ((bool)($respondToActions & $action)) {
+			if ((bool) ($respondToActions & $action)) {
 				$this->which[$action] = $plugin;
 				\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
 			}
@@ -147,7 +147,7 @@ 
 		$plugin = $this->which[GroupInterface::COUNT_USERS];
 
 		if ($plugin) {
-			return $plugin->countUsersInGroup($gid,$search);
+			return $plugin->countUsersInGroup($gid, $search);
 		}
 		throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
 	}

Indentation +157 added lines, -157 removed lines

@@ -26,161 +26,161 @@
 use OCP\GroupInterface;
 
 class GroupPluginManager {
-	private int $respondToActions = 0;
-
-	/** @var array<int, ?ILDAPGroupPlugin> */
-	private array $which = [
-		GroupInterface::CREATE_GROUP => null,
-		GroupInterface::DELETE_GROUP => null,
-		GroupInterface::ADD_TO_GROUP => null,
-		GroupInterface::REMOVE_FROM_GROUP => null,
-		GroupInterface::COUNT_USERS => null,
-		GroupInterface::GROUP_DETAILS => null
-	];
-
-	private bool $suppressDeletion = false;
-
-	/**
-	 * @return int All implemented actions
-	 */
-	public function getImplementedActions() {
-		return $this->respondToActions;
-	}
-
-	/**
-	 * Registers a group plugin that may implement some actions, overriding User_LDAP's group actions.
-	 * @param ILDAPGroupPlugin $plugin
-	 */
-	public function register(ILDAPGroupPlugin $plugin) {
-		$respondToActions = $plugin->respondToActions();
-		$this->respondToActions |= $respondToActions;
-
-		foreach ($this->which as $action => $v) {
-			if ((bool)($respondToActions & $action)) {
-				$this->which[$action] = $plugin;
-				\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
-			}
-		}
-	}
-
-	/**
-	 * Signal if there is a registered plugin that implements some given actions
-	 * @param int $actions Actions defined in \OCP\GroupInterface, like GroupInterface::REMOVE_FROM_GROUP
-	 * @return bool
-	 */
-	public function implementsActions($actions) {
-		return ($actions & $this->respondToActions) == $actions;
-	}
-
-	/**
-	 * Create a group
-	 * @param string $gid Group Id
-	 * @return string | null The group DN if group creation was successful.
-	 * @throws \Exception
-	 */
-	public function createGroup($gid) {
-		$plugin = $this->which[GroupInterface::CREATE_GROUP];
-
-		if ($plugin) {
-			return $plugin->createGroup($gid);
-		}
-		throw new \Exception('No plugin implements createGroup in this LDAP Backend.');
-	}
-
-	public function canDeleteGroup(): bool {
-		return !$this->suppressDeletion && $this->implementsActions(GroupInterface::DELETE_GROUP);
-	}
-
-	/**
-	 * @return bool – the value before the change
-	 */
-	public function setSuppressDeletion(bool $value): bool {
-		$old = $this->suppressDeletion;
-		$this->suppressDeletion = $value;
-		return $old;
-	}
-
-	/**
-	 * Delete a group
-	 *
-	 * @throws \Exception
-	 */
-	public function deleteGroup(string $gid): bool {
-		$plugin = $this->which[GroupInterface::DELETE_GROUP];
-
-		if ($plugin) {
-			if ($this->suppressDeletion) {
-				return false;
-			}
-			return $plugin->deleteGroup($gid);
-		}
-		throw new \Exception('No plugin implements deleteGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * Add a user to a group
-	 * @param string $uid ID of the user to add to group
-	 * @param string $gid ID of the group in which add the user
-	 * @return bool
-	 * @throws \Exception
-	 *
-	 * Adds a user to a group.
-	 */
-	public function addToGroup($uid, $gid) {
-		$plugin = $this->which[GroupInterface::ADD_TO_GROUP];
-
-		if ($plugin) {
-			return $plugin->addToGroup($uid, $gid);
-		}
-		throw new \Exception('No plugin implements addToGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * Removes a user from a group
-	 * @param string $uid ID of the user to remove from group
-	 * @param string $gid ID of the group from which remove the user
-	 * @return bool
-	 * @throws \Exception
-	 *
-	 * removes the user from a group.
-	 */
-	public function removeFromGroup($uid, $gid) {
-		$plugin = $this->which[GroupInterface::REMOVE_FROM_GROUP];
-
-		if ($plugin) {
-			return $plugin->removeFromGroup($uid, $gid);
-		}
-		throw new \Exception('No plugin implements removeFromGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * get the number of all users matching the search string in a group
-	 * @param string $gid ID of the group
-	 * @param string $search query string
-	 * @return int|false
-	 * @throws \Exception
-	 */
-	public function countUsersInGroup($gid, $search = '') {
-		$plugin = $this->which[GroupInterface::COUNT_USERS];
-
-		if ($plugin) {
-			return $plugin->countUsersInGroup($gid,$search);
-		}
-		throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
-	}
-
-	/**
-	 * get an array with group details
-	 * @param string $gid
-	 * @return array|false
-	 * @throws \Exception
-	 */
-	public function getGroupDetails($gid) {
-		$plugin = $this->which[GroupInterface::GROUP_DETAILS];
-
-		if ($plugin) {
-			return $plugin->getGroupDetails($gid);
-		}
-		throw new \Exception('No plugin implements getGroupDetails in this LDAP Backend.');
-	}
+    private int $respondToActions = 0;
+
+    /** @var array<int, ?ILDAPGroupPlugin> */
+    private array $which = [
+        GroupInterface::CREATE_GROUP => null,
+        GroupInterface::DELETE_GROUP => null,
+        GroupInterface::ADD_TO_GROUP => null,
+        GroupInterface::REMOVE_FROM_GROUP => null,
+        GroupInterface::COUNT_USERS => null,
+        GroupInterface::GROUP_DETAILS => null
+    ];
+
+    private bool $suppressDeletion = false;
+
+    /**
+     * @return int All implemented actions
+     */
+    public function getImplementedActions() {
+        return $this->respondToActions;
+    }
+
+    /**
+     * Registers a group plugin that may implement some actions, overriding User_LDAP's group actions.
+     * @param ILDAPGroupPlugin $plugin
+     */
+    public function register(ILDAPGroupPlugin $plugin) {
+        $respondToActions = $plugin->respondToActions();
+        $this->respondToActions |= $respondToActions;
+
+        foreach ($this->which as $action => $v) {
+            if ((bool)($respondToActions & $action)) {
+                $this->which[$action] = $plugin;
+                \OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
+            }
+        }
+    }
+
+    /**
+     * Signal if there is a registered plugin that implements some given actions
+     * @param int $actions Actions defined in \OCP\GroupInterface, like GroupInterface::REMOVE_FROM_GROUP
+     * @return bool
+     */
+    public function implementsActions($actions) {
+        return ($actions & $this->respondToActions) == $actions;
+    }
+
+    /**
+     * Create a group
+     * @param string $gid Group Id
+     * @return string | null The group DN if group creation was successful.
+     * @throws \Exception
+     */
+    public function createGroup($gid) {
+        $plugin = $this->which[GroupInterface::CREATE_GROUP];
+
+        if ($plugin) {
+            return $plugin->createGroup($gid);
+        }
+        throw new \Exception('No plugin implements createGroup in this LDAP Backend.');
+    }
+
+    public function canDeleteGroup(): bool {
+        return !$this->suppressDeletion && $this->implementsActions(GroupInterface::DELETE_GROUP);
+    }
+
+    /**
+     * @return bool – the value before the change
+     */
+    public function setSuppressDeletion(bool $value): bool {
+        $old = $this->suppressDeletion;
+        $this->suppressDeletion = $value;
+        return $old;
+    }
+
+    /**
+     * Delete a group
+     *
+     * @throws \Exception
+     */
+    public function deleteGroup(string $gid): bool {
+        $plugin = $this->which[GroupInterface::DELETE_GROUP];
+
+        if ($plugin) {
+            if ($this->suppressDeletion) {
+                return false;
+            }
+            return $plugin->deleteGroup($gid);
+        }
+        throw new \Exception('No plugin implements deleteGroup in this LDAP Backend.');
+    }
+
+    /**
+     * Add a user to a group
+     * @param string $uid ID of the user to add to group
+     * @param string $gid ID of the group in which add the user
+     * @return bool
+     * @throws \Exception
+     *
+     * Adds a user to a group.
+     */
+    public function addToGroup($uid, $gid) {
+        $plugin = $this->which[GroupInterface::ADD_TO_GROUP];
+
+        if ($plugin) {
+            return $plugin->addToGroup($uid, $gid);
+        }
+        throw new \Exception('No plugin implements addToGroup in this LDAP Backend.');
+    }
+
+    /**
+     * Removes a user from a group
+     * @param string $uid ID of the user to remove from group
+     * @param string $gid ID of the group from which remove the user
+     * @return bool
+     * @throws \Exception
+     *
+     * removes the user from a group.
+     */
+    public function removeFromGroup($uid, $gid) {
+        $plugin = $this->which[GroupInterface::REMOVE_FROM_GROUP];
+
+        if ($plugin) {
+            return $plugin->removeFromGroup($uid, $gid);
+        }
+        throw new \Exception('No plugin implements removeFromGroup in this LDAP Backend.');
+    }
+
+    /**
+     * get the number of all users matching the search string in a group
+     * @param string $gid ID of the group
+     * @param string $search query string
+     * @return int|false
+     * @throws \Exception
+     */
+    public function countUsersInGroup($gid, $search = '') {
+        $plugin = $this->which[GroupInterface::COUNT_USERS];
+
+        if ($plugin) {
+            return $plugin->countUsersInGroup($gid,$search);
+        }
+        throw new \Exception('No plugin implements countUsersInGroup in this LDAP Backend.');
+    }
+
+    /**
+     * get an array with group details
+     * @param string $gid
+     * @return array|false
+     * @throws \Exception
+     */
+    public function getGroupDetails($gid) {
+        $plugin = $this->which[GroupInterface::GROUP_DETAILS];
+
+        if ($plugin) {
+            return $plugin->getGroupDetails($gid);
+        }
+        throw new \Exception('No plugin implements getGroupDetails in this LDAP Backend.');
+    }
 }

apps/user_ldap/lib/Handler/ExtStorageConfigHandler.php

Indentation +29 added lines, -29 removed lines

@@ -30,40 +30,40 @@
 use OCA\User_LDAP\User_Proxy;
 
 class ExtStorageConfigHandler extends UserContext implements IConfigHandler {
-	use SimpleSubstitutionTrait;
+    use SimpleSubstitutionTrait;
 
-	/**
-	 * @param mixed $optionValue
-	 * @return mixed the same type as $optionValue
-	 * @since 16.0.0
-	 * @throws \Exception
-	 */
-	public function handle($optionValue) {
-		$this->placeholder = 'home';
-		$user = $this->getUser();
+    /**
+     * @param mixed $optionValue
+     * @return mixed the same type as $optionValue
+     * @since 16.0.0
+     * @throws \Exception
+     */
+    public function handle($optionValue) {
+        $this->placeholder = 'home';
+        $user = $this->getUser();
 
-		if ($user === null) {
-			return $optionValue;
-		}
+        if ($user === null) {
+            return $optionValue;
+        }
 
-		$backend = $user->getBackend();
-		if (!$backend instanceof User_Proxy) {
-			return $optionValue;
-		}
+        $backend = $user->getBackend();
+        if (!$backend instanceof User_Proxy) {
+            return $optionValue;
+        }
 
-		$access = $backend->getLDAPAccess($user->getUID());
-		if (!$access) {
-			return $optionValue;
-		}
+        $access = $backend->getLDAPAccess($user->getUID());
+        if (!$access) {
+            return $optionValue;
+        }
 
-		$attribute = $access->connection->ldapExtStorageHomeAttribute;
-		if (empty($attribute)) {
-			return $optionValue;
-		}
+        $attribute = $access->connection->ldapExtStorageHomeAttribute;
+        if (empty($attribute)) {
+            return $optionValue;
+        }
 
-		$ldapUser = $access->userManager->get($user->getUID());
-		$extHome = $ldapUser->getExtStorageHome();
+        $ldapUser = $access->userManager->get($user->getUID());
+        $extHome = $ldapUser->getExtStorageHome();
 
-		return $this->processInput($optionValue, $extHome);
-	}
+        return $this->processInput($optionValue, $extHome);
+    }
 }

apps/user_ldap/lib/User/DeletedUsersIndex.php

Spacing +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
 			return;
 		}
 		$this->config->setUserValue($ocName, 'user_ldap', 'isDeleted', '1');
-		$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string)time());
+		$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string) time());
 		$this->deletedUsers = null;
 	}
 }

Indentation +69 added lines, -69 removed lines

@@ -33,82 +33,82 @@
  * @package OCA\User_LDAP
  */
 class DeletedUsersIndex {
-	/**
-	 * @var \OCP\IConfig $config
-	 */
-	protected $config;
+    /**
+     * @var \OCP\IConfig $config
+     */
+    protected $config;
 
-	/**
-	 * @var \OCA\User_LDAP\Mapping\UserMapping $mapping
-	 */
-	protected $mapping;
+    /**
+     * @var \OCA\User_LDAP\Mapping\UserMapping $mapping
+     */
+    protected $mapping;
 
-	/**
-	 * @var array $deletedUsers
-	 */
-	protected $deletedUsers;
-	/** @var IManager */
-	private $shareManager;
+    /**
+     * @var array $deletedUsers
+     */
+    protected $deletedUsers;
+    /** @var IManager */
+    private $shareManager;
 
-	public function __construct(\OCP\IConfig $config, UserMapping $mapping, IManager $shareManager) {
-		$this->config = $config;
-		$this->mapping = $mapping;
-		$this->shareManager = $shareManager;
-	}
+    public function __construct(\OCP\IConfig $config, UserMapping $mapping, IManager $shareManager) {
+        $this->config = $config;
+        $this->mapping = $mapping;
+        $this->shareManager = $shareManager;
+    }
 
-	/**
-	 * reads LDAP users marked as deleted from the database
-	 * @return \OCA\User_LDAP\User\OfflineUser[]
-	 */
-	private function fetchDeletedUsers() {
-		$deletedUsers = $this->config->getUsersForUserValue(
-			'user_ldap', 'isDeleted', '1');
+    /**
+     * reads LDAP users marked as deleted from the database
+     * @return \OCA\User_LDAP\User\OfflineUser[]
+     */
+    private function fetchDeletedUsers() {
+        $deletedUsers = $this->config->getUsersForUserValue(
+            'user_ldap', 'isDeleted', '1');
 
-		$userObjects = [];
-		foreach ($deletedUsers as $user) {
-			$userObjects[] = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager);
-		}
-		$this->deletedUsers = $userObjects;
+        $userObjects = [];
+        foreach ($deletedUsers as $user) {
+            $userObjects[] = new OfflineUser($user, $this->config, $this->mapping, $this->shareManager);
+        }
+        $this->deletedUsers = $userObjects;
 
-		return $this->deletedUsers;
-	}
+        return $this->deletedUsers;
+    }
 
-	/**
-	 * returns all LDAP users that are marked as deleted
-	 * @return \OCA\User_LDAP\User\OfflineUser[]
-	 */
-	public function getUsers() {
-		if (is_array($this->deletedUsers)) {
-			return $this->deletedUsers;
-		}
-		return $this->fetchDeletedUsers();
-	}
+    /**
+     * returns all LDAP users that are marked as deleted
+     * @return \OCA\User_LDAP\User\OfflineUser[]
+     */
+    public function getUsers() {
+        if (is_array($this->deletedUsers)) {
+            return $this->deletedUsers;
+        }
+        return $this->fetchDeletedUsers();
+    }
 
-	/**
-	 * whether at least one user was detected as deleted
-	 * @return bool
-	 */
-	public function hasUsers() {
-		if (!is_array($this->deletedUsers)) {
-			$this->fetchDeletedUsers();
-		}
-		return is_array($this->deletedUsers) && (count($this->deletedUsers) > 0);
-	}
+    /**
+     * whether at least one user was detected as deleted
+     * @return bool
+     */
+    public function hasUsers() {
+        if (!is_array($this->deletedUsers)) {
+            $this->fetchDeletedUsers();
+        }
+        return is_array($this->deletedUsers) && (count($this->deletedUsers) > 0);
+    }
 
-	/**
-	 * marks a user as deleted
-	 *
-	 * @param string $ocName
-	 * @throws \OCP\PreConditionNotMetException
-	 */
-	public function markUser($ocName) {
-		$curValue = $this->config->getUserValue($ocName, 'user_ldap', 'isDeleted', '0');
-		if ($curValue === '1') {
-			// the user is already marked, do not write to DB again
-			return;
-		}
-		$this->config->setUserValue($ocName, 'user_ldap', 'isDeleted', '1');
-		$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string)time());
-		$this->deletedUsers = null;
-	}
+    /**
+     * marks a user as deleted
+     *
+     * @param string $ocName
+     * @throws \OCP\PreConditionNotMetException
+     */
+    public function markUser($ocName) {
+        $curValue = $this->config->getUserValue($ocName, 'user_ldap', 'isDeleted', '0');
+        if ($curValue === '1') {
+            // the user is already marked, do not write to DB again
+            return;
+        }
+        $this->config->setUserValue($ocName, 'user_ldap', 'isDeleted', '1');
+        $this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string)time());
+        $this->deletedUsers = null;
+    }
 }

apps/user_ldap/lib/Controller/ConfigAPIController.php

Spacing +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 
 			$config = new Configuration($configID);
 			$data = $config->getConfiguration();
-			if (!(int)$showPassword) {
+			if (!(int) $showPassword) {
 				$data['ldapAgentPassword'] = '***';
 			}
 			foreach ($data as $key => $value) {

Indentation +270 added lines, -270 removed lines

@@ -40,292 +40,292 @@
 
 class ConfigAPIController extends OCSController {
 
-	/** @var Helper */
-	private $ldapHelper;
+    /** @var Helper */
+    private $ldapHelper;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var ConnectionFactory */
-	private $connectionFactory;
+    /** @var ConnectionFactory */
+    private $connectionFactory;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		CapabilitiesManager $capabilitiesManager,
-		IUserSession $userSession,
-		IUserManager $userManager,
-		Manager $keyManager,
-		Helper $ldapHelper,
-		ILogger $logger,
-		ConnectionFactory $connectionFactory
-	) {
-		parent::__construct(
-			$appName,
-			$request,
-			$capabilitiesManager,
-			$userSession,
-			$userManager,
-			$keyManager
-		);
+    public function __construct(
+        $appName,
+        IRequest $request,
+        CapabilitiesManager $capabilitiesManager,
+        IUserSession $userSession,
+        IUserManager $userManager,
+        Manager $keyManager,
+        Helper $ldapHelper,
+        ILogger $logger,
+        ConnectionFactory $connectionFactory
+    ) {
+        parent::__construct(
+            $appName,
+            $request,
+            $capabilitiesManager,
+            $userSession,
+            $userManager,
+            $keyManager
+        );
 
 
-		$this->ldapHelper = $ldapHelper;
-		$this->logger = $logger;
-		$this->connectionFactory = $connectionFactory;
-	}
+        $this->ldapHelper = $ldapHelper;
+        $this->logger = $logger;
+        $this->connectionFactory = $connectionFactory;
+    }
 
-	/**
-	 * Creates a new (empty) configuration and returns the resulting prefix
-	 *
-	 * Example: curl -X POST -H "OCS-APIREQUEST: true"  -u $admin:$password \
-	 *   https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config
-	 *
-	 * results in:
-	 *
-	 * <?xml version="1.0"?>
-	 * <ocs>
-	 *   <meta>
-	 *     <status>ok</status>
-	 *     <statuscode>200</statuscode>
-	 *     <message>OK</message>
-	 *   </meta>
-	 *   <data>
-	 *     <configID>s40</configID>
-	 *   </data>
-	 * </ocs>
-	 *
-	 * Failing example: if an exception is thrown (e.g. Database connection lost)
-	 * the detailed error will be logged. The output will then look like:
-	 *
-	 * <?xml version="1.0"?>
-	 * <ocs>
-	 *   <meta>
-	 *     <status>failure</status>
-	 *     <statuscode>999</statuscode>
-	 *     <message>An issue occurred when creating the new config.</message>
-	 *   </meta>
-	 *   <data/>
-	 * </ocs>
-	 *
-	 * For JSON output provide the format=json parameter
-	 *
-	 * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function create() {
-		try {
-			$configPrefix = $this->ldapHelper->getNextServerConfigurationPrefix();
-			$configHolder = new Configuration($configPrefix);
-			$configHolder->ldapConfigurationActive = false;
-			$configHolder->saveConfiguration();
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			throw new OCSException('An issue occurred when creating the new config.');
-		}
-		return new DataResponse(['configID' => $configPrefix]);
-	}
+    /**
+     * Creates a new (empty) configuration and returns the resulting prefix
+     *
+     * Example: curl -X POST -H "OCS-APIREQUEST: true"  -u $admin:$password \
+     *   https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config
+     *
+     * results in:
+     *
+     * <?xml version="1.0"?>
+     * <ocs>
+     *   <meta>
+     *     <status>ok</status>
+     *     <statuscode>200</statuscode>
+     *     <message>OK</message>
+     *   </meta>
+     *   <data>
+     *     <configID>s40</configID>
+     *   </data>
+     * </ocs>
+     *
+     * Failing example: if an exception is thrown (e.g. Database connection lost)
+     * the detailed error will be logged. The output will then look like:
+     *
+     * <?xml version="1.0"?>
+     * <ocs>
+     *   <meta>
+     *     <status>failure</status>
+     *     <statuscode>999</statuscode>
+     *     <message>An issue occurred when creating the new config.</message>
+     *   </meta>
+     *   <data/>
+     * </ocs>
+     *
+     * For JSON output provide the format=json parameter
+     *
+     * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function create() {
+        try {
+            $configPrefix = $this->ldapHelper->getNextServerConfigurationPrefix();
+            $configHolder = new Configuration($configPrefix);
+            $configHolder->ldapConfigurationActive = false;
+            $configHolder->saveConfiguration();
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            throw new OCSException('An issue occurred when creating the new config.');
+        }
+        return new DataResponse(['configID' => $configPrefix]);
+    }
 
-	/**
-	 * Deletes a LDAP configuration, if present.
-	 *
-	 * Example:
-	 *   curl -X DELETE -H "OCS-APIREQUEST: true" -u $admin:$password \
-	 *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
-	 *
-	 * <?xml version="1.0"?>
-	 * <ocs>
-	 *   <meta>
-	 *     <status>ok</status>
-	 *     <statuscode>200</statuscode>
-	 *     <message>OK</message>
-	 *   </meta>
-	 *   <data/>
-	 * </ocs>
-	 *
-	 * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
-	 * @param string $configID
-	 * @return DataResponse
-	 * @throws OCSBadRequestException
-	 * @throws OCSException
-	 */
-	public function delete($configID) {
-		try {
-			$this->ensureConfigIDExists($configID);
-			if (!$this->ldapHelper->deleteServerConfiguration($configID)) {
-				throw new OCSException('Could not delete configuration');
-			}
-		} catch (OCSException $e) {
-			throw $e;
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			throw new OCSException('An issue occurred when deleting the config.');
-		}
+    /**
+     * Deletes a LDAP configuration, if present.
+     *
+     * Example:
+     *   curl -X DELETE -H "OCS-APIREQUEST: true" -u $admin:$password \
+     *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
+     *
+     * <?xml version="1.0"?>
+     * <ocs>
+     *   <meta>
+     *     <status>ok</status>
+     *     <statuscode>200</statuscode>
+     *     <message>OK</message>
+     *   </meta>
+     *   <data/>
+     * </ocs>
+     *
+     * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
+     * @param string $configID
+     * @return DataResponse
+     * @throws OCSBadRequestException
+     * @throws OCSException
+     */
+    public function delete($configID) {
+        try {
+            $this->ensureConfigIDExists($configID);
+            if (!$this->ldapHelper->deleteServerConfiguration($configID)) {
+                throw new OCSException('Could not delete configuration');
+            }
+        } catch (OCSException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            throw new OCSException('An issue occurred when deleting the config.');
+        }
 
-		return new DataResponse();
-	}
+        return new DataResponse();
+    }
 
-	/**
-	 * Modifies a configuration
-	 *
-	 * Example:
-	 *   curl -X PUT -d "configData[ldapHost]=ldaps://my.ldap.server&configData[ldapPort]=636" \
-	 *    -H "OCS-APIREQUEST: true" -u $admin:$password \
-	 *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
-	 *
-	 * <?xml version="1.0"?>
-	 * <ocs>
-	 *   <meta>
-	 *     <status>ok</status>
-	 *     <statuscode>200</statuscode>
-	 *     <message>OK</message>
-	 *   </meta>
-	 *   <data/>
-	 * </ocs>
-	 *
-	 * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
-	 * @param string $configID
-	 * @param array $configData
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function modify($configID, $configData) {
-		try {
-			$this->ensureConfigIDExists($configID);
+    /**
+     * Modifies a configuration
+     *
+     * Example:
+     *   curl -X PUT -d "configData[ldapHost]=ldaps://my.ldap.server&configData[ldapPort]=636" \
+     *    -H "OCS-APIREQUEST: true" -u $admin:$password \
+     *    https://nextcloud.server/ocs/v2.php/apps/user_ldap/api/v1/config/s60
+     *
+     * <?xml version="1.0"?>
+     * <ocs>
+     *   <meta>
+     *     <status>ok</status>
+     *     <statuscode>200</statuscode>
+     *     <message>OK</message>
+     *   </meta>
+     *   <data/>
+     * </ocs>
+     *
+     * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
+     * @param string $configID
+     * @param array $configData
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function modify($configID, $configData) {
+        try {
+            $this->ensureConfigIDExists($configID);
 
-			if (!is_array($configData)) {
-				throw new OCSBadRequestException('configData is not properly set');
-			}
+            if (!is_array($configData)) {
+                throw new OCSBadRequestException('configData is not properly set');
+            }
 
-			$configuration = new Configuration($configID);
-			$configKeys = $configuration->getConfigTranslationArray();
+            $configuration = new Configuration($configID);
+            $configKeys = $configuration->getConfigTranslationArray();
 
-			foreach ($configKeys as $i => $key) {
-				if (isset($configData[$key])) {
-					$configuration->$key = $configData[$key];
-				}
-			}
+            foreach ($configKeys as $i => $key) {
+                if (isset($configData[$key])) {
+                    $configuration->$key = $configData[$key];
+                }
+            }
 
-			$configuration->saveConfiguration();
-			$this->connectionFactory->get($configID)->clearCache();
-		} catch (OCSException $e) {
-			throw $e;
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			throw new OCSException('An issue occurred when modifying the config.');
-		}
+            $configuration->saveConfiguration();
+            $this->connectionFactory->get($configID)->clearCache();
+        } catch (OCSException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            throw new OCSException('An issue occurred when modifying the config.');
+        }
 
-		return new DataResponse();
-	}
+        return new DataResponse();
+    }
 
-	/**
-	 * Retrieves a configuration
-	 *
-	 * <?xml version="1.0"?>
-	 * <ocs>
-	 *   <meta>
-	 *     <status>ok</status>
-	 *     <statuscode>200</statuscode>
-	 *     <message>OK</message>
-	 *   </meta>
-	 *   <data>
-	 *     <ldapHost>ldaps://my.ldap.server</ldapHost>
-	 *     <ldapPort>7770</ldapPort>
-	 *     <ldapBackupHost></ldapBackupHost>
-	 *     <ldapBackupPort></ldapBackupPort>
-	 *     <ldapBase>ou=small,dc=my,dc=ldap,dc=server</ldapBase>
-	 *     <ldapBaseUsers>ou=users,ou=small,dc=my,dc=ldap,dc=server</ldapBaseUsers>
-	 *     <ldapBaseGroups>ou=small,dc=my,dc=ldap,dc=server</ldapBaseGroups>
-	 *     <ldapAgentName>cn=root,dc=my,dc=ldap,dc=server</ldapAgentName>
-	 *     <ldapAgentPassword>clearTextWithShowPassword=1</ldapAgentPassword>
-	 *     <ldapTLS>1</ldapTLS>
-	 *     <turnOffCertCheck>0</turnOffCertCheck>
-	 *     <ldapIgnoreNamingRules/>
-	 *     <ldapUserDisplayName>displayname</ldapUserDisplayName>
-	 *     <ldapUserDisplayName2>uid</ldapUserDisplayName2>
-	 *     <ldapUserFilterObjectclass>inetOrgPerson</ldapUserFilterObjectclass>
-	 *     <ldapUserFilterGroups></ldapUserFilterGroups>
-	 *     <ldapUserFilter>(&amp;(objectclass=nextcloudUser)(nextcloudEnabled=TRUE))</ldapUserFilter>
-	 *     <ldapUserFilterMode>1</ldapUserFilterMode>
-	 *     <ldapGroupFilter>(&amp;(|(objectclass=nextcloudGroup)))</ldapGroupFilter>
-	 *     <ldapGroupFilterMode>0</ldapGroupFilterMode>
-	 *     <ldapGroupFilterObjectclass>nextcloudGroup</ldapGroupFilterObjectclass>
-	 *     <ldapGroupFilterGroups></ldapGroupFilterGroups>
-	 *     <ldapGroupDisplayName>cn</ldapGroupDisplayName>
-	 *     <ldapGroupMemberAssocAttr>memberUid</ldapGroupMemberAssocAttr>
-	 *     <ldapLoginFilter>(&amp;(|(objectclass=inetOrgPerson))(uid=%uid))</ldapLoginFilter>
-	 *     <ldapLoginFilterMode>0</ldapLoginFilterMode>
-	 *     <ldapLoginFilterEmail>0</ldapLoginFilterEmail>
-	 *     <ldapLoginFilterUsername>1</ldapLoginFilterUsername>
-	 *     <ldapLoginFilterAttributes></ldapLoginFilterAttributes>
-	 *     <ldapQuotaAttribute></ldapQuotaAttribute>
-	 *     <ldapQuotaDefault></ldapQuotaDefault>
-	 *     <ldapEmailAttribute>mail</ldapEmailAttribute>
-	 *     <ldapCacheTTL>20</ldapCacheTTL>
-	 *     <ldapUuidUserAttribute>auto</ldapUuidUserAttribute>
-	 *     <ldapUuidGroupAttribute>auto</ldapUuidGroupAttribute>
-	 *     <ldapOverrideMainServer></ldapOverrideMainServer>
-	 *     <ldapConfigurationActive>1</ldapConfigurationActive>
-	 *     <ldapAttributesForUserSearch>uid;sn;givenname</ldapAttributesForUserSearch>
-	 *     <ldapAttributesForGroupSearch></ldapAttributesForGroupSearch>
-	 *     <ldapExperiencedAdmin>0</ldapExperiencedAdmin>
-	 *     <homeFolderNamingRule></homeFolderNamingRule>
-	 *     <hasMemberOfFilterSupport></hasMemberOfFilterSupport>
-	 *     <useMemberOfToDetectMembership>1</useMemberOfToDetectMembership>
-	 *     <ldapExpertUsernameAttr>uid</ldapExpertUsernameAttr>
-	 *     <ldapExpertUUIDUserAttr>uid</ldapExpertUUIDUserAttr>
-	 *     <ldapExpertUUIDGroupAttr></ldapExpertUUIDGroupAttr>
-	 *     <lastJpegPhotoLookup>0</lastJpegPhotoLookup>
-	 *     <ldapNestedGroups>0</ldapNestedGroups>
-	 *     <ldapPagingSize>500</ldapPagingSize>
-	 *     <turnOnPasswordChange>1</turnOnPasswordChange>
-	 *     <ldapDynamicGroupMemberURL></ldapDynamicGroupMemberURL>
-	 *   </data>
-	 * </ocs>
-	 *
-	 * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
-	 * @param string $configID
-	 * @param bool|string $showPassword
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function show($configID, $showPassword = false) {
-		try {
-			$this->ensureConfigIDExists($configID);
+    /**
+     * Retrieves a configuration
+     *
+     * <?xml version="1.0"?>
+     * <ocs>
+     *   <meta>
+     *     <status>ok</status>
+     *     <statuscode>200</statuscode>
+     *     <message>OK</message>
+     *   </meta>
+     *   <data>
+     *     <ldapHost>ldaps://my.ldap.server</ldapHost>
+     *     <ldapPort>7770</ldapPort>
+     *     <ldapBackupHost></ldapBackupHost>
+     *     <ldapBackupPort></ldapBackupPort>
+     *     <ldapBase>ou=small,dc=my,dc=ldap,dc=server</ldapBase>
+     *     <ldapBaseUsers>ou=users,ou=small,dc=my,dc=ldap,dc=server</ldapBaseUsers>
+     *     <ldapBaseGroups>ou=small,dc=my,dc=ldap,dc=server</ldapBaseGroups>
+     *     <ldapAgentName>cn=root,dc=my,dc=ldap,dc=server</ldapAgentName>
+     *     <ldapAgentPassword>clearTextWithShowPassword=1</ldapAgentPassword>
+     *     <ldapTLS>1</ldapTLS>
+     *     <turnOffCertCheck>0</turnOffCertCheck>
+     *     <ldapIgnoreNamingRules/>
+     *     <ldapUserDisplayName>displayname</ldapUserDisplayName>
+     *     <ldapUserDisplayName2>uid</ldapUserDisplayName2>
+     *     <ldapUserFilterObjectclass>inetOrgPerson</ldapUserFilterObjectclass>
+     *     <ldapUserFilterGroups></ldapUserFilterGroups>
+     *     <ldapUserFilter>(&amp;(objectclass=nextcloudUser)(nextcloudEnabled=TRUE))</ldapUserFilter>
+     *     <ldapUserFilterMode>1</ldapUserFilterMode>
+     *     <ldapGroupFilter>(&amp;(|(objectclass=nextcloudGroup)))</ldapGroupFilter>
+     *     <ldapGroupFilterMode>0</ldapGroupFilterMode>
+     *     <ldapGroupFilterObjectclass>nextcloudGroup</ldapGroupFilterObjectclass>
+     *     <ldapGroupFilterGroups></ldapGroupFilterGroups>
+     *     <ldapGroupDisplayName>cn</ldapGroupDisplayName>
+     *     <ldapGroupMemberAssocAttr>memberUid</ldapGroupMemberAssocAttr>
+     *     <ldapLoginFilter>(&amp;(|(objectclass=inetOrgPerson))(uid=%uid))</ldapLoginFilter>
+     *     <ldapLoginFilterMode>0</ldapLoginFilterMode>
+     *     <ldapLoginFilterEmail>0</ldapLoginFilterEmail>
+     *     <ldapLoginFilterUsername>1</ldapLoginFilterUsername>
+     *     <ldapLoginFilterAttributes></ldapLoginFilterAttributes>
+     *     <ldapQuotaAttribute></ldapQuotaAttribute>
+     *     <ldapQuotaDefault></ldapQuotaDefault>
+     *     <ldapEmailAttribute>mail</ldapEmailAttribute>
+     *     <ldapCacheTTL>20</ldapCacheTTL>
+     *     <ldapUuidUserAttribute>auto</ldapUuidUserAttribute>
+     *     <ldapUuidGroupAttribute>auto</ldapUuidGroupAttribute>
+     *     <ldapOverrideMainServer></ldapOverrideMainServer>
+     *     <ldapConfigurationActive>1</ldapConfigurationActive>
+     *     <ldapAttributesForUserSearch>uid;sn;givenname</ldapAttributesForUserSearch>
+     *     <ldapAttributesForGroupSearch></ldapAttributesForGroupSearch>
+     *     <ldapExperiencedAdmin>0</ldapExperiencedAdmin>
+     *     <homeFolderNamingRule></homeFolderNamingRule>
+     *     <hasMemberOfFilterSupport></hasMemberOfFilterSupport>
+     *     <useMemberOfToDetectMembership>1</useMemberOfToDetectMembership>
+     *     <ldapExpertUsernameAttr>uid</ldapExpertUsernameAttr>
+     *     <ldapExpertUUIDUserAttr>uid</ldapExpertUUIDUserAttr>
+     *     <ldapExpertUUIDGroupAttr></ldapExpertUUIDGroupAttr>
+     *     <lastJpegPhotoLookup>0</lastJpegPhotoLookup>
+     *     <ldapNestedGroups>0</ldapNestedGroups>
+     *     <ldapPagingSize>500</ldapPagingSize>
+     *     <turnOnPasswordChange>1</turnOnPasswordChange>
+     *     <ldapDynamicGroupMemberURL></ldapDynamicGroupMemberURL>
+     *   </data>
+     * </ocs>
+     *
+     * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
+     * @param string $configID
+     * @param bool|string $showPassword
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function show($configID, $showPassword = false) {
+        try {
+            $this->ensureConfigIDExists($configID);
 
-			$config = new Configuration($configID);
-			$data = $config->getConfiguration();
-			if (!(int)$showPassword) {
-				$data['ldapAgentPassword'] = '***';
-			}
-			foreach ($data as $key => $value) {
-				if (is_array($value)) {
-					$value = implode(';', $value);
-					$data[$key] = $value;
-				}
-			}
-		} catch (OCSException $e) {
-			throw $e;
-		} catch (\Exception $e) {
-			$this->logger->logException($e);
-			throw new OCSException('An issue occurred when modifying the config.');
-		}
+            $config = new Configuration($configID);
+            $data = $config->getConfiguration();
+            if (!(int)$showPassword) {
+                $data['ldapAgentPassword'] = '***';
+            }
+            foreach ($data as $key => $value) {
+                if (is_array($value)) {
+                    $value = implode(';', $value);
+                    $data[$key] = $value;
+                }
+            }
+        } catch (OCSException $e) {
+            throw $e;
+        } catch (\Exception $e) {
+            $this->logger->logException($e);
+            throw new OCSException('An issue occurred when modifying the config.');
+        }
 
-		return new DataResponse($data);
-	}
+        return new DataResponse($data);
+    }
 
-	/**
-	 * If the given config ID is not available, an exception is thrown
-	 *
-	 * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
-	 * @param string $configID
-	 * @throws OCSNotFoundException
-	 */
-	private function ensureConfigIDExists($configID) {
-		$prefixes = $this->ldapHelper->getServerConfigurationPrefixes();
-		if (!in_array($configID, $prefixes, true)) {
-			throw new OCSNotFoundException('Config ID not found');
-		}
-	}
+    /**
+     * If the given config ID is not available, an exception is thrown
+     *
+     * @AuthorizedAdminSetting(settings=OCA\User_LDAP\Settings\Admin)
+     * @param string $configID
+     * @throws OCSNotFoundException
+     */
+    private function ensureConfigIDExists($configID) {
+        $prefixes = $this->ldapHelper->getServerConfigurationPrefixes();
+        if (!in_array($configID, $prefixes, true)) {
+            throw new OCSNotFoundException('Config ID not found');
+        }
+    }
 }