nextcloud / server

lib/public/Files/StorageConnectionException.php

Indentation +11 added lines, -11 removed lines

@@ -27,15 +27,15 @@
  */
 class StorageConnectionException extends StorageNotAvailableException {
 
-	/**
-	 * StorageConnectionException constructor.
-	 *
-	 * @param string $message
-	 * @param \Exception|null $previous
-	 * @since 9.0.0
-	 */
-	public function __construct($message = '', \Exception $previous = null) {
-		$l = \OC::$server->getL10N('core');
-		parent::__construct($l->t('Storage connection error. %s', [$message]), self::STATUS_NETWORK_ERROR, $previous);
-	}
+    /**
+     * StorageConnectionException constructor.
+     *
+     * @param string $message
+     * @param \Exception|null $previous
+     * @since 9.0.0
+     */
+    public function __construct($message = '', \Exception $previous = null) {
+        $l = \OC::$server->getL10N('core');
+        parent::__construct($l->t('Storage connection error. %s', [$message]), self::STATUS_NETWORK_ERROR, $previous);
+    }
 }

settings/Controller/CertificateController.php

Indentation +140 added lines, -140 removed lines

@@ -37,144 +37,144 @@
  * @package OC\Settings\Controller
  */
 class CertificateController extends Controller {
-	/** @var ICertificateManager */
-	private $userCertificateManager;
-	/** @var ICertificateManager  */
-	private $systemCertificateManager;
-	/** @var IL10N */
-	private $l10n;
-	/** @var IAppManager */
-	private $appManager;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ICertificateManager $userCertificateManager
-	 * @param ICertificateManager $systemCertificateManager
-	 * @param IL10N $l10n
-	 * @param IAppManager $appManager
-	 */
-	public function __construct($appName,
-								IRequest $request,
-								ICertificateManager $userCertificateManager,
-								ICertificateManager $systemCertificateManager,
-								IL10N $l10n,
-								IAppManager $appManager) {
-		parent::__construct($appName, $request);
-		$this->userCertificateManager = $userCertificateManager;
-		$this->systemCertificateManager = $systemCertificateManager;
-		$this->l10n = $l10n;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * Add a new personal root certificate to the users' trust store
-	 *
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @return DataResponse
-	 */
-	public function addPersonalRootCertificate() {
-		return $this->addCertificate($this->userCertificateManager);
-	}
-
-	/**
-	 * Add a new root certificate to a trust store
-	 *
-	 * @param ICertificateManager $certificateManager
-	 * @return DataResponse
-	 */
-	private function addCertificate(ICertificateManager $certificateManager) {
-		$headers = [];
-
-		if ($this->isCertificateImportAllowed() === false) {
-			return new DataResponse(['message' => 'Individual certificate management disabled'], Http::STATUS_FORBIDDEN, $headers);
-		}
-
-		$file = $this->request->getUploadedFile('rootcert_import');
-		if (empty($file)) {
-			return new DataResponse(['message' => 'No file uploaded'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
-		}
-
-		try {
-			$certificate = $certificateManager->addCertificate(file_get_contents($file['tmp_name']), $file['name']);
-			return new DataResponse(
-				[
-					'name' => $certificate->getName(),
-					'commonName' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'validFrom' => $certificate->getIssueDate()->getTimestamp(),
-					'validTill' => $certificate->getExpireDate()->getTimestamp(),
-					'validFromString' => $this->l10n->l('date', $certificate->getIssueDate()),
-					'validTillString' => $this->l10n->l('date', $certificate->getExpireDate()),
-					'issuer' => $certificate->getIssuerName(),
-					'issuerOrganization' => $certificate->getIssuerOrganization(),
-				],
-				Http::STATUS_OK,
-				$headers
-			);
-		} catch (\Exception $e) {
-			return new DataResponse(['An error occurred.'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
-		}
-	}
-
-	/**
-	 * Removes a personal root certificate from the users' trust store
-	 *
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @param string $certificateIdentifier
-	 * @return DataResponse
-	 */
-	public function removePersonalRootCertificate($certificateIdentifier) {
-
-		if ($this->isCertificateImportAllowed() === false) {
-			return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->userCertificateManager->removeCertificate($certificateIdentifier);
-		return new DataResponse();
-	}
-
-	/**
-	 * check if certificate import is allowed
-	 *
-	 * @return bool
-	 */
-	protected function isCertificateImportAllowed() {
-		$externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
-		if ($externalStorageEnabled) {
-			/** @var \OCA\Files_External\Service\BackendService $backendService */
-			$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
-			if ($backendService->isUserMountingAllowed()) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Add a new personal root certificate to the system's trust store
-	 *
-	 * @return DataResponse
-	 */
-	public function addSystemRootCertificate() {
-		return $this->addCertificate($this->systemCertificateManager);
-	}
-
-	/**
-	 * Removes a personal root certificate from the users' trust store
-	 *
-	 * @param string $certificateIdentifier
-	 * @return DataResponse
-	 */
-	public function removeSystemRootCertificate($certificateIdentifier) {
-
-		if ($this->isCertificateImportAllowed() === false) {
-			return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
-		}
-
-		$this->systemCertificateManager->removeCertificate($certificateIdentifier);
-		return new DataResponse();
-	}
+    /** @var ICertificateManager */
+    private $userCertificateManager;
+    /** @var ICertificateManager  */
+    private $systemCertificateManager;
+    /** @var IL10N */
+    private $l10n;
+    /** @var IAppManager */
+    private $appManager;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param ICertificateManager $userCertificateManager
+     * @param ICertificateManager $systemCertificateManager
+     * @param IL10N $l10n
+     * @param IAppManager $appManager
+     */
+    public function __construct($appName,
+                                IRequest $request,
+                                ICertificateManager $userCertificateManager,
+                                ICertificateManager $systemCertificateManager,
+                                IL10N $l10n,
+                                IAppManager $appManager) {
+        parent::__construct($appName, $request);
+        $this->userCertificateManager = $userCertificateManager;
+        $this->systemCertificateManager = $systemCertificateManager;
+        $this->l10n = $l10n;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * Add a new personal root certificate to the users' trust store
+     *
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @return DataResponse
+     */
+    public function addPersonalRootCertificate() {
+        return $this->addCertificate($this->userCertificateManager);
+    }
+
+    /**
+     * Add a new root certificate to a trust store
+     *
+     * @param ICertificateManager $certificateManager
+     * @return DataResponse
+     */
+    private function addCertificate(ICertificateManager $certificateManager) {
+        $headers = [];
+
+        if ($this->isCertificateImportAllowed() === false) {
+            return new DataResponse(['message' => 'Individual certificate management disabled'], Http::STATUS_FORBIDDEN, $headers);
+        }
+
+        $file = $this->request->getUploadedFile('rootcert_import');
+        if (empty($file)) {
+            return new DataResponse(['message' => 'No file uploaded'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
+        }
+
+        try {
+            $certificate = $certificateManager->addCertificate(file_get_contents($file['tmp_name']), $file['name']);
+            return new DataResponse(
+                [
+                    'name' => $certificate->getName(),
+                    'commonName' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'validFrom' => $certificate->getIssueDate()->getTimestamp(),
+                    'validTill' => $certificate->getExpireDate()->getTimestamp(),
+                    'validFromString' => $this->l10n->l('date', $certificate->getIssueDate()),
+                    'validTillString' => $this->l10n->l('date', $certificate->getExpireDate()),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuerOrganization' => $certificate->getIssuerOrganization(),
+                ],
+                Http::STATUS_OK,
+                $headers
+            );
+        } catch (\Exception $e) {
+            return new DataResponse(['An error occurred.'], Http::STATUS_UNPROCESSABLE_ENTITY, $headers);
+        }
+    }
+
+    /**
+     * Removes a personal root certificate from the users' trust store
+     *
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @param string $certificateIdentifier
+     * @return DataResponse
+     */
+    public function removePersonalRootCertificate($certificateIdentifier) {
+
+        if ($this->isCertificateImportAllowed() === false) {
+            return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->userCertificateManager->removeCertificate($certificateIdentifier);
+        return new DataResponse();
+    }
+
+    /**
+     * check if certificate import is allowed
+     *
+     * @return bool
+     */
+    protected function isCertificateImportAllowed() {
+        $externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
+        if ($externalStorageEnabled) {
+            /** @var \OCA\Files_External\Service\BackendService $backendService */
+            $backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
+            if ($backendService->isUserMountingAllowed()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Add a new personal root certificate to the system's trust store
+     *
+     * @return DataResponse
+     */
+    public function addSystemRootCertificate() {
+        return $this->addCertificate($this->systemCertificateManager);
+    }
+
+    /**
+     * Removes a personal root certificate from the users' trust store
+     *
+     * @param string $certificateIdentifier
+     * @return DataResponse
+     */
+    public function removeSystemRootCertificate($certificateIdentifier) {
+
+        if ($this->isCertificateImportAllowed() === false) {
+            return new DataResponse(['Individual certificate management disabled'], Http::STATUS_FORBIDDEN);
+        }
+
+        $this->systemCertificateManager->removeCertificate($certificateIdentifier);
+        return new DataResponse();
+    }
 }

core/Controller/ContactsMenuController.php

Indentation +37 added lines, -37 removed lines

@@ -33,46 +33,46 @@
 
 class ContactsMenuController extends Controller {
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/**
-	 * @param IRequest $request
-	 * @param IUserSession $userSession
-	 * @param Manager $manager
-	 */
-	public function __construct(IRequest $request, IUserSession $userSession, Manager $manager) {
-		parent::__construct('core', $request);
-		$this->userSession = $userSession;
-		$this->manager = $manager;
-	}
+    /**
+     * @param IRequest $request
+     * @param IUserSession $userSession
+     * @param Manager $manager
+     */
+    public function __construct(IRequest $request, IUserSession $userSession, Manager $manager) {
+        parent::__construct('core', $request);
+        $this->userSession = $userSession;
+        $this->manager = $manager;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string|null filter
-	 * @return \JsonSerializable[]
-	 */
-	public function index($filter = null) {
-		return $this->manager->getEntries($this->userSession->getUser(), $filter);
-	}
+    /**
+     * @NoAdminRequired
+     *
+     * @param string|null filter
+     * @return \JsonSerializable[]
+     */
+    public function index($filter = null) {
+        return $this->manager->getEntries($this->userSession->getUser(), $filter);
+    }
 
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param integer $shareType
-	 * @param string $shareWith
-	 * @return JSONResponse|\JsonSerializable
-	 */
-	public function findOne($shareType, $shareWith) {
-		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
+    /**
+     * @NoAdminRequired
+     *
+     * @param integer $shareType
+     * @param string $shareWith
+     * @return JSONResponse|\JsonSerializable
+     */
+    public function findOne($shareType, $shareWith) {
+        $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
 
-		if ($contact) {
-			return $contact;
-		}
-		return new JSONResponse([], Http::STATUS_NOT_FOUND);
-	}
+        if ($contact) {
+            return $contact;
+        }
+        return new JSONResponse([], Http::STATUS_NOT_FOUND);
+    }
 }

apps/user_ldap/lib/Notification/Notifier.php

Indentation +43 added lines, -43 removed lines

@@ -32,52 +32,52 @@
 
 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;
+    }
 
-	/**
-	 * @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, $languageCode) {
-		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, $languageCode) {
+        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.'));
-				} else if ($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.'));
+                } else if ($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/comments/appinfo/routes.php

Indentation +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
-	]
+    'routes' => [
+        ['name' => 'Notifications#view', 'url' => '/notifications/view/{id}', 'verb' => 'GET'],
+    ]
 ];

apps/comments/lib/Controller/Notifications.php

Indentation +81 added lines, -81 removed lines

@@ -40,95 +40,95 @@
  * @package OCA\Comments\Controller
  */
 class Notifications extends Controller {
-	/** @var Folder  */
-	protected $folder;
+    /** @var Folder  */
+    protected $folder;
 
-	/** @var ICommentsManager  */
-	protected $commentsManager;
+    /** @var ICommentsManager  */
+    protected $commentsManager;
 
-	/** @var IURLGenerator  */
-	protected $urlGenerator;
+    /** @var IURLGenerator  */
+    protected $urlGenerator;
 
-	/** @var IManager  */
-	protected $notificationManager;
+    /** @var IManager  */
+    protected $notificationManager;
 
-	/** @var IUserSession  */
-	protected $userSession;
+    /** @var IUserSession  */
+    protected $userSession;
 
-	/**
-	 * Notifications constructor.
-	 *
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param ICommentsManager $commentsManager
-	 * @param Folder $folder
-	 * @param IURLGenerator $urlGenerator
-	 * @param IManager $notificationManager
-	 * @param IUserSession $userSession
-	 */
-	public function __construct(
-		$appName,
-		IRequest $request,
-		ICommentsManager $commentsManager,
-		Folder $folder,
-		IURLGenerator $urlGenerator,
-		IManager $notificationManager,
-		IUserSession $userSession
-	) {
-		parent::__construct($appName, $request);
-		$this->commentsManager = $commentsManager;
-		$this->folder = $folder;
-		$this->urlGenerator = $urlGenerator;
-		$this->notificationManager = $notificationManager;
-		$this->userSession = $userSession;
-	}
+    /**
+     * Notifications constructor.
+     *
+     * @param string $appName
+     * @param IRequest $request
+     * @param ICommentsManager $commentsManager
+     * @param Folder $folder
+     * @param IURLGenerator $urlGenerator
+     * @param IManager $notificationManager
+     * @param IUserSession $userSession
+     */
+    public function __construct(
+        $appName,
+        IRequest $request,
+        ICommentsManager $commentsManager,
+        Folder $folder,
+        IURLGenerator $urlGenerator,
+        IManager $notificationManager,
+        IUserSession $userSession
+    ) {
+        parent::__construct($appName, $request);
+        $this->commentsManager = $commentsManager;
+        $this->folder = $folder;
+        $this->urlGenerator = $urlGenerator;
+        $this->notificationManager = $notificationManager;
+        $this->userSession = $userSession;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param string $id		the comment ID
-	 * @return Response
-	 */
-	public function view($id) {
-		try {
-			$comment = $this->commentsManager->get($id);
-			if($comment->getObjectType() !== 'files') {
-				return new NotFoundResponse();
-			}
-			$files = $this->folder->getById((int)$comment->getObjectId());
-			if(count($files) === 0) {
-				$this->markProcessed($comment);
-				return new NotFoundResponse();
-			}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param string $id		the comment ID
+     * @return Response
+     */
+    public function view($id) {
+        try {
+            $comment = $this->commentsManager->get($id);
+            if($comment->getObjectType() !== 'files') {
+                return new NotFoundResponse();
+            }
+            $files = $this->folder->getById((int)$comment->getObjectId());
+            if(count($files) === 0) {
+                $this->markProcessed($comment);
+                return new NotFoundResponse();
+            }
 
-			$url = $this->urlGenerator->linkToRouteAbsolute(
-				'files.viewcontroller.showFile',
-				[ 'fileid' => $comment->getObjectId() ]
-			);
+            $url = $this->urlGenerator->linkToRouteAbsolute(
+                'files.viewcontroller.showFile',
+                [ 'fileid' => $comment->getObjectId() ]
+            );
 
-			$this->markProcessed($comment);
+            $this->markProcessed($comment);
 
-			return new RedirectResponse($url);
-		} catch (\Exception $e) {
-			return new NotFoundResponse();
-		}
-	}
+            return new RedirectResponse($url);
+        } catch (\Exception $e) {
+            return new NotFoundResponse();
+        }
+    }
 
-	/**
-	 * Marks the notification about a comment as processed
-	 * @param IComment $comment
-	 */
-	protected function markProcessed(IComment $comment) {
-		$user = $this->userSession->getUser();
-		if(is_null($user)) {
-			return;
-		}
-		$notification = $this->notificationManager->createNotification();
-		$notification->setApp('comments')
-			->setObject('comment', $comment->getId())
-			->setSubject('mention')
-			->setUser($user->getUID());
-		$this->notificationManager->markProcessed($notification);
-	}
+    /**
+     * Marks the notification about a comment as processed
+     * @param IComment $comment
+     */
+    protected function markProcessed(IComment $comment) {
+        $user = $this->userSession->getUser();
+        if(is_null($user)) {
+            return;
+        }
+        $notification = $this->notificationManager->createNotification();
+        $notification->setApp('comments')
+            ->setObject('comment', $comment->getId())
+            ->setSubject('mention')
+            ->setUser($user->getUID());
+        $this->notificationManager->markProcessed($notification);
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -93,18 +93,18 @@ 
 	public function view($id) {
 		try {
 			$comment = $this->commentsManager->get($id);
-			if($comment->getObjectType() !== 'files') {
+			if ($comment->getObjectType() !== 'files') {
 				return new NotFoundResponse();
 			}
-			$files = $this->folder->getById((int)$comment->getObjectId());
-			if(count($files) === 0) {
+			$files = $this->folder->getById((int) $comment->getObjectId());
+			if (count($files) === 0) {
 				$this->markProcessed($comment);
 				return new NotFoundResponse();
 			}
 
 			$url = $this->urlGenerator->linkToRouteAbsolute(
 				'files.viewcontroller.showFile',
-				[ 'fileid' => $comment->getObjectId() ]
+				['fileid' => $comment->getObjectId()]
 			);
 
 			$this->markProcessed($comment);
@@ -121,7 +121,7 @@ 
 	 */
 	protected function markProcessed(IComment $comment) {
 		$user = $this->userSession->getUser();
-		if(is_null($user)) {
+		if (is_null($user)) {
 			return;
 		}
 		$notification = $this->notificationManager->createNotification();

apps/dav/lib/CardDAV/Plugin.php

Indentation +40 added lines, -40 removed lines

@@ -30,51 +30,51 @@
 
 class Plugin extends \Sabre\CardDAV\Plugin {
 
-	function initialize(Server $server) {
-		$server->on('propFind', [$this, 'propFind']);
-		parent::initialize($server);
-	}
+    function initialize(Server $server) {
+        $server->on('propFind', [$this, 'propFind']);
+        parent::initialize($server);
+    }
 
-	/**
-	 * Returns the addressbook home for a given principal
-	 *
-	 * @param string $principal
-	 * @return string
-	 */
-	protected function getAddressbookHomeForPrincipal($principal) {
+    /**
+     * Returns the addressbook home for a given principal
+     *
+     * @param string $principal
+     * @return string
+     */
+    protected function getAddressbookHomeForPrincipal($principal) {
 
-		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
-		}
-		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
-			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
-		}
+        if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+        }
+        if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
+            list(, $principalId) = \Sabre\Uri\split($principal);
+            return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+        }
 
-		throw new \LogicException('This is not supposed to happen');
-	}
+        throw new \LogicException('This is not supposed to happen');
+    }
 
-	/**
-	 * Adds all CardDAV-specific properties
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	function propFind(PropFind $propFind, INode $node) {
+    /**
+     * Adds all CardDAV-specific properties
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    function propFind(PropFind $propFind, INode $node) {
 
-		$ns = '{http://owncloud.org/ns}';
+        $ns = '{http://owncloud.org/ns}';
 
-		if ($node instanceof AddressBook) {
+        if ($node instanceof AddressBook) {
 
-			$propFind->handle($ns . 'groups', function () use ($node) {
-				return new Groups($node->getContactsGroups());
-			});
-		}
-	}
+            $propFind->handle($ns . 'groups', function () use ($node) {
+                return new Groups($node->getContactsGroups());
+            });
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -45,15 +45,15 @@ 
 
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/users/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/groups/'.$principalId;
 		}
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
 			list(, $principalId) = \Sabre\Uri\split($principal);
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
+			return self::ADDRESSBOOK_ROOT.'/system/'.$principalId;
 		}
 
 		throw new \LogicException('This is not supposed to happen');
@@ -72,7 +72,7 @@ 
 
 		if ($node instanceof AddressBook) {
 
-			$propFind->handle($ns . 'groups', function () use ($node) {
+			$propFind->handle($ns.'groups', function() use ($node) {
 				return new Groups($node->getContactsGroups());
 			});
 		}

apps/files_external/lib/Lib/Backend/Backend.php

Indentation +104 added lines, -104 removed lines

@@ -57,110 +57,110 @@
  */
 class Backend implements \JsonSerializable {
 
-	use VisibilityTrait;
-	use FrontendDefinitionTrait;
-	use PriorityTrait;
-	use DependencyTrait;
-	use StorageModifierTrait;
-	use IdentifierTrait;
-
-	/** @var string storage class */
-	private $storageClass;
-
-	/** @var array 'scheme' => true, supported authentication schemes */
-	private $authSchemes = [];
-
-	/** @var AuthMechanism|callable authentication mechanism fallback */
-	private $legacyAuthMechanism;
-
-	/**
-	 * @return string
-	 */
-	public function getStorageClass() {
-		return $this->storageClass;
-	}
-
-	/**
-	 * @param string $class
-	 * @return $this
-	 */
-	public function setStorageClass($class) {
-		$this->storageClass = $class;
-		return $this;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAuthSchemes() {
-		if (empty($this->authSchemes)) {
-			return [AuthMechanism::SCHEME_NULL => true];
-		}
-		return $this->authSchemes;
-	}
-
-	/**
-	 * @param string $scheme
-	 * @return self
-	 */
-	public function addAuthScheme($scheme) {
-		$this->authSchemes[$scheme] = true;
-		return $this;
-	}
-
-	/**
-	 * @param array $parameters storage parameters, for dynamic mechanism selection
-	 * @return AuthMechanism
-	 */
-	public function getLegacyAuthMechanism(array $parameters = []) {
-		if (is_callable($this->legacyAuthMechanism)) {
-			return call_user_func($this->legacyAuthMechanism, $parameters);
-		}
-		return $this->legacyAuthMechanism;
-	}
-
-	/**
-	 * @param AuthMechanism $authMechanism
-	 * @return self
-	 */
-	public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
-		$this->legacyAuthMechanism = $authMechanism;
-		return $this;
-	}
-
-	/**
-	 * @param callable $callback dynamic auth mechanism selection
-	 * @return self
-	 */
-	public function setLegacyAuthMechanismCallback(callable $callback) {
-		$this->legacyAuthMechanism = $callback;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$data = $this->jsonSerializeDefinition();
-		$data += $this->jsonSerializeIdentifier();
-
-		$data['backend'] = $data['name']; // legacy compat
-		$data['priority'] = $this->getPriority();
-		$data['authSchemes'] = $this->getAuthSchemes();
-
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorage(StorageConfig $storage) {
-		return $this->validateStorageDefinition($storage);
-	}
+    use VisibilityTrait;
+    use FrontendDefinitionTrait;
+    use PriorityTrait;
+    use DependencyTrait;
+    use StorageModifierTrait;
+    use IdentifierTrait;
+
+    /** @var string storage class */
+    private $storageClass;
+
+    /** @var array 'scheme' => true, supported authentication schemes */
+    private $authSchemes = [];
+
+    /** @var AuthMechanism|callable authentication mechanism fallback */
+    private $legacyAuthMechanism;
+
+    /**
+     * @return string
+     */
+    public function getStorageClass() {
+        return $this->storageClass;
+    }
+
+    /**
+     * @param string $class
+     * @return $this
+     */
+    public function setStorageClass($class) {
+        $this->storageClass = $class;
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAuthSchemes() {
+        if (empty($this->authSchemes)) {
+            return [AuthMechanism::SCHEME_NULL => true];
+        }
+        return $this->authSchemes;
+    }
+
+    /**
+     * @param string $scheme
+     * @return self
+     */
+    public function addAuthScheme($scheme) {
+        $this->authSchemes[$scheme] = true;
+        return $this;
+    }
+
+    /**
+     * @param array $parameters storage parameters, for dynamic mechanism selection
+     * @return AuthMechanism
+     */
+    public function getLegacyAuthMechanism(array $parameters = []) {
+        if (is_callable($this->legacyAuthMechanism)) {
+            return call_user_func($this->legacyAuthMechanism, $parameters);
+        }
+        return $this->legacyAuthMechanism;
+    }
+
+    /**
+     * @param AuthMechanism $authMechanism
+     * @return self
+     */
+    public function setLegacyAuthMechanism(AuthMechanism $authMechanism) {
+        $this->legacyAuthMechanism = $authMechanism;
+        return $this;
+    }
+
+    /**
+     * @param callable $callback dynamic auth mechanism selection
+     * @return self
+     */
+    public function setLegacyAuthMechanismCallback(callable $callback) {
+        $this->legacyAuthMechanism = $callback;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerialize() {
+        $data = $this->jsonSerializeDefinition();
+        $data += $this->jsonSerializeIdentifier();
+
+        $data['backend'] = $data['name']; // legacy compat
+        $data['priority'] = $this->getPriority();
+        $data['authSchemes'] = $this->getAuthSchemes();
+
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorage(StorageConfig $storage) {
+        return $this->validateStorageDefinition($storage);
+    }
 
 }
 

apps/files_external/lib/Lib/FrontendDefinitionTrait.php

Indentation +124 added lines, -124 removed lines

@@ -31,129 +31,129 @@
  */
 trait FrontendDefinitionTrait {
 
-	/** @var string human-readable mechanism name */
-	private $text;
-
-	/** @var DefinitionParameter[] parameters for mechanism */
-	private $parameters = [];
-
-	/** @var string[] custom JS */
-	private $customJs = [];
-
-	/**
-	 * @return string
-	 */
-	public function getText() {
-		return $this->text;
-	}
-
-	/**
-	 * @param string $text
-	 * @return $this
-	 */
-	public function setText($text) {
-		$this->text = $text;
-		return $this;
-	}
-
-	/**
-	 * @param FrontendDefinitionTrait $a
-	 * @param FrontendDefinitionTrait $b
-	 * @return int
-	 */
-	public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
-		return strcmp($a->getText(), $b->getText());
-	}
-
-	/**
-	 * @return DefinitionParameter[]
-	 */
-	public function getParameters() {
-		return $this->parameters;
-	}
-
-	/**
-	 * @param DefinitionParameter[] $parameters
-	 * @return self
-	 */
-	public function addParameters(array $parameters) {
-		foreach ($parameters as $parameter) {
-			$this->addParameter($parameter);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param DefinitionParameter $parameter
-	 * @return self
-	 */
-	public function addParameter(DefinitionParameter $parameter) {
-		$this->parameters[$parameter->getName()] = $parameter;
-		return $this;
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getCustomJs() {
-		return $this->customJs;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 */
-	public function addCustomJs($custom) {
-		$this->customJs[] = $custom;
-		return $this;
-	}
-
-	/**
-	 * @param string $custom
-	 * @return self
-	 * @deprecated 9.1.0, use addCustomJs() instead
-	 */
-	public function setCustomJs($custom) {
-		$this->customJs = [$custom];
-		return $this;
-	}
-
-	/**
-	 * Serialize into JSON for client-side JS
-	 *
-	 * @return array
-	 */
-	public function jsonSerializeDefinition() {
-		$configuration = [];
-		foreach ($this->getParameters() as $parameter) {
-			$configuration[$parameter->getName()] = $parameter;
-		}
-
-		$data = [
-			'name' => $this->getText(),
-			'configuration' => $configuration,
-			'custom' => $this->getCustomJs(),
-		];
-		return $data;
-	}
-
-	/**
-	 * Check if parameters are satisfied in a StorageConfig
-	 *
-	 * @param StorageConfig $storage
-	 * @return bool
-	 */
-	public function validateStorageDefinition(StorageConfig $storage) {
-		foreach ($this->getParameters() as $name => $parameter) {
-			$value = $storage->getBackendOption($name);
-			if (!is_null($value) || !$parameter->isOptional()) {
-				if (!$parameter->validateValue($value)) {
-					return false;
-				}
-				$storage->setBackendOption($name, $value);
-			}
-		}
-		return true;
-	}
+    /** @var string human-readable mechanism name */
+    private $text;
+
+    /** @var DefinitionParameter[] parameters for mechanism */
+    private $parameters = [];
+
+    /** @var string[] custom JS */
+    private $customJs = [];
+
+    /**
+     * @return string
+     */
+    public function getText() {
+        return $this->text;
+    }
+
+    /**
+     * @param string $text
+     * @return $this
+     */
+    public function setText($text) {
+        $this->text = $text;
+        return $this;
+    }
+
+    /**
+     * @param FrontendDefinitionTrait $a
+     * @param FrontendDefinitionTrait $b
+     * @return int
+     */
+    public static function lexicalCompare(FrontendDefinitionTrait $a, FrontendDefinitionTrait $b) {
+        return strcmp($a->getText(), $b->getText());
+    }
+
+    /**
+     * @return DefinitionParameter[]
+     */
+    public function getParameters() {
+        return $this->parameters;
+    }
+
+    /**
+     * @param DefinitionParameter[] $parameters
+     * @return self
+     */
+    public function addParameters(array $parameters) {
+        foreach ($parameters as $parameter) {
+            $this->addParameter($parameter);
+        }
+        return $this;
+    }
+
+    /**
+     * @param DefinitionParameter $parameter
+     * @return self
+     */
+    public function addParameter(DefinitionParameter $parameter) {
+        $this->parameters[$parameter->getName()] = $parameter;
+        return $this;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getCustomJs() {
+        return $this->customJs;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     */
+    public function addCustomJs($custom) {
+        $this->customJs[] = $custom;
+        return $this;
+    }
+
+    /**
+     * @param string $custom
+     * @return self
+     * @deprecated 9.1.0, use addCustomJs() instead
+     */
+    public function setCustomJs($custom) {
+        $this->customJs = [$custom];
+        return $this;
+    }
+
+    /**
+     * Serialize into JSON for client-side JS
+     *
+     * @return array
+     */
+    public function jsonSerializeDefinition() {
+        $configuration = [];
+        foreach ($this->getParameters() as $parameter) {
+            $configuration[$parameter->getName()] = $parameter;
+        }
+
+        $data = [
+            'name' => $this->getText(),
+            'configuration' => $configuration,
+            'custom' => $this->getCustomJs(),
+        ];
+        return $data;
+    }
+
+    /**
+     * Check if parameters are satisfied in a StorageConfig
+     *
+     * @param StorageConfig $storage
+     * @return bool
+     */
+    public function validateStorageDefinition(StorageConfig $storage) {
+        foreach ($this->getParameters() as $name => $parameter) {
+            $value = $storage->getBackendOption($name);
+            if (!is_null($value) || !$parameter->isOptional()) {
+                if (!$parameter->validateValue($value)) {
+                    return false;
+                }
+                $storage->setBackendOption($name, $value);
+            }
+        }
+        return true;
+    }
 
 }