nextcloud / server

apps/dav/lib/BackgroundJob/UploadCleanup.php

Indentation +49 added lines, -49 removed lines

@@ -34,54 +34,54 @@
 
 class UploadCleanup extends TimedJob {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var IJobList */
-	private $jobList;
-
-	public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList) {
-		parent::__construct($time);
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
-
-		// Run once a day
-		$this->setInterval(60*60*24);
-	}
-
-	protected function run($argument) {
-		$uid = $argument['uid'];
-		$folder = $argument['folder'];
-
-		$userFolder = $this->rootFolder->getUserFolder($uid);
-		$userRoot = $userFolder->getParent();
-
-		try {
-			/** @var Folder $uploads */
-			$uploads = $userRoot->get('uploads');
-			/** @var Folder $uploadFolder */
-			$uploadFolder = $uploads->get($folder);
-		} catch (NotFoundException $e) {
-			$this->jobList->remove(self::class, $argument);
-			return;
-		}
-
-		$files = $uploadFolder->getDirectoryListing();
-
-		// Remove if all files have an mtime of more than a day
-		$time = $this->time->getTime() - 60 * 60 * 24;
-
-		// The folder has to be more than a day old
-		$initial = $uploadFolder->getMTime() < $time;
-
-		$expire = array_reduce($files, function(bool $carry, File $file) use ($time) {
-			return $carry && $file->getMTime() < $time;
-		}, $initial);
-
-		if ($expire) {
-			$uploadFolder->delete();
-			$this->jobList->remove(self::class, $argument);
-		}
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var IJobList */
+    private $jobList;
+
+    public function __construct(ITimeFactory $time, IRootFolder $rootFolder, IJobList $jobList) {
+        parent::__construct($time);
+        $this->rootFolder = $rootFolder;
+        $this->jobList = $jobList;
+
+        // Run once a day
+        $this->setInterval(60*60*24);
+    }
+
+    protected function run($argument) {
+        $uid = $argument['uid'];
+        $folder = $argument['folder'];
+
+        $userFolder = $this->rootFolder->getUserFolder($uid);
+        $userRoot = $userFolder->getParent();
+
+        try {
+            /** @var Folder $uploads */
+            $uploads = $userRoot->get('uploads');
+            /** @var Folder $uploadFolder */
+            $uploadFolder = $uploads->get($folder);
+        } catch (NotFoundException $e) {
+            $this->jobList->remove(self::class, $argument);
+            return;
+        }
+
+        $files = $uploadFolder->getDirectoryListing();
+
+        // Remove if all files have an mtime of more than a day
+        $time = $this->time->getTime() - 60 * 60 * 24;
+
+        // The folder has to be more than a day old
+        $initial = $uploadFolder->getMTime() < $time;
+
+        $expire = array_reduce($files, function(bool $carry, File $file) use ($time) {
+            return $carry && $file->getMTime() < $time;
+        }, $initial);
+
+        if ($expire) {
+            $uploadFolder->delete();
+            $this->jobList->remove(self::class, $argument);
+        }
+    }
 
 }

apps/dav/lib/Migration/ChunkCleanup.php

Indentation +47 added lines, -47 removed lines

@@ -37,59 +37,59 @@
 
 class ChunkCleanup implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IConfig $config,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								IJobList $jobList) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IConfig $config,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                IJobList $jobList) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Chunk cleanup scheduler';
-	}
+    public function getName(): string {
+        return 'Chunk cleanup scheduler';
+    }
 
-	public function run(IOutput $output) {
-		// If we already ran this onec there is no need to run it again
-		if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
-			$output->info('Cleanup not required');
-		}
+    public function run(IOutput $output) {
+        // If we already ran this onec there is no need to run it again
+        if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
+            $output->info('Cleanup not required');
+        }
 
-		$output->startProgress();
-		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			try {
-				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-				$userRoot = $userFolder->getParent();
-				/** @var Folder $uploadFolder */
-				$uploadFolder = $userRoot->get('uploads');
-			} catch (NotFoundException $e) {
-				// No folder so skipping
-				return;
-			}
+        $output->startProgress();
+        // Loop over all seen users
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            try {
+                $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+                $userRoot = $userFolder->getParent();
+                /** @var Folder $uploadFolder */
+                $uploadFolder = $userRoot->get('uploads');
+            } catch (NotFoundException $e) {
+                // No folder so skipping
+                return;
+            }
 
-			// Insert a cleanup job for each folder we find
-			$uploads = $uploadFolder->getDirectoryListing();
-			foreach ($uploads as $upload) {
-				$this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
+            // Insert a cleanup job for each folder we find
+            $uploads = $uploadFolder->getDirectoryListing();
+            foreach ($uploads as $upload) {
+                $this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
 
 
-		$this->config->setAppValue('dav', 'chunks_migrated', '1');
-	}
+        $this->config->setAppValue('dav', 'chunks_migrated', '1');
+    }
 
 }

apps/dav/lib/RootCollection.php

Indentation +116 added lines, -116 removed lines

@@ -40,121 +40,121 @@
 
 class RootCollection extends SimpleCollection {
 
-	public function __construct() {
-		$config = \OC::$server->getConfig();
-		$l10n = \OC::$server->getL10N('dav');
-		$random = \OC::$server->getSecureRandom();
-		$logger = \OC::$server->getLogger();
-		$userManager = \OC::$server->getUserManager();
-		$userSession = \OC::$server->getUserSession();
-		$groupManager = \OC::$server->getGroupManager();
-		$shareManager = \OC::$server->getShareManager();
-		$db = \OC::$server->getDatabaseConnection();
-		$dispatcher = \OC::$server->getEventDispatcher();
-		$userPrincipalBackend = new Principal(
-			$userManager,
-			$groupManager,
-			$shareManager,
-			\OC::$server->getUserSession(),
-			$config
-		);
-		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $l10n);
-		$calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger);
-		$calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger);
-		// as soon as debug mode is enabled we allow listing of principals
-		$disableListing = !$config->getSystemValue('debug', false);
-
-		// setup the first level of the dav tree
-		$userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
-		$userPrincipals->disableListing = $disableListing;
-		$groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
-		$groupPrincipals->disableListing = $disableListing;
-		$systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
-		$systemPrincipals->disableListing = $disableListing;
-		$calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
-		$calendarResourcePrincipals->disableListing = $disableListing;
-		$calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
-		$calendarRoomPrincipals->disableListing = $disableListing;
-
-
-		$filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
-		$filesCollection->disableListing = $disableListing;
-		$caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
-		$userCalendarRoot->disableListing = $disableListing;
-
-		$resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
-		$resourceCalendarRoot->disableListing = $disableListing;
-		$roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
-		$roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
-		$roomCalendarRoot->disableListing = $disableListing;
-
-		$publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
-		$publicCalendarRoot->disableListing = $disableListing;
-
-		$systemTagCollection = new SystemTag\SystemTagsByIdCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getUserSession(),
-			$groupManager
-		);
-		$systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
-			\OC::$server->getSystemTagManager(),
-			\OC::$server->getSystemTagObjectMapper(),
-			\OC::$server->getUserSession(),
-			$groupManager,
-			\OC::$server->getEventDispatcher()
-		);
-		$commentsCollection = new Comments\RootCollection(
-			\OC::$server->getCommentsManager(),
-			$userManager,
-			\OC::$server->getUserSession(),
-			\OC::$server->getEventDispatcher(),
-			\OC::$server->getLogger()
-		);
-
-		$usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
-		$usersAddressBookRoot->disableListing = $disableListing;
-
-		$systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
-		$systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
-		$systemAddressBookRoot->disableListing = $disableListing;
-
-		$uploadCollection = new Upload\RootCollection(
-			$userPrincipalBackend,
-			'principals/users',
-			\OC::$server->query(CleanupService::class));
-		$uploadCollection->disableListing = $disableListing;
-
-		$avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
-		$avatarCollection->disableListing = $disableListing;
-
-		$children = [
-				new SimpleCollection('principals', [
-						$userPrincipals,
-						$groupPrincipals,
-						$systemPrincipals,
-						$calendarResourcePrincipals,
-						$calendarRoomPrincipals]),
-				$filesCollection,
-				$userCalendarRoot,
-				new SimpleCollection('system-calendars', [
-					$resourceCalendarRoot,
-					$roomCalendarRoot,
-				]),
-				$publicCalendarRoot,
-				new SimpleCollection('addressbooks', [
-						$usersAddressBookRoot,
-						$systemAddressBookRoot]),
-				$systemTagCollection,
-				$systemTagRelationsCollection,
-				$commentsCollection,
-				$uploadCollection,
-				$avatarCollection
-		];
-
-		parent::__construct('root', $children);
-	}
+    public function __construct() {
+        $config = \OC::$server->getConfig();
+        $l10n = \OC::$server->getL10N('dav');
+        $random = \OC::$server->getSecureRandom();
+        $logger = \OC::$server->getLogger();
+        $userManager = \OC::$server->getUserManager();
+        $userSession = \OC::$server->getUserSession();
+        $groupManager = \OC::$server->getGroupManager();
+        $shareManager = \OC::$server->getShareManager();
+        $db = \OC::$server->getDatabaseConnection();
+        $dispatcher = \OC::$server->getEventDispatcher();
+        $userPrincipalBackend = new Principal(
+            $userManager,
+            $groupManager,
+            $shareManager,
+            \OC::$server->getUserSession(),
+            $config
+        );
+        $groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $l10n);
+        $calendarResourcePrincipalBackend = new ResourcePrincipalBackend($db, $userSession, $groupManager, $logger);
+        $calendarRoomPrincipalBackend = new RoomPrincipalBackend($db, $userSession, $groupManager, $logger);
+        // as soon as debug mode is enabled we allow listing of principals
+        $disableListing = !$config->getSystemValue('debug', false);
+
+        // setup the first level of the dav tree
+        $userPrincipals = new Collection($userPrincipalBackend, 'principals/users');
+        $userPrincipals->disableListing = $disableListing;
+        $groupPrincipals = new Collection($groupPrincipalBackend, 'principals/groups');
+        $groupPrincipals->disableListing = $disableListing;
+        $systemPrincipals = new Collection(new SystemPrincipalBackend(), 'principals/system');
+        $systemPrincipals->disableListing = $disableListing;
+        $calendarResourcePrincipals = new Collection($calendarResourcePrincipalBackend, 'principals/calendar-resources');
+        $calendarResourcePrincipals->disableListing = $disableListing;
+        $calendarRoomPrincipals = new Collection($calendarRoomPrincipalBackend, 'principals/calendar-rooms');
+        $calendarRoomPrincipals->disableListing = $disableListing;
+
+
+        $filesCollection = new Files\RootCollection($userPrincipalBackend, 'principals/users');
+        $filesCollection->disableListing = $disableListing;
+        $caldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $userCalendarRoot = new CalendarRoot($userPrincipalBackend, $caldavBackend, 'principals/users');
+        $userCalendarRoot->disableListing = $disableListing;
+
+        $resourceCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $resourceCalendarRoot = new CalendarRoot($calendarResourcePrincipalBackend, $caldavBackend, 'principals/calendar-resources');
+        $resourceCalendarRoot->disableListing = $disableListing;
+        $roomCalendarCaldavBackend = new CalDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $random, $logger, $dispatcher);
+        $roomCalendarRoot = new CalendarRoot($calendarRoomPrincipalBackend, $roomCalendarCaldavBackend, 'principals/calendar-rooms');
+        $roomCalendarRoot->disableListing = $disableListing;
+
+        $publicCalendarRoot = new PublicCalendarRoot($caldavBackend, $l10n, $config);
+        $publicCalendarRoot->disableListing = $disableListing;
+
+        $systemTagCollection = new SystemTag\SystemTagsByIdCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getUserSession(),
+            $groupManager
+        );
+        $systemTagRelationsCollection = new SystemTag\SystemTagsRelationsCollection(
+            \OC::$server->getSystemTagManager(),
+            \OC::$server->getSystemTagObjectMapper(),
+            \OC::$server->getUserSession(),
+            $groupManager,
+            \OC::$server->getEventDispatcher()
+        );
+        $commentsCollection = new Comments\RootCollection(
+            \OC::$server->getCommentsManager(),
+            $userManager,
+            \OC::$server->getUserSession(),
+            \OC::$server->getEventDispatcher(),
+            \OC::$server->getLogger()
+        );
+
+        $usersCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $usersAddressBookRoot = new AddressBookRoot($userPrincipalBackend, $usersCardDavBackend, 'principals/users');
+        $usersAddressBookRoot->disableListing = $disableListing;
+
+        $systemCardDavBackend = new CardDavBackend($db, $userPrincipalBackend, $userManager, $groupManager, $dispatcher);
+        $systemAddressBookRoot = new AddressBookRoot(new SystemPrincipalBackend(), $systemCardDavBackend, 'principals/system');
+        $systemAddressBookRoot->disableListing = $disableListing;
+
+        $uploadCollection = new Upload\RootCollection(
+            $userPrincipalBackend,
+            'principals/users',
+            \OC::$server->query(CleanupService::class));
+        $uploadCollection->disableListing = $disableListing;
+
+        $avatarCollection = new Avatars\RootCollection($userPrincipalBackend, 'principals/users');
+        $avatarCollection->disableListing = $disableListing;
+
+        $children = [
+                new SimpleCollection('principals', [
+                        $userPrincipals,
+                        $groupPrincipals,
+                        $systemPrincipals,
+                        $calendarResourcePrincipals,
+                        $calendarRoomPrincipals]),
+                $filesCollection,
+                $userCalendarRoot,
+                new SimpleCollection('system-calendars', [
+                    $resourceCalendarRoot,
+                    $roomCalendarRoot,
+                ]),
+                $publicCalendarRoot,
+                new SimpleCollection('addressbooks', [
+                        $usersAddressBookRoot,
+                        $systemAddressBookRoot]),
+                $systemTagCollection,
+                $systemTagRelationsCollection,
+                $commentsCollection,
+                $uploadCollection,
+                $avatarCollection
+        ];
+
+        parent::__construct('root', $children);
+    }
 
 }

apps/dav/lib/Upload/UploadHome.php

Indentation +54 added lines, -54 removed lines

@@ -31,70 +31,70 @@
 
 class UploadHome implements ICollection {
 
-	/** @var array */
-	private $principalInfo;
-	/** @var CleanupService */
-	private $cleanupService;
+    /** @var array */
+    private $principalInfo;
+    /** @var CleanupService */
+    private $cleanupService;
 
-	public function __construct(array $principalInfo, CleanupService $cleanupService) {
-		$this->principalInfo = $principalInfo;
-		$this->cleanupService = $cleanupService;
-	}
+    public function __construct(array $principalInfo, CleanupService $cleanupService) {
+        $this->principalInfo = $principalInfo;
+        $this->cleanupService = $cleanupService;
+    }
 
-	public function createFile($name, $data = null) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    public function createFile($name, $data = null) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	public function createDirectory($name) {
-		$this->impl()->createDirectory($name);
+    public function createDirectory($name) {
+        $this->impl()->createDirectory($name);
 
-		// Add a cleanup job
-		$this->cleanupService->addJob($name);
-	}
+        // Add a cleanup job
+        $this->cleanupService->addJob($name);
+    }
 
-	public function getChild($name): UploadFolder {
-		return new UploadFolder($this->impl()->getChild($name), $this->cleanupService);
-	}
+    public function getChild($name): UploadFolder {
+        return new UploadFolder($this->impl()->getChild($name), $this->cleanupService);
+    }
 
-	public function getChildren(): array {
-		return array_map(function($node) {
-			return new UploadFolder($node, $this->cleanupService);
-		}, $this->impl()->getChildren());
-	}
+    public function getChildren(): array {
+        return array_map(function($node) {
+            return new UploadFolder($node, $this->cleanupService);
+        }, $this->impl()->getChildren());
+    }
 
-	public function childExists($name): bool {
-		return !is_null($this->getChild($name));
-	}
+    public function childExists($name): bool {
+        return !is_null($this->getChild($name));
+    }
 
-	public function delete() {
-		$this->impl()->delete();
-	}
+    public function delete() {
+        $this->impl()->delete();
+    }
 
-	public function getName() {
-		list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
-		return $name;
-	}
+    public function getName() {
+        list(,$name) = \Sabre\Uri\split($this->principalInfo['uri']);
+        return $name;
+    }
 
-	public function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    public function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	public function getLastModified() {
-		return $this->impl()->getLastModified();
-	}
+    public function getLastModified() {
+        return $this->impl()->getLastModified();
+    }
 
-	/**
-	 * @return Directory
-	 */
-	private function impl() {
-		$rootView = new View();
-		$user = \OC::$server->getUserSession()->getUser();
-		Filesystem::initMountPoints($user->getUID());
-		if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
-			$rootView->mkdir('/' . $user->getUID() . '/uploads');
-		}
-		$view = new View('/' . $user->getUID() . '/uploads');
-		$rootInfo = $view->getFileInfo('');
-		return new Directory($view, $rootInfo);
-	}
+    /**
+     * @return Directory
+     */
+    private function impl() {
+        $rootView = new View();
+        $user = \OC::$server->getUserSession()->getUser();
+        Filesystem::initMountPoints($user->getUID());
+        if (!$rootView->file_exists('/' . $user->getUID() . '/uploads')) {
+            $rootView->mkdir('/' . $user->getUID() . '/uploads');
+        }
+        $view = new View('/' . $user->getUID() . '/uploads');
+        $rootInfo = $view->getFileInfo('');
+        return new Directory($view, $rootInfo);
+    }
 }

apps/dav/lib/Upload/CleanupService.php

Indentation +14 added lines, -14 removed lines

@@ -29,21 +29,21 @@
 use OCP\IUserSession;
 
 class CleanupService {
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IUserSession $userSession, IJobList $jobList) {
-		$this->userSession = $userSession;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IUserSession $userSession, IJobList $jobList) {
+        $this->userSession = $userSession;
+        $this->jobList = $jobList;
+    }
 
-	public function addJob(string $folder) {
-		$this->jobList->add(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
-	}
+    public function addJob(string $folder) {
+        $this->jobList->add(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
+    }
 
-	public function removeJob(string $folder) {
-		$this->jobList->remove(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
-	}
+    public function removeJob(string $folder) {
+        $this->jobList->remove(UploadCleanup::class, ['uid' => $this->userSession->getUser()->getUID(), 'folder' => $folder]);
+    }
 }

apps/dav/lib/Upload/RootCollection.php

Indentation +20 added lines, -20 removed lines

@@ -28,28 +28,28 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/** @var CleanupService */
-	private $cleanupService;
+    /** @var CleanupService */
+    private $cleanupService;
 
-	public function __construct(PrincipalBackend\BackendInterface $principalBackend,
-								string $principalPrefix,
-								CleanupService $cleanupService) {
-		parent::__construct($principalBackend, $principalPrefix);
-		$this->cleanupService = $cleanupService;
-	}
+    public function __construct(PrincipalBackend\BackendInterface $principalBackend,
+                                string $principalPrefix,
+                                CleanupService $cleanupService) {
+        parent::__construct($principalBackend, $principalPrefix);
+        $this->cleanupService = $cleanupService;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getChildForPrincipal(array $principalInfo): UploadHome {
-		return new UploadHome($principalInfo, $this->cleanupService);
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getChildForPrincipal(array $principalInfo): UploadHome {
+        return new UploadHome($principalInfo, $this->cleanupService);
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getName(): string {
-		return 'uploads';
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getName(): string {
+        return 'uploads';
+    }
 
 }

apps/dav/lib/Upload/UploadFolder.php

Indentation +46 added lines, -46 removed lines

@@ -30,61 +30,61 @@
 
 class UploadFolder implements ICollection {
 
-	/** @var Directory */
-	private $node;
-	/** @var CleanupService */
-	private $cleanupService;
+    /** @var Directory */
+    private $node;
+    /** @var CleanupService */
+    private $cleanupService;
 
-	function __construct(Directory $node, CleanupService $cleanupService) {
-		$this->node = $node;
-		$this->cleanupService = $cleanupService;
-	}
+    function __construct(Directory $node, CleanupService $cleanupService) {
+        $this->node = $node;
+        $this->cleanupService = $cleanupService;
+    }
 
-	function createFile($name, $data = null) {
-		// TODO: verify name - should be a simple number
-		$this->node->createFile($name, $data);
-	}
+    function createFile($name, $data = null) {
+        // TODO: verify name - should be a simple number
+        $this->node->createFile($name, $data);
+    }
 
-	function createDirectory($name) {
-		throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
-	}
+    function createDirectory($name) {
+        throw new Forbidden('Permission denied to create file (filename ' . $name . ')');
+    }
 
-	function getChild($name) {
-		if ($name === '.file') {
-			return new FutureFile($this->node, '.file');
-		}
-		return $this->node->getChild($name);
-	}
+    function getChild($name) {
+        if ($name === '.file') {
+            return new FutureFile($this->node, '.file');
+        }
+        return $this->node->getChild($name);
+    }
 
-	function getChildren() {
-		$children = $this->node->getChildren();
-		$children[] = new FutureFile($this->node, '.file');
-		return $children;
-	}
+    function getChildren() {
+        $children = $this->node->getChildren();
+        $children[] = new FutureFile($this->node, '.file');
+        return $children;
+    }
 
-	function childExists($name) {
-		if ($name === '.file') {
-			return true;
-		}
-		return $this->node->childExists($name);
-	}
+    function childExists($name) {
+        if ($name === '.file') {
+            return true;
+        }
+        return $this->node->childExists($name);
+    }
 
-	function delete() {
-		$this->node->delete();
+    function delete() {
+        $this->node->delete();
 
-		// Background cleanup job is not needed anymore
-		$this->cleanupService->removeJob($this->getName());
-	}
+        // Background cleanup job is not needed anymore
+        $this->cleanupService->removeJob($this->getName());
+    }
 
-	function getName() {
-		return $this->node->getName();
-	}
+    function getName() {
+        return $this->node->getName();
+    }
 
-	function setName($name) {
-		throw new Forbidden('Permission denied to rename this folder');
-	}
+    function setName($name) {
+        throw new Forbidden('Permission denied to rename this folder');
+    }
 
-	function getLastModified() {
-		return $this->node->getLastModified();
-	}
+    function getLastModified() {
+        return $this->node->getLastModified();
+    }
 }