nextcloud / server

apps/federatedfilesharing/lib/AddressHandler.php

Indentation +116 added lines, -116 removed lines

@@ -38,120 +38,120 @@
  */
 class AddressHandler {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-
-	/**
-	 * AddressHandler constructor.
-	 *
-	 * @param IURLGenerator $urlGenerator
-	 * @param IL10N $il10n
-	 * @param ICloudIdManager $cloudIdManager
-	 */
-	public function __construct(
-		IURLGenerator $urlGenerator,
-		IL10N $il10n,
-		ICloudIdManager $cloudIdManager
-	) {
-		$this->l = $il10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->cloudIdManager = $cloudIdManager;
-	}
-
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws HintException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			$hint = $this->l->t('Invalid Federated Cloud ID');
-			throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
-		}
-	}
-
-	/**
-	 * generate remote URL part of federated ID
-	 *
-	 * @return string url of the current server
-	 */
-	public function generateRemoteURL() {
-		return $this->urlGenerator->getAbsoluteURL('/');
-	}
-
-	/**
-	 * check if two federated cloud IDs refer to the same user
-	 *
-	 * @param string $user1
-	 * @param string $server1
-	 * @param string $user2
-	 * @param string $server2
-	 * @return bool true if both users and servers are the same
-	 */
-	public function compareAddresses($user1, $server1, $user2, $server2) {
-		$normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
-		$normalizedServer2 = strtolower($this->removeProtocolFromUrl($server2));
-
-		if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
-			// FIXME this should be a method in the user management instead
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				['uid' => &$user1]
-			);
-			\OCP\Util::emitHook(
-				'\OCA\Files_Sharing\API\Server2Server',
-				'preLoginNameUsedAsUserName',
-				['uid' => &$user2]
-			);
-
-			if ($user1 === $user2) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * remove protocol from URL
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function removeProtocolFromUrl($url) {
-		if (strpos($url, 'https://') === 0) {
-			return substr($url, strlen('https://'));
-		} elseif (strpos($url, 'http://') === 0) {
-			return substr($url, strlen('http://'));
-		}
-
-		return $url;
-	}
-
-	/**
-	 * check if the url contain the protocol (http or https)
-	 *
-	 * @param string $url
-	 * @return bool
-	 */
-	public function urlContainProtocol($url) {
-		if (strpos($url, 'https://') === 0 ||
-			strpos($url, 'http://') === 0) {
-			return true;
-		}
-
-		return false;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $urlGenerator;
+
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+
+    /**
+     * AddressHandler constructor.
+     *
+     * @param IURLGenerator $urlGenerator
+     * @param IL10N $il10n
+     * @param ICloudIdManager $cloudIdManager
+     */
+    public function __construct(
+        IURLGenerator $urlGenerator,
+        IL10N $il10n,
+        ICloudIdManager $cloudIdManager
+    ) {
+        $this->l = $il10n;
+        $this->urlGenerator = $urlGenerator;
+        $this->cloudIdManager = $cloudIdManager;
+    }
+
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws HintException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            $hint = $this->l->t('Invalid Federated Cloud ID');
+            throw new HintException('Invalid Federated Cloud ID', $hint, 0, $e);
+        }
+    }
+
+    /**
+     * generate remote URL part of federated ID
+     *
+     * @return string url of the current server
+     */
+    public function generateRemoteURL() {
+        return $this->urlGenerator->getAbsoluteURL('/');
+    }
+
+    /**
+     * check if two federated cloud IDs refer to the same user
+     *
+     * @param string $user1
+     * @param string $server1
+     * @param string $user2
+     * @param string $server2
+     * @return bool true if both users and servers are the same
+     */
+    public function compareAddresses($user1, $server1, $user2, $server2) {
+        $normalizedServer1 = strtolower($this->removeProtocolFromUrl($server1));
+        $normalizedServer2 = strtolower($this->removeProtocolFromUrl($server2));
+
+        if (rtrim($normalizedServer1, '/') === rtrim($normalizedServer2, '/')) {
+            // FIXME this should be a method in the user management instead
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                ['uid' => &$user1]
+            );
+            \OCP\Util::emitHook(
+                '\OCA\Files_Sharing\API\Server2Server',
+                'preLoginNameUsedAsUserName',
+                ['uid' => &$user2]
+            );
+
+            if ($user1 === $user2) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * remove protocol from URL
+     *
+     * @param string $url
+     * @return string
+     */
+    public function removeProtocolFromUrl($url) {
+        if (strpos($url, 'https://') === 0) {
+            return substr($url, strlen('https://'));
+        } elseif (strpos($url, 'http://') === 0) {
+            return substr($url, strlen('http://'));
+        }
+
+        return $url;
+    }
+
+    /**
+     * check if the url contain the protocol (http or https)
+     *
+     * @param string $url
+     * @return bool
+     */
+    public function urlContainProtocol($url) {
+        if (strpos($url, 'https://') === 0 ||
+            strpos($url, 'http://') === 0) {
+            return true;
+        }
+
+        return false;
+    }
 }

apps/oauth2/lib/Migration/SetTokenExpiration.php

Indentation +33 added lines, -33 removed lines

@@ -36,44 +36,44 @@
 
 class SetTokenExpiration implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
+    /** @var IDBConnection */
+    private $connection;
 
-	/** @var ITimeFactory */
-	private $time;
+    /** @var ITimeFactory */
+    private $time;
 
-	/** @var TokenProvider */
-	private $tokenProvider;
+    /** @var TokenProvider */
+    private $tokenProvider;
 
-	public function __construct(IDBConnection $connection,
-								ITimeFactory $timeFactory,
-								TokenProvider $tokenProvider) {
-		$this->connection = $connection;
-		$this->time = $timeFactory;
-		$this->tokenProvider = $tokenProvider;
-	}
+    public function __construct(IDBConnection $connection,
+                                ITimeFactory $timeFactory,
+                                TokenProvider $tokenProvider) {
+        $this->connection = $connection;
+        $this->time = $timeFactory;
+        $this->tokenProvider = $tokenProvider;
+    }
 
-	public function getName(): string {
-		return 'Update OAuth token expiration times';
-	}
+    public function getName(): string {
+        return 'Update OAuth token expiration times';
+    }
 
-	public function run(IOutput $output) {
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('oauth2_access_tokens');
+    public function run(IOutput $output) {
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('oauth2_access_tokens');
 
-		$cursor = $qb->execute();
+        $cursor = $qb->execute();
 
-		while ($row = $cursor->fetch()) {
-			$token = AccessToken::fromRow($row);
-			try {
-				$appToken = $this->tokenProvider->getTokenById($token->getTokenId());
-				$appToken->setExpires($this->time->getTime() + 3600);
-				$this->tokenProvider->updateToken($appToken);
-			} catch (InvalidTokenException $e) {
-				//Skip this token
-			}
-		}
-		$cursor->closeCursor();
-	}
+        while ($row = $cursor->fetch()) {
+            $token = AccessToken::fromRow($row);
+            try {
+                $appToken = $this->tokenProvider->getTokenById($token->getTokenId());
+                $appToken->setExpires($this->time->getTime() + 3600);
+                $this->tokenProvider->updateToken($appToken);
+            } catch (InvalidTokenException $e) {
+                //Skip this token
+            }
+        }
+        $cursor->closeCursor();
+    }
 }

apps/files_trashbin/lib/Controller/PreviewController.php

Indentation +84 added lines, -84 removed lines

@@ -44,91 +44,91 @@
 use OCP\IUserSession;
 
 class PreviewController extends Controller {
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ITrashManager */
-	private $trashManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IMimeTypeDetector */
-	private $mimeTypeDetector;
-
-	/** @var IPreview */
-	private $previewManager;
-
-	/** @var ITimeFactory */
-	private $time;
-
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IRootFolder $rootFolder,
-		ITrashManager $trashManager,
-		IUserSession $userSession,
-		IMimeTypeDetector $mimeTypeDetector,
-		IPreview $previewManager,
-		ITimeFactory $time
-	) {
-		parent::__construct($appName, $request);
-
-		$this->trashManager = $trashManager;
-		$this->rootFolder = $rootFolder;
-		$this->userSession = $userSession;
-		$this->mimeTypeDetector = $mimeTypeDetector;
-		$this->previewManager = $previewManager;
-		$this->time = $time;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @return DataResponse|Http\FileDisplayResponse
-	 */
-	public function getPreview(
-		int $fileId = -1,
-		int $x = 128,
-		int $y = 128
-	) {
-		if ($fileId === -1 || $x === 0 || $y === 0) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-
-		try {
-			$file = $this->trashManager->getTrashNodeById($this->userSession->getUser(), $fileId);
-			if ($file === null) {
-				return new DataResponse([], Http::STATUS_NOT_FOUND);
-			}
-			if ($file instanceof Folder) {
-				return new DataResponse([], Http::STATUS_BAD_REQUEST);
-			}
-
-			$pathParts = pathinfo($file->getName());
-			$extension = $pathParts['extension'] ?? '';
-			$fileName = $pathParts['filename'];
-			/*
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ITrashManager */
+    private $trashManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IMimeTypeDetector */
+    private $mimeTypeDetector;
+
+    /** @var IPreview */
+    private $previewManager;
+
+    /** @var ITimeFactory */
+    private $time;
+
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IRootFolder $rootFolder,
+        ITrashManager $trashManager,
+        IUserSession $userSession,
+        IMimeTypeDetector $mimeTypeDetector,
+        IPreview $previewManager,
+        ITimeFactory $time
+    ) {
+        parent::__construct($appName, $request);
+
+        $this->trashManager = $trashManager;
+        $this->rootFolder = $rootFolder;
+        $this->userSession = $userSession;
+        $this->mimeTypeDetector = $mimeTypeDetector;
+        $this->previewManager = $previewManager;
+        $this->time = $time;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @return DataResponse|Http\FileDisplayResponse
+     */
+    public function getPreview(
+        int $fileId = -1,
+        int $x = 128,
+        int $y = 128
+    ) {
+        if ($fileId === -1 || $x === 0 || $y === 0) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+
+        try {
+            $file = $this->trashManager->getTrashNodeById($this->userSession->getUser(), $fileId);
+            if ($file === null) {
+                return new DataResponse([], Http::STATUS_NOT_FOUND);
+            }
+            if ($file instanceof Folder) {
+                return new DataResponse([], Http::STATUS_BAD_REQUEST);
+            }
+
+            $pathParts = pathinfo($file->getName());
+            $extension = $pathParts['extension'] ?? '';
+            $fileName = $pathParts['filename'];
+            /*
 			 * Files in the root of the trashbin are timetamped.
 			 * So we have to strip that in order to properly detect the mimetype of the file.
 			 */
-			if (preg_match('/d\d+/', $extension)) {
-				$mimeType = $this->mimeTypeDetector->detectPath($fileName);
-			} else {
-				$mimeType = $this->mimeTypeDetector->detectPath($file->getName());
-			}
-
-			$f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
-			$response = new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
-
-			// Cache previews for 24H
-			$response->cacheFor(3600 * 24);
-			return $response;
-		} catch (NotFoundException $e) {
-			return new DataResponse([], Http::STATUS_NOT_FOUND);
-		} catch (\InvalidArgumentException $e) {
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
-		}
-	}
+            if (preg_match('/d\d+/', $extension)) {
+                $mimeType = $this->mimeTypeDetector->detectPath($fileName);
+            } else {
+                $mimeType = $this->mimeTypeDetector->detectPath($file->getName());
+            }
+
+            $f = $this->previewManager->getPreview($file, $x, $y, true, IPreview::MODE_FILL, $mimeType);
+            $response = new Http\FileDisplayResponse($f, Http::STATUS_OK, ['Content-Type' => $f->getMimeType()]);
+
+            // Cache previews for 24H
+            $response->cacheFor(3600 * 24);
+            return $response;
+        } catch (NotFoundException $e) {
+            return new DataResponse([], Http::STATUS_NOT_FOUND);
+        } catch (\InvalidArgumentException $e) {
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
+        }
+    }
 }

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

Indentation +85 added lines, -85 removed lines

@@ -35,99 +35,99 @@
 use OCP\IUser;
 
 class LegacyTrashBackend implements ITrashBackend {
-	/** @var array */
-	private $deletedFiles = [];
+    /** @var array */
+    private $deletedFiles = [];
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	public function __construct(IRootFolder $rootFolder) {
-		$this->rootFolder = $rootFolder;
-	}
+    public function __construct(IRootFolder $rootFolder) {
+        $this->rootFolder = $rootFolder;
+    }
 
-	/**
-	 * @param array $items
-	 * @param IUser $user
-	 * @param ITrashItem $parent
-	 * @return ITrashItem[]
-	 */
-	private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
-		$parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
-		$isRoot = $parent === null;
-		return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
-			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
-			if (!$originalLocation) {
-				$originalLocation = $file->getName();
-			}
-			return new TrashItem(
-				$this,
-				$originalLocation,
-				$file->getMTime(),
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
-				$file,
-				$user
-			);
-		}, $items);
-	}
+    /**
+     * @param array $items
+     * @param IUser $user
+     * @param ITrashItem $parent
+     * @return ITrashItem[]
+     */
+    private function mapTrashItems(array $items, IUser $user, ITrashItem $parent = null): array {
+        $parentTrashPath = ($parent instanceof ITrashItem) ? $parent->getTrashPath() : '';
+        $isRoot = $parent === null;
+        return array_map(function (FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+            $originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation() . '/' . $file->getName();
+            if (!$originalLocation) {
+                $originalLocation = $file->getName();
+            }
+            return new TrashItem(
+                $this,
+                $originalLocation,
+                $file->getMTime(),
+                $parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+                $file,
+                $user
+            );
+        }, $items);
+    }
 
-	public function listTrashRoot(IUser $user): array {
-		$entries = Helper::getTrashFiles('/', $user->getUID());
-		return $this->mapTrashItems($entries, $user);
-	}
+    public function listTrashRoot(IUser $user): array {
+        $entries = Helper::getTrashFiles('/', $user->getUID());
+        return $this->mapTrashItems($entries, $user);
+    }
 
-	public function listTrashFolder(ITrashItem $folder): array {
-		$user = $folder->getUser();
-		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
-		return $this->mapTrashItems($entries, $user ,$folder);
-	}
+    public function listTrashFolder(ITrashItem $folder): array {
+        $user = $folder->getUser();
+        $entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
+        return $this->mapTrashItems($entries, $user ,$folder);
+    }
 
-	public function restoreItem(ITrashItem $item) {
-		Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
-	}
+    public function restoreItem(ITrashItem $item) {
+        Trashbin::restore($item->getTrashPath(), $item->getName(), $item->isRootItem() ? $item->getDeletedTime() : null);
+    }
 
-	public function removeItem(ITrashItem $item) {
-		$user = $item->getUser();
-		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
-			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
-		} else {
-			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
-		}
-	}
+    public function removeItem(ITrashItem $item) {
+        $user = $item->getUser();
+        if ($item->isRootItem()) {
+            $path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+            Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
+        } else {
+            Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
+        }
+    }
 
-	public function moveToTrash(IStorage $storage, string $internalPath): bool {
-		if (!$storage instanceof Storage) {
-			return false;
-		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
-		$view = Filesystem::getView();
-		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
-			$this->deletedFiles[$normalized] = $normalized;
-			if ($filesPath = $view->getRelativePath($normalized)) {
-				$filesPath = trim($filesPath, '/');
-				$result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
-			} else {
-				$result = false;
-			}
-			unset($this->deletedFiles[$normalized]);
-		} else {
-			$result = false;
-		}
+    public function moveToTrash(IStorage $storage, string $internalPath): bool {
+        if (!$storage instanceof Storage) {
+            return false;
+        }
+        $normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+        $view = Filesystem::getView();
+        if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
+            $this->deletedFiles[$normalized] = $normalized;
+            if ($filesPath = $view->getRelativePath($normalized)) {
+                $filesPath = trim($filesPath, '/');
+                $result = \OCA\Files_Trashbin\Trashbin::move2trash($filesPath);
+            } else {
+                $result = false;
+            }
+            unset($this->deletedFiles[$normalized]);
+        } else {
+            $result = false;
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	public function getTrashNodeById(IUser $user, int $fileId) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-			$trash = $userFolder->getParent()->get('files_trashbin/files');
-			$trashFiles = $trash->getById($fileId);
-			if (!$trashFiles) {
-				return null;
-			}
-			return $trashFiles ? array_pop($trashFiles) : null;
-		} catch (NotFoundException $e) {
-			return null;
-		}
-	}
+    public function getTrashNodeById(IUser $user, int $fileId) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+            $trash = $userFolder->getParent()->get('files_trashbin/files');
+            $trashFiles = $trash->getById($fileId);
+            if (!$trashFiles) {
+                return null;
+            }
+            return $trashFiles ? array_pop($trashFiles) : null;
+        } catch (NotFoundException $e) {
+            return null;
+        }
+    }
 }

core/templates/twofactorselectchallenge.php

Indentation +20 added lines, -20 removed lines

@@ -20,10 +20,10 @@ 
 			<?php } else { ?>
 				<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Please continue to setup two-factor authentication.')) ?></strong>
 				<a class="button primary two-factor-primary" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.setupProviders',
-					[
-						'redirect_url' => $_['redirect_url'],
-					]
-				)) ?>">
+                    [
+                        'redirect_url' => $_['redirect_url'],
+                    ]
+                )) ?>">
 					<?php p($l->t('Set up two-factor authentication')) ?>
 				</a>
 			<?php } ?>
@@ -37,18 +37,18 @@ 
 		<li>
 			<a class="two-factor-provider"
 			   href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-								[
-									'challengeProviderId' => $provider->getId(),
-									'redirect_url' => $_['redirect_url'],
-								]
-							)) ?>">
+                                [
+                                    'challengeProviderId' => $provider->getId(),
+                                    'redirect_url' => $_['redirect_url'],
+                                ]
+                            )) ?>">
 				<?php
-				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-					$icon = $provider->getLightIcon();
-				} else {
-					$icon = image_path('core', 'actions/password-white.svg');
-				}
-				?>
+                if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
+                    $icon = $provider->getLightIcon();
+                } else {
+                    $icon = image_path('core', 'actions/password-white.svg');
+                }
+                ?>
 				<img src="<?php p($icon) ?>" alt="" />
 				<div>
 					<h3><?php p($provider->getDisplayName()) ?></h3>
@@ -62,11 +62,11 @@ 
 	<?php if (!is_null($_['backupProvider'])): ?>
 	<p>
 		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
-			[
-				'challengeProviderId' => $_['backupProvider']->getId(),
-				'redirect_url' => $_['redirect_url'],
-			]
-		)) ?>">
+            [
+                'challengeProviderId' => $_['backupProvider']->getId(),
+                'redirect_url' => $_['redirect_url'],
+            ]
+        )) ?>">
 			<?php p($l->t('Use backup code')) ?>
 		</a>
 	</p>

core/Migrations/Version14000Date20180626223656.php

Indentation +37 added lines, -37 removed lines

@@ -28,42 +28,42 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180626223656 extends SimpleMigrationStep {
-	public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-		if (!$schema->hasTable('whats_new')) {
-			$table = $schema->createTable('whats_new');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-			]);
-			$table->addColumn('version', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '11',
-			]);
-			$table->addColumn('etag', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('last_check', 'integer', [
-				'notnull' => true,
-				'length' => 4,
-				'unsigned' => true,
-				'default' => 0,
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['version'], 'version');
-			$table->addIndex(['version', 'etag'], 'version_etag_idx');
-		}
+    public function changeSchema(\OCP\Migration\IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+        if (!$schema->hasTable('whats_new')) {
+            $table = $schema->createTable('whats_new');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('version', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '11',
+            ]);
+            $table->addColumn('etag', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('last_check', 'integer', [
+                'notnull' => true,
+                'length' => 4,
+                'unsigned' => true,
+                'default' => 0,
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['version'], 'version');
+            $table->addIndex(['version', 'etag'], 'version_etag_idx');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version19000Date20200211083441.php

Indentation +31 added lines, -31 removed lines

@@ -10,36 +10,36 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version19000Date20200211083441 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('webauthn')) {
-			$table = $schema->createTable('webauthn');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('public_key_credential_id', 'string', [
-				'notnull' => true,
-				'length' => 255
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['uid'], 'webauthn_uid');
-			$table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('webauthn')) {
+            $table = $schema->createTable('webauthn');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('public_key_credential_id', 'string', [
+                'notnull' => true,
+                'length' => 255
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['uid'], 'webauthn_uid');
+            $table->addIndex(['public_key_credential_id'], 'webauthn_publicKeyCredentialId');
+        }
+        return $schema;
+    }
 }

core/Migrations/Version14000Date20180522074438.php

Indentation +25 added lines, -25 removed lines

@@ -33,31 +33,31 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version14000Date20180522074438 extends SimpleMigrationStep {
-	public function changeSchema(IOutput $output, Closure $schemaClosure,
-								 array $options): ISchemaWrapper {
-		$schema = $schemaClosure();
+    public function changeSchema(IOutput $output, Closure $schemaClosure,
+                                    array $options): ISchemaWrapper {
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_providers')) {
-			$table = $schema->createTable('twofactor_providers');
-			$table->addColumn('provider_id', 'string',
-				[
-					'notnull' => true,
-					'length' => 32,
-				]);
-			$table->addColumn('uid', 'string',
-				[
-					'notnull' => true,
-					'length' => 64,
-				]);
-			$table->addColumn('enabled', 'smallint',
-				[
-					'notnull' => true,
-					'length' => 1,
-				]);
-			$table->setPrimaryKey(['provider_id', 'uid']);
-			$table->addIndex(['uid'], 'twofactor_providers_uid');
-		}
+        if (!$schema->hasTable('twofactor_providers')) {
+            $table = $schema->createTable('twofactor_providers');
+            $table->addColumn('provider_id', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 32,
+                ]);
+            $table->addColumn('uid', 'string',
+                [
+                    'notnull' => true,
+                    'length' => 64,
+                ]);
+            $table->addColumn('enabled', 'smallint',
+                [
+                    'notnull' => true,
+                    'length' => 1,
+                ]);
+            $table->setPrimaryKey(['provider_id', 'uid']);
+            $table->addIndex(['uid'], 'twofactor_providers_uid');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/public/FullTextSearch/Model/ISearchOption.php

Indentation +126 added lines, -126 removed lines

@@ -36,130 +36,130 @@
 interface ISearchOption {
 
 
-	/**
-	 * @since 16.0.0
-	 */
-	public const CHECKBOX = 'checkbox';
-
-	/**
-	 * @since 16.0.0
-	 */
-	public const INPUT = 'input';
-
-	/**
-	 * @since 16.0.0
-	 */
-	public const INPUT_SMALL = 'small';
-
-
-	/**
-	 * Set the name/key of the option.
-	 * The string should only contains alphanumerical chars and underscore.
-	 * The key can be retrieve when using ISearchRequest::getOption
-	 *
-	 * @see ISearchRequest::getOption
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $name
-	 *
-	 * @return ISearchOption
-	 */
-	public function setName(string $name): ISearchOption;
-
-	/**
-	 * Get the name/key of the option.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getName(): string;
-
-
-	/**
-	 * Set the title/display name of the option.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $title
-	 *
-	 * @return ISearchOption
-	 */
-	public function setTitle(string $title): ISearchOption;
-
-	/**
-	 * Get the title of the option.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getTitle(): string;
-
-
-	/**
-	 * Set the type of the option.
-	 * $type can be ISearchOption::CHECKBOX or ISearchOption::INPUT
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $type
-	 *
-	 * @return ISearchOption
-	 */
-	public function setType(string $type): ISearchOption;
-
-	/**
-	 * Get the type of the option.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getType(): string;
-
-
-	/**
-	 * In case of Type is INPUT, set the size of the input field.
-	 * Value can be ISearchOption::INPUT_SMALL or not defined.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $size
-	 *
-	 * @return ISearchOption
-	 */
-	public function setSize(string $size): ISearchOption;
-
-	/**
-	 * Get the size of the INPUT.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getSize(): string;
-
-
-	/**
-	 * In case of Type is , set the placeholder to be displayed in the input
-	 * field.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @param string $placeholder
-	 *
-	 * @return ISearchOption
-	 */
-	public function setPlaceholder(string $placeholder): ISearchOption;
-
-	/**
-	 * Get the placeholder.
-	 *
-	 * @since 16.0.0
-	 *
-	 * @return string
-	 */
-	public function getPlaceholder(): string;
+    /**
+     * @since 16.0.0
+     */
+    public const CHECKBOX = 'checkbox';
+
+    /**
+     * @since 16.0.0
+     */
+    public const INPUT = 'input';
+
+    /**
+     * @since 16.0.0
+     */
+    public const INPUT_SMALL = 'small';
+
+
+    /**
+     * Set the name/key of the option.
+     * The string should only contains alphanumerical chars and underscore.
+     * The key can be retrieve when using ISearchRequest::getOption
+     *
+     * @see ISearchRequest::getOption
+     *
+     * @since 16.0.0
+     *
+     * @param string $name
+     *
+     * @return ISearchOption
+     */
+    public function setName(string $name): ISearchOption;
+
+    /**
+     * Get the name/key of the option.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getName(): string;
+
+
+    /**
+     * Set the title/display name of the option.
+     *
+     * @since 16.0.0
+     *
+     * @param string $title
+     *
+     * @return ISearchOption
+     */
+    public function setTitle(string $title): ISearchOption;
+
+    /**
+     * Get the title of the option.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getTitle(): string;
+
+
+    /**
+     * Set the type of the option.
+     * $type can be ISearchOption::CHECKBOX or ISearchOption::INPUT
+     *
+     * @since 16.0.0
+     *
+     * @param string $type
+     *
+     * @return ISearchOption
+     */
+    public function setType(string $type): ISearchOption;
+
+    /**
+     * Get the type of the option.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getType(): string;
+
+
+    /**
+     * In case of Type is INPUT, set the size of the input field.
+     * Value can be ISearchOption::INPUT_SMALL or not defined.
+     *
+     * @since 16.0.0
+     *
+     * @param string $size
+     *
+     * @return ISearchOption
+     */
+    public function setSize(string $size): ISearchOption;
+
+    /**
+     * Get the size of the INPUT.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getSize(): string;
+
+
+    /**
+     * In case of Type is , set the placeholder to be displayed in the input
+     * field.
+     *
+     * @since 16.0.0
+     *
+     * @param string $placeholder
+     *
+     * @return ISearchOption
+     */
+    public function setPlaceholder(string $placeholder): ISearchOption;
+
+    /**
+     * Get the placeholder.
+     *
+     * @since 16.0.0
+     *
+     * @return string
+     */
+    public function getPlaceholder(): string;
 }