nextcloud / server

apps/files/lib/BackgroundJob/TransferOwnership.php

Spacing +5 added lines, -5 removed lines

@@ -98,7 +98,7 @@ 
 		$destinationUserObject = $this->userManager->get($destinationUser);
 
 		if (!$sourceUserObject instanceof IUser) {
-			$this->logger->alert('Could not transfer ownership: Unknown source user ' . $sourceUser);
+			$this->logger->alert('Could not transfer ownership: Unknown source user '.$sourceUser);
 			$this->failedNotication($transfer);
 			return;
 		}
@@ -136,7 +136,7 @@ 
 				'targetUser' => $transfer->getTargetUser(),
 				'nodeName' => $transfer->getNodeName(),
 			])
-			->setObject('transfer', (string)$transfer->getId());
+			->setObject('transfer', (string) $transfer->getId());
 		$this->notificationManager->notify($notification);
 
 		// Send notification to source user
@@ -149,7 +149,7 @@ 
 				'targetUser' => $transfer->getTargetUser(),
 				'nodeName' => $transfer->getNodeName(),
 			])
-			->setObject('transfer', (string)$transfer->getId());
+			->setObject('transfer', (string) $transfer->getId());
 		$this->notificationManager->notify($notification);
 	}
 
@@ -164,7 +164,7 @@ 
 				'targetUser' => $transfer->getTargetUser(),
 				'nodeName' => $transfer->getNodeName(),
 			])
-			->setObject('transfer', (string)$transfer->getId());
+			->setObject('transfer', (string) $transfer->getId());
 		$this->notificationManager->notify($notification);
 
 		// Send notification to source user
@@ -177,7 +177,7 @@ 
 				'targetUser' => $transfer->getTargetUser(),
 				'nodeName' => $transfer->getNodeName(),
 			])
-			->setObject('transfer', (string)$transfer->getId());
+			->setObject('transfer', (string) $transfer->getId());
 		$this->notificationManager->notify($notification);
 	}
 }

Indentation +137 added lines, -137 removed lines

@@ -42,141 +42,141 @@
 
 class TransferOwnership extends QueuedJob {
 
-	/** @var IUserManager $userManager */
-	private $userManager;
-
-	/** @var OwnershipTransferService */
-	private $transferService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var NotificationManager */
-	private $notificationManager;
-
-	/** @var TransferOwnershipMapper */
-	private $mapper;
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	public function __construct(ITimeFactory $timeFactory,
-								IUserManager $userManager,
-								OwnershipTransferService $transferService,
-								ILogger $logger,
-								NotificationManager $notificationManager,
-								TransferOwnershipMapper $mapper,
-								IRootFolder $rootFolder) {
-		parent::__construct($timeFactory);
-
-		$this->userManager = $userManager;
-		$this->transferService = $transferService;
-		$this->logger = $logger;
-		$this->notificationManager = $notificationManager;
-		$this->mapper = $mapper;
-		$this->rootFolder = $rootFolder;
-	}
-
-	protected function run($argument) {
-		$id = $argument['id'];
-
-		$transfer = $this->mapper->getById($id);
-		$sourceUser = $transfer->getSourceUser();
-		$destinationUser = $transfer->getTargetUser();
-		$fileId = $transfer->getFileId();
-
-		$userFolder = $this->rootFolder->getUserFolder($sourceUser);
-		$nodes = $userFolder->getById($fileId);
-
-		if (empty($nodes)) {
-			$this->logger->alert('Could not transfer ownership: Node not found');
-			$this->failedNotication($transfer);
-			return;
-		}
-		$path = $userFolder->getRelativePath($nodes[0]->getPath());
-
-		$sourceUserObject = $this->userManager->get($sourceUser);
-		$destinationUserObject = $this->userManager->get($destinationUser);
-
-		if (!$sourceUserObject instanceof IUser) {
-			$this->logger->alert('Could not transfer ownership: Unknown source user ' . $sourceUser);
-			$this->failedNotication($transfer);
-			return;
-		}
-
-		if (!$destinationUserObject instanceof IUser) {
-			$this->logger->alert("Unknown destination user $destinationUser");
-			$this->failedNotication($transfer);
-			return;
-		}
-
-		try {
-			$this->transferService->transfer(
-				$sourceUserObject,
-				$destinationUserObject,
-				ltrim($path, '/')
-			);
-			$this->successNotification($transfer);
-		} catch (TransferOwnershipException $e) {
-			$this->logger->logException($e);
-			$this->failedNotication($transfer);
-		}
-
-		$this->mapper->delete($transfer);
-	}
-
-	private function failedNotication(Transfer $transfer): void {
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getSourceUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipFailedSource', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getTargetUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipFailedTarget', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-	}
-
-	private function successNotification(Transfer $transfer): void {
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getSourceUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipDoneSource', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-
-		// Send notification to source user
-		$notification = $this->notificationManager->createNotification();
-		$notification->setUser($transfer->getTargetUser())
-			->setApp(Application::APP_ID)
-			->setDateTime($this->time->getDateTime())
-			->setSubject('transferOwnershipDoneTarget', [
-				'sourceUser' => $transfer->getSourceUser(),
-				'targetUser' => $transfer->getTargetUser(),
-				'nodeName' => $transfer->getNodeName(),
-			])
-			->setObject('transfer', (string)$transfer->getId());
-		$this->notificationManager->notify($notification);
-	}
+    /** @var IUserManager $userManager */
+    private $userManager;
+
+    /** @var OwnershipTransferService */
+    private $transferService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var NotificationManager */
+    private $notificationManager;
+
+    /** @var TransferOwnershipMapper */
+    private $mapper;
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    public function __construct(ITimeFactory $timeFactory,
+                                IUserManager $userManager,
+                                OwnershipTransferService $transferService,
+                                ILogger $logger,
+                                NotificationManager $notificationManager,
+                                TransferOwnershipMapper $mapper,
+                                IRootFolder $rootFolder) {
+        parent::__construct($timeFactory);
+
+        $this->userManager = $userManager;
+        $this->transferService = $transferService;
+        $this->logger = $logger;
+        $this->notificationManager = $notificationManager;
+        $this->mapper = $mapper;
+        $this->rootFolder = $rootFolder;
+    }
+
+    protected function run($argument) {
+        $id = $argument['id'];
+
+        $transfer = $this->mapper->getById($id);
+        $sourceUser = $transfer->getSourceUser();
+        $destinationUser = $transfer->getTargetUser();
+        $fileId = $transfer->getFileId();
+
+        $userFolder = $this->rootFolder->getUserFolder($sourceUser);
+        $nodes = $userFolder->getById($fileId);
+
+        if (empty($nodes)) {
+            $this->logger->alert('Could not transfer ownership: Node not found');
+            $this->failedNotication($transfer);
+            return;
+        }
+        $path = $userFolder->getRelativePath($nodes[0]->getPath());
+
+        $sourceUserObject = $this->userManager->get($sourceUser);
+        $destinationUserObject = $this->userManager->get($destinationUser);
+
+        if (!$sourceUserObject instanceof IUser) {
+            $this->logger->alert('Could not transfer ownership: Unknown source user ' . $sourceUser);
+            $this->failedNotication($transfer);
+            return;
+        }
+
+        if (!$destinationUserObject instanceof IUser) {
+            $this->logger->alert("Unknown destination user $destinationUser");
+            $this->failedNotication($transfer);
+            return;
+        }
+
+        try {
+            $this->transferService->transfer(
+                $sourceUserObject,
+                $destinationUserObject,
+                ltrim($path, '/')
+            );
+            $this->successNotification($transfer);
+        } catch (TransferOwnershipException $e) {
+            $this->logger->logException($e);
+            $this->failedNotication($transfer);
+        }
+
+        $this->mapper->delete($transfer);
+    }
+
+    private function failedNotication(Transfer $transfer): void {
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getSourceUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipFailedSource', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getTargetUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipFailedTarget', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+    }
+
+    private function successNotification(Transfer $transfer): void {
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getSourceUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipDoneSource', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+
+        // Send notification to source user
+        $notification = $this->notificationManager->createNotification();
+        $notification->setUser($transfer->getTargetUser())
+            ->setApp(Application::APP_ID)
+            ->setDateTime($this->time->getDateTime())
+            ->setSubject('transferOwnershipDoneTarget', [
+                'sourceUser' => $transfer->getSourceUser(),
+                'targetUser' => $transfer->getTargetUser(),
+                'nodeName' => $transfer->getNodeName(),
+            ])
+            ->setObject('transfer', (string)$transfer->getId());
+        $this->notificationManager->notify($notification);
+    }
 }

apps/twofactor_backupcodes/lib/Notifications/Notifier.php

Indentation +59 added lines, -59 removed lines

@@ -35,63 +35,63 @@
 
 class Notifier implements INotifier {
 
-	/** @var IFactory */
-	private $factory;
-
-	/** @var IURLGenerator */
-	private $url;
-
-	public function __construct(IFactory $factory, IURLGenerator $url) {
-		$this->factory = $factory;
-		$this->url = $url;
-	}
-
-	/**
-	 * Identifier of the notifier, only use [a-z0-9_]
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getID(): string {
-		return 'twofactor_backupcodes';
-	}
-
-	/**
-	 * Human readable name describing the notifier
-	 *
-	 * @return string
-	 * @since 17.0.0
-	 */
-	public function getName(): string {
-		return $this->factory->get('twofactor_backupcodes')->t('Second-factor backup codes');
-	}
-
-	public function prepare(INotification $notification, string $languageCode): INotification {
-		if ($notification->getApp() !== 'twofactor_backupcodes') {
-			// Not my app => throw
-			throw new \InvalidArgumentException();
-		}
-
-		// Read the language from the notification
-		$l = $this->factory->get('twofactor_backupcodes', $languageCode);
-
-		switch ($notification->getSubject()) {
-			case 'create_backupcodes':
-				$notification->setParsedSubject(
-					$l->t('Generate backup codes')
-				)->setParsedMessage(
-					$l->t('You enabled two-factor authentication but did not generate backup codes yet. They are needed to restore access to your account in case you lose your second factor.')
-				);
-
-				$notification->setLink($this->url->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security']));
-
-				$notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.svg')));
-
-				return $notification;
-
-			default:
-				// Unknown subject => Unknown notification => throw
-				throw new \InvalidArgumentException();
-		}
-	}
+    /** @var IFactory */
+    private $factory;
+
+    /** @var IURLGenerator */
+    private $url;
+
+    public function __construct(IFactory $factory, IURLGenerator $url) {
+        $this->factory = $factory;
+        $this->url = $url;
+    }
+
+    /**
+     * Identifier of the notifier, only use [a-z0-9_]
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getID(): string {
+        return 'twofactor_backupcodes';
+    }
+
+    /**
+     * Human readable name describing the notifier
+     *
+     * @return string
+     * @since 17.0.0
+     */
+    public function getName(): string {
+        return $this->factory->get('twofactor_backupcodes')->t('Second-factor backup codes');
+    }
+
+    public function prepare(INotification $notification, string $languageCode): INotification {
+        if ($notification->getApp() !== 'twofactor_backupcodes') {
+            // Not my app => throw
+            throw new \InvalidArgumentException();
+        }
+
+        // Read the language from the notification
+        $l = $this->factory->get('twofactor_backupcodes', $languageCode);
+
+        switch ($notification->getSubject()) {
+            case 'create_backupcodes':
+                $notification->setParsedSubject(
+                    $l->t('Generate backup codes')
+                )->setParsedMessage(
+                    $l->t('You enabled two-factor authentication but did not generate backup codes yet. They are needed to restore access to your account in case you lose your second factor.')
+                );
+
+                $notification->setLink($this->url->linkToRouteAbsolute('settings.PersonalSettings.index', ['section' => 'security']));
+
+                $notification->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/password.svg')));
+
+                return $notification;
+
+            default:
+                // Unknown subject => Unknown notification => throw
+                throw new \InvalidArgumentException();
+        }
+    }
 }

apps/files/lib/Migration/Version11301Date20191205150729.php

Indentation +40 added lines, -40 removed lines

@@ -31,47 +31,47 @@
 
 class Version11301Date20191205150729 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('user_transfer_owner');
-		$table->addColumn('id', 'bigint', [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('source_user', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('target_user', 'string', [
-			'notnull' => true,
-			'length' => 64,
-		]);
-		$table->addColumn('file_id', 'bigint', [
-			'notnull' => true,
-			'length' => 20,
-		]);
-		$table->addColumn('node_name', 'string', [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->setPrimaryKey(['id']);
+        $table = $schema->createTable('user_transfer_owner');
+        $table->addColumn('id', 'bigint', [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('source_user', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('target_user', 'string', [
+            'notnull' => true,
+            'length' => 64,
+        ]);
+        $table->addColumn('file_id', 'bigint', [
+            'notnull' => true,
+            'length' => 20,
+        ]);
+        $table->addColumn('node_name', 'string', [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->setPrimaryKey(['id']);
 
-		// Quite radical, we just assume no one updates cross beta with a pending request.
-		// Do not try this at home
-		if ($schema->hasTable('user_transfer_ownership')) {
-			$schema->dropTable('user_transfer_ownership');
-		}
+        // Quite radical, we just assume no one updates cross beta with a pending request.
+        // Do not try this at home
+        if ($schema->hasTable('user_transfer_ownership')) {
+            $schema->dropTable('user_transfer_ownership');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

lib/private/Hooks/BasicEmitter.php

Indentation +1 added lines, -1 removed lines

@@ -27,5 +27,5 @@
  * @deprecated 18.0.0 use \OCP\EventDispatcher\IEventDispatcher
  */
 abstract class BasicEmitter implements Emitter {
-	use EmitterTrait;
+    use EmitterTrait;
 }

lib/public/WorkflowEngine/IFileCheck.php

Indentation +7 added lines, -7 removed lines

@@ -36,12 +36,12 @@
  * @since 18.0.0
  */
 interface IFileCheck extends IEntityCheck {
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 * @since 18.0.0
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     * @since 18.0.0
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void;
 
 }

apps/workflowengine/lib/Check/TFileCheck.php

Indentation +32 added lines, -32 removed lines

@@ -31,40 +31,40 @@
 use OCP\WorkflowEngine\IEntity;
 
 trait TFileCheck {
-	/** @var IStorage */
-	protected $storage;
+    /** @var IStorage */
+    protected $storage;
 
-	/** @var string */
-	protected $path;
+    /** @var string */
+    protected $path;
 
-	/** @var bool */
-	protected $isDir;
+    /** @var bool */
+    protected $isDir;
 
-	/**
-	 * @param IStorage $storage
-	 * @param string $path
-	 * @param bool $isDir
-	 * @since 18.0.0
-	 */
-	public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
-		$this->storage = $storage;
-		$this->path = $path;
-		$this->isDir = $isDir;
-	}
+    /**
+     * @param IStorage $storage
+     * @param string $path
+     * @param bool $isDir
+     * @since 18.0.0
+     */
+    public function setFileInfo(IStorage $storage, string $path, bool $isDir = false): void {
+        $this->storage = $storage;
+        $this->path = $path;
+        $this->isDir = $isDir;
+    }
 
-	/**
-	 * @throws \OCP\Files\NotFoundException
-	 */
-	public function setEntitySubject(IEntity $entity, $subject): void {
-		if ($entity instanceof File) {
-			if (!$subject instanceof Node) {
-				throw new \UnexpectedValueException(
-					'Expected Node subject for File entity, got {class}',
-					['app' => Application::APP_ID, 'class' => get_class($subject)]
-				);
-			}
-			$this->storage = $subject->getStorage();
-			$this->path = $subject->getPath();
-		}
-	}
+    /**
+     * @throws \OCP\Files\NotFoundException
+     */
+    public function setEntitySubject(IEntity $entity, $subject): void {
+        if ($entity instanceof File) {
+            if (!$subject instanceof Node) {
+                throw new \UnexpectedValueException(
+                    'Expected Node subject for File entity, got {class}',
+                    ['app' => Application::APP_ID, 'class' => get_class($subject)]
+                );
+            }
+            $this->storage = $subject->getStorage();
+            $this->path = $subject->getPath();
+        }
+    }
 }

apps/comments/lib/Search/Result.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 			$suffix = '…';
 		}
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+		return $prefix.mb_substr($message, $start, $end - $start).$suffix;
 	}
 
 }

Indentation +87 added lines, -87 removed lines

@@ -32,101 +32,101 @@
  * @deprecated 20.0.0
  */
 class Result extends BaseResult {
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $type = 'comment';
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $comment;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorId;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $authorName;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $path;
-	/**
-	 * @deprecated 20.0.0
-	 */
-	public $fileName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $type = 'comment';
+    /**
+     * @deprecated 20.0.0
+     */
+    public $comment;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorId;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $authorName;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $path;
+    /**
+     * @deprecated 20.0.0
+     */
+    public $fileName;
 
-	/**
-	 * @param string $search
-	 * @param IComment $comment
-	 * @param string $authorName
-	 * @param string $path
-	 * @throws NotFoundException
-	 * @deprecated 20.0.0
-	 */
-	public function __construct(string $search,
-								IComment $comment,
-								string $authorName,
-								string $path) {
-		parent::__construct(
-			(int) $comment->getId(),
-			$comment->getMessage()
-		/* @todo , [link to file] */
-		);
+    /**
+     * @param string $search
+     * @param IComment $comment
+     * @param string $authorName
+     * @param string $path
+     * @throws NotFoundException
+     * @deprecated 20.0.0
+     */
+    public function __construct(string $search,
+                                IComment $comment,
+                                string $authorName,
+                                string $path) {
+        parent::__construct(
+            (int) $comment->getId(),
+            $comment->getMessage()
+        /* @todo , [link to file] */
+        );
 
-		$this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
-		$this->authorId = $comment->getActorId();
-		$this->authorName = $authorName;
-		$this->fileName = basename($path);
-		$this->path = $this->getVisiblePath($path);
-	}
+        $this->comment = $this->getRelevantMessagePart($comment->getMessage(), $search);
+        $this->authorId = $comment->getActorId();
+        $this->authorName = $authorName;
+        $this->fileName = basename($path);
+        $this->path = $this->getVisiblePath($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getVisiblePath(string $path): string {
-		$segments = explode('/', trim($path, '/'), 3);
+    /**
+     * @param string $path
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getVisiblePath(string $path): string {
+        $segments = explode('/', trim($path, '/'), 3);
 
-		if (!isset($segments[2])) {
-			throw new NotFoundException('Path not inside visible section');
-		}
+        if (!isset($segments[2])) {
+            throw new NotFoundException('Path not inside visible section');
+        }
 
-		return $segments[2];
-	}
+        return $segments[2];
+    }
 
-	/**
-	 * @param string $message
-	 * @param string $search
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	protected function getRelevantMessagePart(string $message, string $search): string {
-		$start = mb_stripos($message, $search);
-		if ($start === false) {
-			throw new NotFoundException('Comment section not found');
-		}
+    /**
+     * @param string $message
+     * @param string $search
+     * @return string
+     * @throws NotFoundException
+     */
+    protected function getRelevantMessagePart(string $message, string $search): string {
+        $start = mb_stripos($message, $search);
+        if ($start === false) {
+            throw new NotFoundException('Comment section not found');
+        }
 
-		$end = $start + mb_strlen($search);
+        $end = $start + mb_strlen($search);
 
-		if ($start <= 25) {
-			$start = 0;
-			$prefix = '';
-		} else {
-			$start -= 25;
-			$prefix = '…';
-		}
+        if ($start <= 25) {
+            $start = 0;
+            $prefix = '';
+        } else {
+            $start -= 25;
+            $prefix = '…';
+        }
 
-		if ((mb_strlen($message) - $end) <= 25) {
-			$end = mb_strlen($message);
-			$suffix = '';
-		} else {
-			$end += 25;
-			$suffix = '…';
-		}
+        if ((mb_strlen($message) - $end) <= 25) {
+            $end = mb_strlen($message);
+            $suffix = '';
+        } else {
+            $end += 25;
+            $suffix = '…';
+        }
 
-		return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
-	}
+        return $prefix . mb_substr($message, $start, $end - $start) . $suffix;
+    }
 }

apps/files_sharing/lib/Controller/AcceptController.php

Indentation +34 added lines, -34 removed lines

@@ -37,47 +37,47 @@
 
 class AcceptController extends Controller {
 
-	/** @var ShareManager */
-	private $shareManager;
+    /** @var ShareManager */
+    private $shareManager;
 
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IRequest $request, ShareManager $shareManager, IUserSession $userSession, IURLGenerator $urlGenerator) {
-		parent::__construct(Application::APP_ID, $request);
+    public function __construct(IRequest $request, ShareManager $shareManager, IUserSession $userSession, IURLGenerator $urlGenerator) {
+        parent::__construct(Application::APP_ID, $request);
 
-		$this->shareManager = $shareManager;
-		$this->userSession = $userSession;
-		$this->urlGenerator = $urlGenerator;
-	}
+        $this->shareManager = $shareManager;
+        $this->userSession = $userSession;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 */
-	public function accept(string $shareId): Response {
-		try {
-			$share = $this->shareManager->getShareById($shareId);
-		} catch (ShareNotFound $e) {
-			return new NotFoundResponse();
-		}
+    /**
+     * @NoAdminRequired
+     * @NoCSRFRequired
+     */
+    public function accept(string $shareId): Response {
+        try {
+            $share = $this->shareManager->getShareById($shareId);
+        } catch (ShareNotFound $e) {
+            return new NotFoundResponse();
+        }
 
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			return new NotFoundResponse();
-		}
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            return new NotFoundResponse();
+        }
 
-		try {
-			$share = $this->shareManager->acceptShare($share, $user->getUID());
-		} catch (\Exception $e) {
-			// Just ignore
-		}
+        try {
+            $share = $this->shareManager->acceptShare($share, $user->getUID());
+        } catch (\Exception $e) {
+            // Just ignore
+        }
 
-		$url = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
+        $url = $this->urlGenerator->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $share->getNode()->getId()]);
 
-		return new RedirectResponse($url);
-	}
+        return new RedirectResponse($url);
+    }
 }

lib/public/AppFramework/Http/Template/ExternalShareMenuAction.php

Spacing +10 added lines, -10 removed lines

@@ -66,16 +66,16 @@
 	 * @since 14.0.0
 	 */
 	public function render(): string {
-		return '<li>' .
-			'    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
-			'</li>' .
-			'<li id="external-share-menu-item" class="hidden">' .
-			'    <span class="menuitem">' .
-			'        <form class="save-form" action="#">' .
-			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
-			'        </form>' .
-			'    </span>' .
+		return '<li>'.
+			'    <button id="save-external-share" class="icon '.Util::sanitizeHTML($this->getIcon()).'" data-protected="false" data-owner-display-name="'.Util::sanitizeHTML($this->displayname).'" data-owner="'.Util::sanitizeHTML($this->owner).'" data-name="'.Util::sanitizeHTML($this->shareName).'">'.Util::sanitizeHTML($this->getLabel()).'</button>'.
+			'</li>'.
+			'<li id="external-share-menu-item" class="hidden">'.
+			'    <span class="menuitem">'.
+			'        <form class="save-form" action="#">'.
+			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">'.
+			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>'.
+			'        </form>'.
+			'    </span>'.
 			'</li>';
 	}
 }

Indentation +38 added lines, -38 removed lines

@@ -33,46 +33,46 @@
  * @since 14.0.0
  */
 class ExternalShareMenuAction extends SimpleMenuAction {
-	/** @var string */
-	private $owner;
+    /** @var string */
+    private $owner;
 
-	/** @var string */
-	private $displayname;
+    /** @var string */
+    private $displayname;
 
-	/** @var string */
-	private $shareName;
+    /** @var string */
+    private $shareName;
 
-	/**
-	 * ExternalShareMenuAction constructor.
-	 *
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $owner
-	 * @param string $displayname
-	 * @param string $shareName
-	 * @since 14.0.0
-	 */
-	public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
-		parent::__construct('save', $label, $icon);
-		$this->owner = $owner;
-		$this->displayname = $displayname;
-		$this->shareName = $shareName;
-	}
+    /**
+     * ExternalShareMenuAction constructor.
+     *
+     * @param string $label
+     * @param string $icon
+     * @param string $owner
+     * @param string $displayname
+     * @param string $shareName
+     * @since 14.0.0
+     */
+    public function __construct(string $label, string $icon, string $owner, string $displayname, string $shareName) {
+        parent::__construct('save', $label, $icon);
+        $this->owner = $owner;
+        $this->displayname = $displayname;
+        $this->shareName = $shareName;
+    }
 
-	/**
-	 * @since 14.0.0
-	 */
-	public function render(): string {
-		return '<li>' .
-			'    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
-			'</li>' .
-			'<li id="external-share-menu-item" class="hidden">' .
-			'    <span class="menuitem">' .
-			'        <form class="save-form" action="#">' .
-			'            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
-			'            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
-			'        </form>' .
-			'    </span>' .
-			'</li>';
-	}
+    /**
+     * @since 14.0.0
+     */
+    public function render(): string {
+        return '<li>' .
+            '    <button id="save-external-share" class="icon ' . Util::sanitizeHTML($this->getIcon()) . '" data-protected="false" data-owner-display-name="' . Util::sanitizeHTML($this->displayname) . '" data-owner="' . Util::sanitizeHTML($this->owner) . '" data-name="' . Util::sanitizeHTML($this->shareName) . '">' . Util::sanitizeHTML($this->getLabel()) . '</button>' .
+            '</li>' .
+            '<li id="external-share-menu-item" class="hidden">' .
+            '    <span class="menuitem">' .
+            '        <form class="save-form" action="#">' .
+            '            <input type="text" id="remote_address" placeholder="user@yourNextcloud.org">' .
+            '            <input type="submit" value=" " id="save-button-confirm" class="icon-confirm" disabled="disabled"></button>' .
+            '        </form>' .
+            '    </span>' .
+            '</li>';
+    }
 }