nextcloud / server

core/Controller/NavigationController.php

Indentation +82 added lines, -82 removed lines

@@ -31,92 +31,92 @@
 
 class NavigationController extends OCSController {
 
-	/** @var INavigationManager */
-	private $navigationManager;
+    /** @var INavigationManager */
+    private $navigationManager;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(string $appName, IRequest $request, INavigationManager $navigationManager, IURLGenerator $urlGenerator) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getAppsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll();
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getAppsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll();
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param bool $absolute
-	 * @return DataResponse
-	 */
-	public function getSettingsNavigation(bool $absolute = false): DataResponse {
-		$navigation = $this->navigationManager->getAll('settings');
-		if ($absolute) {
-			$navigation = $this->rewriteToAbsoluteUrls($navigation);
-		}
-		$navigation = array_values($navigation);
-		$etag = $this->generateETag($navigation);
-		if ($this->request->getHeader('If-None-Match') === $etag) {
-			return new DataResponse([], Http::STATUS_NOT_MODIFIED);
-		}
-		$response = new DataResponse($navigation);
-		$response->setETag($etag);
-		return $response;
-	}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     *
+     * @param bool $absolute
+     * @return DataResponse
+     */
+    public function getSettingsNavigation(bool $absolute = false): DataResponse {
+        $navigation = $this->navigationManager->getAll('settings');
+        if ($absolute) {
+            $navigation = $this->rewriteToAbsoluteUrls($navigation);
+        }
+        $navigation = array_values($navigation);
+        $etag = $this->generateETag($navigation);
+        if ($this->request->getHeader('If-None-Match') === $etag) {
+            return new DataResponse([], Http::STATUS_NOT_MODIFIED);
+        }
+        $response = new DataResponse($navigation);
+        $response->setETag($etag);
+        return $response;
+    }
 
-	/**
-	 * Generate an ETag for a list of navigation entries
-	 *
-	 * @param array $navigation
-	 * @return string
-	 */
-	private function generateETag(array $navigation): string {
-		foreach ($navigation as &$nav) {
-			if ($nav['id'] === 'logout') {
-				$nav['href'] = 'logout';
-			}
-		}
-		return md5(json_encode($navigation));
-	}
+    /**
+     * Generate an ETag for a list of navigation entries
+     *
+     * @param array $navigation
+     * @return string
+     */
+    private function generateETag(array $navigation): string {
+        foreach ($navigation as &$nav) {
+            if ($nav['id'] === 'logout') {
+                $nav['href'] = 'logout';
+            }
+        }
+        return md5(json_encode($navigation));
+    }
 
-	/**
-	 * Rewrite href attribute of navigation entries to an absolute URL
-	 *
-	 * @param array $navigation
-	 * @return array
-	 */
-	private function rewriteToAbsoluteUrls(array $navigation): array {
-		foreach ($navigation as &$entry) {
-			if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
-				$entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
-			}
-			if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
-				$entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
-			}
-		}
-		return $navigation;
-	}
+    /**
+     * Rewrite href attribute of navigation entries to an absolute URL
+     *
+     * @param array $navigation
+     * @return array
+     */
+    private function rewriteToAbsoluteUrls(array $navigation): array {
+        foreach ($navigation as &$entry) {
+            if (0 !== strpos($entry['href'], $this->urlGenerator->getBaseUrl())) {
+                $entry['href'] = $this->urlGenerator->getAbsoluteURL($entry['href']);
+            }
+            if (0 !== strpos($entry['icon'], $this->urlGenerator->getBaseUrl())) {
+                $entry['icon'] = $this->urlGenerator->getAbsoluteURL($entry['icon']);
+            }
+        }
+        return $navigation;
+    }
 }

apps/comments/lib/Search/Provider.php

Indentation +74 added lines, -74 removed lines

@@ -29,78 +29,78 @@
 
 class Provider extends \OCP\Search\Provider {
 
-	/**
-	 * Search for $query
-	 *
-	 * @param string $query
-	 * @return array An array of OCP\Search\Result's
-	 * @since 7.0.0
-	 */
-	public function search($query): array {
-		$cm = \OC::$server->getCommentsManager();
-		$us = \OC::$server->getUserSession();
-
-		$user = $us->getUser();
-		if (!$user instanceof IUser) {
-			return [];
-		}
-		$uf = \OC::$server->getUserFolder($user->getUID());
-
-		if ($uf === null) {
-			return [];
-		}
-
-		$result = [];
-		$numComments = 50;
-		$offset = 0;
-
-		while (\count($result) < $numComments) {
-			/** @var IComment[] $comments */
-			$comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
-
-			foreach ($comments as $comment) {
-				if ($comment->getActorType() !== 'users') {
-					continue;
-				}
-
-				$displayName = $cm->resolveDisplayName('user', $comment->getActorId());
-
-				try {
-					$file = $this->getFileForComment($uf, $comment);
-					$result[] = new Result($query,
-						$comment,
-						$displayName,
-						$file->getPath()
-					);
-				} catch (NotFoundException $e) {
-					continue;
-				}
-			}
-
-			if (\count($comments) < $numComments) {
-				// Didn't find more comments when we tried to get, so there are no more comments.
-				return $result;
-			}
-
-			$offset += $numComments;
-			$numComments = 50 - \count($result);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @param Folder $userFolder
-	 * @param IComment $comment
-	 * @return Node
-	 * @throws NotFoundException
-	 */
-	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$nodes = $userFolder->getById((int) $comment->getObjectId());
-		if (empty($nodes)) {
-			throw new NotFoundException('File not found');
-		}
-
-		return array_shift($nodes);
-	}
+    /**
+     * Search for $query
+     *
+     * @param string $query
+     * @return array An array of OCP\Search\Result's
+     * @since 7.0.0
+     */
+    public function search($query): array {
+        $cm = \OC::$server->getCommentsManager();
+        $us = \OC::$server->getUserSession();
+
+        $user = $us->getUser();
+        if (!$user instanceof IUser) {
+            return [];
+        }
+        $uf = \OC::$server->getUserFolder($user->getUID());
+
+        if ($uf === null) {
+            return [];
+        }
+
+        $result = [];
+        $numComments = 50;
+        $offset = 0;
+
+        while (\count($result) < $numComments) {
+            /** @var IComment[] $comments */
+            $comments = $cm->search($query, 'files', '', 'comment', $offset, $numComments);
+
+            foreach ($comments as $comment) {
+                if ($comment->getActorType() !== 'users') {
+                    continue;
+                }
+
+                $displayName = $cm->resolveDisplayName('user', $comment->getActorId());
+
+                try {
+                    $file = $this->getFileForComment($uf, $comment);
+                    $result[] = new Result($query,
+                        $comment,
+                        $displayName,
+                        $file->getPath()
+                    );
+                } catch (NotFoundException $e) {
+                    continue;
+                }
+            }
+
+            if (\count($comments) < $numComments) {
+                // Didn't find more comments when we tried to get, so there are no more comments.
+                return $result;
+            }
+
+            $offset += $numComments;
+            $numComments = 50 - \count($result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param Folder $userFolder
+     * @param IComment $comment
+     * @return Node
+     * @throws NotFoundException
+     */
+    protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
+        $nodes = $userFolder->getById((int) $comment->getObjectId());
+        if (empty($nodes)) {
+            throw new NotFoundException('File not found');
+        }
+
+        return array_shift($nodes);
+    }
 }

lib/public/IAvatar.php

Indentation +56 added lines, -56 removed lines

@@ -37,67 +37,67 @@
  */
 interface IAvatar {
 
-	/**
-	 * get the users avatar
-	 * @param int $size size in px of the avatar, avatars are square, defaults to 64, -1 can be used to not scale the image
-	 * @return boolean|\OCP\IImage containing the avatar or false if there's no image
-	 * @since 6.0.0 - size of -1 was added in 9.0.0
-	 */
-	public function get($size = 64);
+    /**
+     * get the users avatar
+     * @param int $size size in px of the avatar, avatars are square, defaults to 64, -1 can be used to not scale the image
+     * @return boolean|\OCP\IImage containing the avatar or false if there's no image
+     * @since 6.0.0 - size of -1 was added in 9.0.0
+     */
+    public function get($size = 64);
 
-	/**
-	 * Check if an avatar exists for the user
-	 *
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function exists();
+    /**
+     * Check if an avatar exists for the user
+     *
+     * @return bool
+     * @since 8.1.0
+     */
+    public function exists();
 
-	/**
-	 * Check if the avatar of a user is a custom uploaded one
-	 *
-	 * @return bool
-	 * @since 14.0.0
-	 */
-	public function isCustomAvatar(): bool;
+    /**
+     * Check if the avatar of a user is a custom uploaded one
+     *
+     * @return bool
+     * @since 14.0.0
+     */
+    public function isCustomAvatar(): bool;
 
-	/**
-	 * sets the users avatar
-	 * @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws \OC\NotSquareException if the image is not square
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function set($data);
+    /**
+     * sets the users avatar
+     * @param \OCP\IImage|resource|string $data An image object, imagedata or path to set a new avatar
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws \OC\NotSquareException if the image is not square
+     * @return void
+     * @since 6.0.0
+     */
+    public function set($data);
 
-	/**
-	 * remove the users avatar
-	 * @return void
-	 * @since 6.0.0
-	 */
-	public function remove();
+    /**
+     * remove the users avatar
+     * @return void
+     * @since 6.0.0
+     */
+    public function remove();
 
-	/**
-	 * Get the file of the avatar
-	 * @param int $size -1 can be used to not scale the image
-	 * @return File
-	 * @throws NotFoundException
-	 * @since 9.0.0
-	 */
-	public function getFile($size);
+    /**
+     * Get the file of the avatar
+     * @param int $size -1 can be used to not scale the image
+     * @return File
+     * @throws NotFoundException
+     * @since 9.0.0
+     */
+    public function getFile($size);
 
-	/**
-	 * @param string $text
-	 * @return Color Object containting r g b int in the range [0, 255]
-	 * @since 14.0.0
-	 */
-	public function avatarBackgroundColor(string $text);
+    /**
+     * @param string $text
+     * @return Color Object containting r g b int in the range [0, 255]
+     * @since 14.0.0
+     */
+    public function avatarBackgroundColor(string $text);
 
-	/**
-	 * Handle a changed user
-	 * @since 13.0.0
-	 */
-	public function userChanged($feature, $oldValue, $newValue);
+    /**
+     * Handle a changed user
+     * @since 13.0.0
+     */
+    public function userChanged($feature, $oldValue, $newValue);
 }

apps/encryption/lib/Settings/Admin.php

Indentation +85 added lines, -85 removed lines

@@ -38,90 +38,90 @@
 
 class Admin implements ISettings {
 
-	/** @var IL10N */
-	private $l;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IConfig */
-	private $config;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISession */
-	private $session;
-
-	public function __construct(
-		IL10N $l,
-		ILogger $logger,
-		IUserSession $userSession,
-		IConfig $config,
-		IUserManager $userManager,
-		ISession $session
-	) {
-		$this->l = $l;
-		$this->logger = $logger;
-		$this->userSession = $userSession;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->session = $session;
-	}
-
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$crypt = new Crypt(
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->l);
-
-		$util = new Util(
-			new View(),
-			$crypt,
-			$this->logger,
-			$this->userSession,
-			$this->config,
-			$this->userManager);
-
-		// Check if an adminRecovery account is enabled for recovering files after lost pwd
-		$recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
-		$session = new Session($this->session);
-
-		$encryptHomeStorage = $util->shouldEncryptHomeStorage();
-
-		$parameters = [
-			'recoveryEnabled'    => $recoveryAdminEnabled,
-			'initStatus'         => $session->getStatus(),
-			'encryptHomeStorage' => $encryptHomeStorage,
-			'masterKeyEnabled'   => $util->isMasterKeyEnabled(),
-		];
-
-		return new TemplateResponse('encryption', 'settings-admin', $parameters, '');
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'security';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 11;
-	}
+    /** @var IL10N */
+    private $l;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IConfig */
+    private $config;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISession */
+    private $session;
+
+    public function __construct(
+        IL10N $l,
+        ILogger $logger,
+        IUserSession $userSession,
+        IConfig $config,
+        IUserManager $userManager,
+        ISession $session
+    ) {
+        $this->l = $l;
+        $this->logger = $logger;
+        $this->userSession = $userSession;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->session = $session;
+    }
+
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $crypt = new Crypt(
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->l);
+
+        $util = new Util(
+            new View(),
+            $crypt,
+            $this->logger,
+            $this->userSession,
+            $this->config,
+            $this->userManager);
+
+        // Check if an adminRecovery account is enabled for recovering files after lost pwd
+        $recoveryAdminEnabled = $this->config->getAppValue('encryption', 'recoveryAdminEnabled', '0');
+        $session = new Session($this->session);
+
+        $encryptHomeStorage = $util->shouldEncryptHomeStorage();
+
+        $parameters = [
+            'recoveryEnabled'    => $recoveryAdminEnabled,
+            'initStatus'         => $session->getStatus(),
+            'encryptHomeStorage' => $encryptHomeStorage,
+            'masterKeyEnabled'   => $util->isMasterKeyEnabled(),
+        ];
+
+        return new TemplateResponse('encryption', 'settings-admin', $parameters, '');
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'security';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 11;
+    }
 
 }

apps/files_sharing/lib/Controller/DeletedShareAPIController.php

Spacing +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 
 		$shares = array_merge($groupShares, $roomShares);
 
-		$shares = array_map(function (IShare $share) {
+		$shares = array_map(function(IShare $share) {
 			return $this->formatShare($share);
 		}, $shares);
 

Indentation +164 added lines, -164 removed lines

@@ -48,168 +48,168 @@
 
 class DeletedShareAPIController extends OCSController {
 
-	/** @var ShareManager */
-	private $shareManager;
-
-	/** @var string */
-	private $userId;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IAppManager */
-	private $appManager;
-
-	/** @var IServerContainer */
-	private $serverContainer;
-
-	public function __construct(string $appName,
-								IRequest $request,
-								ShareManager $shareManager,
-								string $UserId,
-								IUserManager $userManager,
-								IGroupManager $groupManager,
-								IRootFolder $rootFolder,
-								IAppManager $appManager,
-								IServerContainer $serverContainer) {
-		parent::__construct($appName, $request);
-
-		$this->shareManager = $shareManager;
-		$this->userId = $UserId;
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->rootFolder = $rootFolder;
-		$this->appManager = $appManager;
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	private function formatShare(IShare $share): array {
-		$result = [
-			'id' => $share->getFullId(),
-			'share_type' => $share->getShareType(),
-			'uid_owner' => $share->getSharedBy(),
-			'displayname_owner' => $this->userManager->get($share->getSharedBy())->getDisplayName(),
-			'permissions' => 0,
-			'stime' => $share->getShareTime()->getTimestamp(),
-			'parent' => null,
-			'expiration' => null,
-			'token' => null,
-			'uid_file_owner' => $share->getShareOwner(),
-			'displayname_file_owner' => $this->userManager->get($share->getShareOwner())->getDisplayName(),
-			'path' => $share->getTarget(),
-		];
-		$userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
-		$nodes = $userFolder->getById($share->getNodeId());
-		if (empty($nodes)) {
-			// fallback to guessing the path
-			$node = $userFolder->get($share->getTarget());
-			if ($node === null || $share->getTarget() === '') {
-				throw new NotFoundException();
-			}
-		} else {
-			$node = $nodes[0];
-		}
-
-		$result['path'] = $userFolder->getRelativePath($node->getPath());
-		if ($node instanceof \OCP\Files\Folder) {
-			$result['item_type'] = 'folder';
-		} else {
-			$result['item_type'] = 'file';
-		}
-		$result['mimetype'] = $node->getMimetype();
-		$result['storage_id'] = $node->getStorage()->getId();
-		$result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
-		$result['item_source'] = $node->getId();
-		$result['file_source'] = $node->getId();
-		$result['file_parent'] = $node->getParent()->getId();
-		$result['file_target'] = $share->getTarget();
-
-		$expiration = $share->getExpirationDate();
-		if ($expiration !== null) {
-			$result['expiration'] = $expiration->format('Y-m-d 00:00:00');
-		}
-
-		if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
-			$group = $this->groupManager->get($share->getSharedWith());
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
-		} elseif ($share->getShareType() === \OCP\Share::SHARE_TYPE_ROOM) {
-			$result['share_with'] = $share->getSharedWith();
-			$result['share_with_displayname'] = '';
-
-			try {
-				$result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
-			} catch (QueryException $e) {
-			}
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 */
-	public function index(): DataResponse {
-		$groupShares = $this->shareManager->getDeletedSharedWith($this->userId, \OCP\Share::SHARE_TYPE_GROUP, null, -1, 0);
-		$roomShares = $this->shareManager->getDeletedSharedWith($this->userId, \OCP\Share::SHARE_TYPE_ROOM, null, -1, 0);
-
-		$shares = array_merge($groupShares, $roomShares);
-
-		$shares = array_map(function (IShare $share) {
-			return $this->formatShare($share);
-		}, $shares);
-
-		return new DataResponse($shares);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @throws OCSException
-	 */
-	public function undelete(string $id): DataResponse {
-		try {
-			$share = $this->shareManager->getShareById($id, $this->userId);
-		} catch (ShareNotFound $e) {
-			throw new OCSNotFoundException('Share not found');
-		}
-
-		if ($share->getPermissions() !== 0) {
-			throw new OCSNotFoundException('No deleted share found');
-		}
-
-		try {
-			$this->shareManager->restoreShare($share, $this->userId);
-		} catch (GenericShareException $e) {
-			throw new OCSException('Something went wrong');
-		}
-
-		return new DataResponse([]);
-	}
-
-	/**
-	 * Returns the helper of DeletedShareAPIController for room shares.
-	 *
-	 * If the Talk application is not enabled or the helper is not available
-	 * a QueryException is thrown instead.
-	 *
-	 * @return \OCA\Talk\Share\Helper\DeletedShareAPIController
-	 * @throws QueryException
-	 */
-	private function getRoomShareHelper() {
-		if (!$this->appManager->isEnabledForUser('spreed')) {
-			throw new QueryException();
-		}
-
-		return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController');
-	}
+    /** @var ShareManager */
+    private $shareManager;
+
+    /** @var string */
+    private $userId;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IAppManager */
+    private $appManager;
+
+    /** @var IServerContainer */
+    private $serverContainer;
+
+    public function __construct(string $appName,
+                                IRequest $request,
+                                ShareManager $shareManager,
+                                string $UserId,
+                                IUserManager $userManager,
+                                IGroupManager $groupManager,
+                                IRootFolder $rootFolder,
+                                IAppManager $appManager,
+                                IServerContainer $serverContainer) {
+        parent::__construct($appName, $request);
+
+        $this->shareManager = $shareManager;
+        $this->userId = $UserId;
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->rootFolder = $rootFolder;
+        $this->appManager = $appManager;
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * @suppress PhanUndeclaredClassMethod
+     */
+    private function formatShare(IShare $share): array {
+        $result = [
+            'id' => $share->getFullId(),
+            'share_type' => $share->getShareType(),
+            'uid_owner' => $share->getSharedBy(),
+            'displayname_owner' => $this->userManager->get($share->getSharedBy())->getDisplayName(),
+            'permissions' => 0,
+            'stime' => $share->getShareTime()->getTimestamp(),
+            'parent' => null,
+            'expiration' => null,
+            'token' => null,
+            'uid_file_owner' => $share->getShareOwner(),
+            'displayname_file_owner' => $this->userManager->get($share->getShareOwner())->getDisplayName(),
+            'path' => $share->getTarget(),
+        ];
+        $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy());
+        $nodes = $userFolder->getById($share->getNodeId());
+        if (empty($nodes)) {
+            // fallback to guessing the path
+            $node = $userFolder->get($share->getTarget());
+            if ($node === null || $share->getTarget() === '') {
+                throw new NotFoundException();
+            }
+        } else {
+            $node = $nodes[0];
+        }
+
+        $result['path'] = $userFolder->getRelativePath($node->getPath());
+        if ($node instanceof \OCP\Files\Folder) {
+            $result['item_type'] = 'folder';
+        } else {
+            $result['item_type'] = 'file';
+        }
+        $result['mimetype'] = $node->getMimetype();
+        $result['storage_id'] = $node->getStorage()->getId();
+        $result['storage'] = $node->getStorage()->getCache()->getNumericStorageId();
+        $result['item_source'] = $node->getId();
+        $result['file_source'] = $node->getId();
+        $result['file_parent'] = $node->getParent()->getId();
+        $result['file_target'] = $share->getTarget();
+
+        $expiration = $share->getExpirationDate();
+        if ($expiration !== null) {
+            $result['expiration'] = $expiration->format('Y-m-d 00:00:00');
+        }
+
+        if ($share->getShareType() === \OCP\Share::SHARE_TYPE_GROUP) {
+            $group = $this->groupManager->get($share->getSharedWith());
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = $group !== null ? $group->getDisplayName() : $share->getSharedWith();
+        } elseif ($share->getShareType() === \OCP\Share::SHARE_TYPE_ROOM) {
+            $result['share_with'] = $share->getSharedWith();
+            $result['share_with_displayname'] = '';
+
+            try {
+                $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share));
+            } catch (QueryException $e) {
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * @NoAdminRequired
+     */
+    public function index(): DataResponse {
+        $groupShares = $this->shareManager->getDeletedSharedWith($this->userId, \OCP\Share::SHARE_TYPE_GROUP, null, -1, 0);
+        $roomShares = $this->shareManager->getDeletedSharedWith($this->userId, \OCP\Share::SHARE_TYPE_ROOM, null, -1, 0);
+
+        $shares = array_merge($groupShares, $roomShares);
+
+        $shares = array_map(function (IShare $share) {
+            return $this->formatShare($share);
+        }, $shares);
+
+        return new DataResponse($shares);
+    }
+
+    /**
+     * @NoAdminRequired
+     *
+     * @throws OCSException
+     */
+    public function undelete(string $id): DataResponse {
+        try {
+            $share = $this->shareManager->getShareById($id, $this->userId);
+        } catch (ShareNotFound $e) {
+            throw new OCSNotFoundException('Share not found');
+        }
+
+        if ($share->getPermissions() !== 0) {
+            throw new OCSNotFoundException('No deleted share found');
+        }
+
+        try {
+            $this->shareManager->restoreShare($share, $this->userId);
+        } catch (GenericShareException $e) {
+            throw new OCSException('Something went wrong');
+        }
+
+        return new DataResponse([]);
+    }
+
+    /**
+     * Returns the helper of DeletedShareAPIController for room shares.
+     *
+     * If the Talk application is not enabled or the helper is not available
+     * a QueryException is thrown instead.
+     *
+     * @return \OCA\Talk\Share\Helper\DeletedShareAPIController
+     * @throws QueryException
+     */
+    private function getRoomShareHelper() {
+        if (!$this->appManager->isEnabledForUser('spreed')) {
+            throw new QueryException();
+        }
+
+        return $this->serverContainer->query('\OCA\Talk\Share\Helper\DeletedShareAPIController');
+    }
 }

lib/private/Authentication/TwoFactorAuth/Db/ProviderUserAssignmentDao.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 		$result = $query->execute();
 		$providers = [];
 		foreach ($result->fetchAll() as $row) {
-			$providers[$row['provider_id']] = 1 === (int)$row['enabled'];
+			$providers[$row['provider_id']] = 1 === (int) $row['enabled'];
 		}
 		$result->closeCursor();
 

Indentation +73 added lines, -73 removed lines

@@ -35,77 +35,77 @@
  * 2FA providers
  */
 class ProviderUserAssignmentDao {
-	public const TABLE_NAME = 'twofactor_providers';
-
-	/** @var IDBConnection */
-	private $conn;
-
-	public function __construct(IDBConnection $dbConn) {
-		$this->conn = $dbConn;
-	}
-
-	/**
-	 * Get all assigned provider IDs for the given user ID
-	 *
-	 * @return string[] where the array key is the provider ID (string) and the
-	 *                  value is the enabled state (bool)
-	 */
-	public function getState(string $uid): array {
-		$qb = $this->conn->getQueryBuilder();
-
-		$query = $qb->select('provider_id', 'enabled')
-			->from(self::TABLE_NAME)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-		$result = $query->execute();
-		$providers = [];
-		foreach ($result->fetchAll() as $row) {
-			$providers[$row['provider_id']] = 1 === (int)$row['enabled'];
-		}
-		$result->closeCursor();
-
-		return $providers;
-	}
-
-	/**
-	 * Persist a new/updated (provider_id, uid, enabled) tuple
-	 */
-	public function persist(string $providerId, string $uid, int $enabled) {
-		$qb = $this->conn->getQueryBuilder();
-
-		try {
-			// Insert a new entry
-			$insertQuery = $qb->insert(self::TABLE_NAME)->values([
-				'provider_id' => $qb->createNamedParameter($providerId),
-				'uid' => $qb->createNamedParameter($uid),
-				'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
-			]);
-
-			$insertQuery->execute();
-		} catch (UniqueConstraintViolationException $ex) {
-			// There is already an entry -> update it
-			$updateQuery = $qb->update(self::TABLE_NAME)
-				->set('enabled', $qb->createNamedParameter($enabled))
-				->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
-				->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-			$updateQuery->execute();
-		}
-	}
-
-	public function deleteByUser(string $uid) {
-		$qb = $this->conn->getQueryBuilder();
-
-		$deleteQuery = $qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
-
-		$deleteQuery->execute();
-	}
-
-	public function deleteAll(string $providerId) {
-		$qb = $this->conn->getQueryBuilder();
-
-		$deleteQuery = $qb->delete(self::TABLE_NAME)
-			->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
-
-		$deleteQuery->execute();
-	}
+    public const TABLE_NAME = 'twofactor_providers';
+
+    /** @var IDBConnection */
+    private $conn;
+
+    public function __construct(IDBConnection $dbConn) {
+        $this->conn = $dbConn;
+    }
+
+    /**
+     * Get all assigned provider IDs for the given user ID
+     *
+     * @return string[] where the array key is the provider ID (string) and the
+     *                  value is the enabled state (bool)
+     */
+    public function getState(string $uid): array {
+        $qb = $this->conn->getQueryBuilder();
+
+        $query = $qb->select('provider_id', 'enabled')
+            ->from(self::TABLE_NAME)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+        $result = $query->execute();
+        $providers = [];
+        foreach ($result->fetchAll() as $row) {
+            $providers[$row['provider_id']] = 1 === (int)$row['enabled'];
+        }
+        $result->closeCursor();
+
+        return $providers;
+    }
+
+    /**
+     * Persist a new/updated (provider_id, uid, enabled) tuple
+     */
+    public function persist(string $providerId, string $uid, int $enabled) {
+        $qb = $this->conn->getQueryBuilder();
+
+        try {
+            // Insert a new entry
+            $insertQuery = $qb->insert(self::TABLE_NAME)->values([
+                'provider_id' => $qb->createNamedParameter($providerId),
+                'uid' => $qb->createNamedParameter($uid),
+                'enabled' => $qb->createNamedParameter($enabled, IQueryBuilder::PARAM_INT),
+            ]);
+
+            $insertQuery->execute();
+        } catch (UniqueConstraintViolationException $ex) {
+            // There is already an entry -> update it
+            $updateQuery = $qb->update(self::TABLE_NAME)
+                ->set('enabled', $qb->createNamedParameter($enabled))
+                ->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)))
+                ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+            $updateQuery->execute();
+        }
+    }
+
+    public function deleteByUser(string $uid) {
+        $qb = $this->conn->getQueryBuilder();
+
+        $deleteQuery = $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)));
+
+        $deleteQuery->execute();
+    }
+
+    public function deleteAll(string $providerId) {
+        $qb = $this->conn->getQueryBuilder();
+
+        $deleteQuery = $qb->delete(self::TABLE_NAME)
+            ->where($qb->expr()->eq('provider_id', $qb->createNamedParameter($providerId)));
+
+        $deleteQuery->execute();
+    }
 }

apps/lookup_server_connector/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/systemtags/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }

apps/sharebymail/composer/composer/ClassLoader.php

Spacing +8 added lines, -8 removed lines

@@ -370,18 +370,18 @@ 
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).$ext;
 
         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    $pathEnd = DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
+                        if (file_exists($file = $dir.$pathEnd)) {
                             return $file;
                         }
                     }
@@ -391,7 +391,7 @@ 
 
         // PSR-4 fallback dirs
         foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -403,14 +403,14 @@ 
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).$ext;
         }
 
         if (isset($this->prefixesPsr0[$first])) {
             foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -420,7 +420,7 @@ 
 
         // PSR-0 fallback dirs
         foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (file_exists($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }