nextcloud / server

apps/user_ldap/lib/Command/ShowRemnants.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
 				'displayName' => $user->getDisplayName(),
 				'uid' => $user->getUID(),
 				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool) $input->getOption('short-date')),
+				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool) $input->getOption('short-date')),
 				'homePath' => $user->getHomePath(),
 				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
 			];

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
 
-	/** @var \OCP\IDateTimeFormatter */
-	protected $dateFormatter;
+    /** @var \OCP\IDateTimeFormatter */
+    protected $dateFormatter;
 
-	/**
-	 * @param DeletedUsersIndex $dui
-	 * @param IDateTimeFormatter $dateFormatter
-	 */
-	public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
-		$this->dui = $dui;
-		$this->dateFormatter = $dateFormatter;
-		parent::__construct();
-	}
+    /**
+     * @param DeletedUsersIndex $dui
+     * @param IDateTimeFormatter $dateFormatter
+     */
+    public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
+        $this->dui = $dui;
+        $this->dateFormatter = $dateFormatter;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
-			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
-			->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-remnants')
+            ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
+            ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
+            ->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
+    }
 
-	protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
-		if (!($timestamp > 0)) {
-			return $default;
-		}
-		if ($showShortDate) {
-			return date('Y-m-d', $timestamp);
-		}
-		return $this->dateFormatter->formatDate($timestamp);
-	}
+    protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
+        if (!($timestamp > 0)) {
+            return $default;
+        }
+        if ($showShortDate) {
+            return date('Y-m-d', $timestamp);
+        }
+        return $this->dateFormatter->formatDate($timestamp);
+    }
 
-	/**
-	 * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
-	 *
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var \Symfony\Component\Console\Helper\Table $table */
-		$table = new Table($output);
-		$table->setHeaders([
-			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
-			'Detected on', 'Dir', 'Sharer'
-		]);
-		$rows = [];
-		$resultSet = $this->dui->getUsers();
-		foreach ($resultSet as $user) {
-			$rows[] = [
-				'ocName' => $user->getOCName(),
-				'displayName' => $user->getDisplayName(),
-				'uid' => $user->getUID(),
-				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
-				'homePath' => $user->getHomePath(),
-				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
-			];
-		}
+    /**
+     * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
+     *
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var \Symfony\Component\Console\Helper\Table $table */
+        $table = new Table($output);
+        $table->setHeaders([
+            'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+            'Detected on', 'Dir', 'Sharer'
+        ]);
+        $rows = [];
+        $resultSet = $this->dui->getUsers();
+        foreach ($resultSet as $user) {
+            $rows[] = [
+                'ocName' => $user->getOCName(),
+                'displayName' => $user->getDisplayName(),
+                'uid' => $user->getUID(),
+                'dn' => $user->getDN(),
+                'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
+                'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+                'homePath' => $user->getHomePath(),
+                'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
+            ];
+        }
 
-		if ($input->getOption('json')) {
-			$output->writeln(json_encode($rows));
-		} else {
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+        if ($input->getOption('json')) {
+            $output->writeln(json_encode($rows));
+        } else {
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

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');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 		$output->startProgress();
 		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
 			try {
 				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 				$userRoot = $userFolder->getParent();

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/Migration/RemoveClassifiedEventActivity.php

Spacing +3 added lines, -3 removed lines

@@ -78,7 +78,7 @@ 
 			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
 				->setParameter('type', 'calendar')
 				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
+				->setParameter('event_uid', '%'.$this->connection->escapeLikeParameter('{"id":"'.$row['uid'].'"').'%');
 			$deletedEvents += $delete->execute();
 		}
 		$result->closeCursor();
@@ -108,8 +108,8 @@ 
 			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
 				->setParameter('type', 'calendar')
 				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
-				->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
+				->setParameter('event_uid', '%'.$this->connection->escapeLikeParameter('{"id":"'.$row['uid'].'"').'%')
+				->setParameter('filtered_name', '%'.$this->connection->escapeLikeParameter('{"id":"'.$row['uid'].'","name":"Busy"').'%');
 			$deletedEvents += $delete->execute();
 		}
 		$result->closeCursor();

Indentation +100 added lines, -100 removed lines

@@ -29,104 +29,104 @@
 
 class RemoveClassifiedEventActivity implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $connection;
-
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getName() {
-		return 'Remove activity entries of private events';
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function run(IOutput $output) {
-		if (!$this->connection->tableExists('activity')) {
-			return;
-		}
-
-		$deletedEvents = $this->removePrivateEventActivity();
-		$deletedEvents += $this->removeConfidentialUncensoredEventActivity();
-
-		$output->info("Removed $deletedEvents activity entries");
-	}
-
-	protected function removePrivateEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
-			$deletedEvents += $delete->execute();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function removeConfidentialUncensoredEventActivity(): int {
-		$deletedEvents = 0;
-
-		$delete = $this->connection->getQueryBuilder();
-		$delete->delete('activity')
-			->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
-			->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
-			->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
-			->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
-			->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('c.principaluri', 'o.calendarid', 'o.uid')
-			->from('calendarobjects', 'o')
-			->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
-			->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
-		$result = $query->execute();
-
-		while ($row = $result->fetch()) {
-			if ($row['principaluri'] === null) {
-				continue;
-			}
-
-			$delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
-				->setParameter('type', 'calendar')
-				->setParameter('calendar_id', $row['calendarid'])
-				->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
-				->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
-			$deletedEvents += $delete->execute();
-		}
-		$result->closeCursor();
-
-		return $deletedEvents;
-	}
-
-	protected function getPrincipal(string $principalUri): string {
-		$uri = explode('/', $principalUri);
-		return array_pop($uri);
-	}
+    /** @var IDBConnection */
+    private $connection;
+
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getName() {
+        return 'Remove activity entries of private events';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function run(IOutput $output) {
+        if (!$this->connection->tableExists('activity')) {
+            return;
+        }
+
+        $deletedEvents = $this->removePrivateEventActivity();
+        $deletedEvents += $this->removeConfidentialUncensoredEventActivity();
+
+        $output->info("Removed $deletedEvents activity entries");
+    }
+
+    protected function removePrivateEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_PRIVATE)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%');
+            $deletedEvents += $delete->execute();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function removeConfidentialUncensoredEventActivity(): int {
+        $deletedEvents = 0;
+
+        $delete = $this->connection->getQueryBuilder();
+        $delete->delete('activity')
+            ->where($delete->expr()->neq('affecteduser', $delete->createParameter('owner')))
+            ->andWhere($delete->expr()->eq('object_type', $delete->createParameter('type')))
+            ->andWhere($delete->expr()->eq('object_id', $delete->createParameter('calendar_id')))
+            ->andWhere($delete->expr()->like('subjectparams', $delete->createParameter('event_uid')))
+            ->andWhere($delete->expr()->notLike('subjectparams', $delete->createParameter('filtered_name')));
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('c.principaluri', 'o.calendarid', 'o.uid')
+            ->from('calendarobjects', 'o')
+            ->leftJoin('o', 'calendars', 'c', $query->expr()->eq('c.id', 'o.calendarid'))
+            ->where($query->expr()->eq('o.classification', $query->createNamedParameter(CalDavBackend::CLASSIFICATION_CONFIDENTIAL)));
+        $result = $query->execute();
+
+        while ($row = $result->fetch()) {
+            if ($row['principaluri'] === null) {
+                continue;
+            }
+
+            $delete->setParameter('owner', $this->getPrincipal($row['principaluri']))
+                ->setParameter('type', 'calendar')
+                ->setParameter('calendar_id', $row['calendarid'])
+                ->setParameter('event_uid', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '"') . '%')
+                ->setParameter('filtered_name', '%' . $this->connection->escapeLikeParameter('{"id":"' . $row['uid'] . '","name":"Busy"') . '%');
+            $deletedEvents += $delete->execute();
+        }
+        $result->closeCursor();
+
+        return $deletedEvents;
+    }
+
+    protected function getPrincipal(string $principalUri): string {
+        $uri = explode('/', $principalUri);
+        return array_pop($uri);
+    }
 }

lib/private/Files/ObjectStore/SwiftV2CachingAuthService.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
 use OpenStack\Identity\v2\Service;
 
 class SwiftV2CachingAuthService extends Service {
-	public function authenticate(array $options = []): array {
-		if (!empty($options['v2cachedToken'])) {
-			return [$options['v2cachedToken'], $options['v2serviceUrl']];
-		} else {
-			return parent::authenticate($options);
-		}
-	}
+    public function authenticate(array $options = []): array {
+        if (!empty($options['v2cachedToken'])) {
+            return [$options['v2cachedToken'], $options['v2serviceUrl']];
+        } else {
+            return parent::authenticate($options);
+        }
+    }
 }

apps/twofactor_backupcodes/lib/Settings/Personal.php

Indentation +3 added lines, -3 removed lines

@@ -28,8 +28,8 @@
 use OCP\Template;
 
 class Personal implements IPersonalProviderSettings {
-	public function getBody(): Template {
-		return new Template('twofactor_backupcodes', 'personal');
-	}
+    public function getBody(): Template {
+        return new Template('twofactor_backupcodes', 'personal');
+    }
 
 }

apps/files_trashbin/lib/Trash/LegacyTrashBackend.php

Spacing +6 added lines, -6 removed lines

@@ -52,8 +52,8 @@ 
 	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();
+		return array_map(function(FileInfo $file) use ($parent, $parentTrashPath, $isRoot, $user) {
+			$originalLocation = $isRoot ? $file['extraData'] : $parent->getOriginalLocation().'/'.$file->getName();
 			if (!$originalLocation) {
 				$originalLocation = $file->getName();
 			}
@@ -61,7 +61,7 @@ 
 				$this,
 				$originalLocation,
 				$file->getMTime(),
-				$parentTrashPath . '/' . $file->getName() . ($isRoot ? '.d' . $file->getMtime() : ''),
+				$parentTrashPath.'/'.$file->getName().($isRoot ? '.d'.$file->getMtime() : ''),
 				$file,
 				$user
 			);
@@ -76,7 +76,7 @@ 
 	public function listTrashFolder(ITrashItem $folder): array {
 		$user = $folder->getUser();
 		$entries = Helper::getTrashFiles($folder->getTrashPath(), $user->getUID());
-		return $this->mapTrashItems($entries, $user ,$folder);
+		return $this->mapTrashItems($entries, $user, $folder);
 	}
 
 	public function restoreItem(ITrashItem $item) {
@@ -86,7 +86,7 @@ 
 	public function removeItem(ITrashItem $item) {
 		$user = $item->getUser();
 		if ($item->isRootItem()) {
-			$path = substr($item->getTrashPath(), 0, -strlen('.d' . $item->getDeletedTime()));
+			$path = substr($item->getTrashPath(), 0, -strlen('.d'.$item->getDeletedTime()));
 			Trashbin::delete($path, $user->getUID(), $item->getDeletedTime());
 		} else {
 			Trashbin::delete($item->getTrashPath(), $user->getUID(), null);
@@ -98,7 +98,7 @@ 
 		if (!$storage instanceof Storage) {
 			return false;
 		}
-		$normalized = Filesystem::normalizePath($storage->getMountPoint() . '/' . $internalPath, true, false, true);
+		$normalized = Filesystem::normalizePath($storage->getMountPoint().'/'.$internalPath, true, false, true);
 		$view = Filesystem::getView();
 		if (!isset($this->deletedFiles[$normalized]) && $view instanceof View) {
 			$this->deletedFiles[$normalized] = $normalized;

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;
+        }
+    }
 }

apps/dav/lib/Provisioning/Apple/AppleProvisioningNode.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 
 
 	public function setName($name) {
-		throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
+		throw new Forbidden('Renaming '.self::FILENAME.' is forbidden');
 	}
 
 	/**
@@ -65,7 +65,7 @@ 
 	 * @throws Forbidden
 	 */
 	public function delete() {
-		throw new Forbidden(self::FILENAME . ' may not be deleted.');
+		throw new Forbidden(self::FILENAME.' may not be deleted.');
 	}
 
 	/**
@@ -86,6 +86,6 @@ 
 	 * @throws Forbidden
 	 */
 	public function propPatch(PropPatch $propPatch) {
-		throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
+		throw new Forbidden(self::FILENAME.'\'s properties may not be altered.');
 	}
 }

Indentation +47 added lines, -47 removed lines

@@ -30,61 +30,61 @@
 use Sabre\DAV\PropPatch;
 
 class AppleProvisioningNode implements INode, IProperties {
-	public const FILENAME = 'apple-provisioning.mobileconfig';
+    public const FILENAME = 'apple-provisioning.mobileconfig';
 
-	protected $timeFactory;
+    protected $timeFactory;
 
-	/**
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(ITimeFactory $timeFactory) {
-		$this->timeFactory = $timeFactory;
-	}
+    /**
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(ITimeFactory $timeFactory) {
+        $this->timeFactory = $timeFactory;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return self::FILENAME;
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return self::FILENAME;
+    }
 
 
-	public function setName($name) {
-		throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
-	}
+    public function setName($name) {
+        throw new Forbidden('Renaming ' . self::FILENAME . ' is forbidden');
+    }
 
-	/**
-	 * @return null
-	 */
-	public function getLastModified() {
-		return null;
-	}
+    /**
+     * @return null
+     */
+    public function getLastModified() {
+        return null;
+    }
 
-	/**
-	 * @throws Forbidden
-	 */
-	public function delete() {
-		throw new Forbidden(self::FILENAME . ' may not be deleted.');
-	}
+    /**
+     * @throws Forbidden
+     */
+    public function delete() {
+        throw new Forbidden(self::FILENAME . ' may not be deleted.');
+    }
 
-	/**
-	 * @param array $properties
-	 * @return array
-	 */
-	public function getProperties($properties) {
-		$datetime = $this->timeFactory->getDateTime();
+    /**
+     * @param array $properties
+     * @return array
+     */
+    public function getProperties($properties) {
+        $datetime = $this->timeFactory->getDateTime();
 
-		return [
-			'{DAV:}getcontentlength' => 42,
-			'{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC2822),
-		];
-	}
+        return [
+            '{DAV:}getcontentlength' => 42,
+            '{DAV:}getlastmodified' => $datetime->format(\DateTimeInterface::RFC2822),
+        ];
+    }
 
-	/**
-	 * @param PropPatch $propPatch
-	 * @throws Forbidden
-	 */
-	public function propPatch(PropPatch $propPatch) {
-		throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
-	}
+    /**
+     * @param PropPatch $propPatch
+     * @throws Forbidden
+     */
+    public function propPatch(PropPatch $propPatch) {
+        throw new Forbidden(self::FILENAME . '\'s properties may not be altered.');
+    }
 }

themes/example/defaults.php

Spacing +5 added lines, -5 removed lines

@@ -90,8 +90,8 @@ 
 	 * @return string short footer
 	 */
 	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -101,8 +101,8 @@ 
 	 * @return string long footer
 	 */
 	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return string documentation link
 	 */
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/15/go.php?to='.$key;
 	}
 
 

Indentation +104 added lines, -104 removed lines

@@ -20,108 +20,108 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Generate a documentation link for a given key
-	 * @return string documentation link
-	 */
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Generate a documentation link for a given key
+     * @return string documentation link
+     */
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 }