nextcloud / server

apps/encryption/lib/Crypto/EncryptAll.php

Spacing +12 added lines, -12 removed lines

@@ -135,7 +135,7 @@ 
 		$this->input = $input;
 		$this->output = $output;
 
-		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$headline = 'Encrypt all files with the '.Encryption::DISPLAY_NAME;
 		$this->output->writeln("\n");
 		$this->output->writeln($headline);
 		$this->output->writeln(str_pad('', strlen($headline), '='));
@@ -184,14 +184,14 @@ 
 		$progress->setFormat(" %message% \n [%bar%]");
 		$progress->start();
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
 				$users = $backend->getUsers('', $limit, $offset);
 				foreach ($users as $user) {
 					if ($this->keyManager->userHasKeys($user) === false) {
-						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->setMessage('Create key-pair for '.$user);
 						$progress->advance();
 						$this->setupUserFS($user);
 						$password = $this->generateOneTimePassword($user);
@@ -203,7 +203,7 @@ 
 					}
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 
 		$progress->setMessage('Key-pair created for all users');
@@ -241,7 +241,7 @@ 
 	 */
 	protected function encryptAllUserFilesWithMasterKey(ProgressBar $progress) {
 		$userNo = 1;
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -252,7 +252,7 @@ 
 					$userNo++;
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 	}
 
@@ -267,19 +267,19 @@ 
 
 		$this->setupUserFS($uid);
 		$directories = [];
-		$directories[] =  '/' . $uid . '/files';
+		$directories[] = '/'.$uid.'/files';
 
-		while($root = array_pop($directories)) {
+		while ($root = array_pop($directories)) {
 			$content = $this->rootView->getDirectoryContent($root);
 			foreach ($content as $file) {
-				$path = $root . '/' . $file['name'];
+				$path = $root.'/'.$file['name'];
 				if ($this->rootView->is_dir($path)) {
 					$directories[] = $path;
 					continue;
 				} else {
 					$progress->setMessage("encrypt files for user $userCount: $path");
 					$progress->advance();
-					if($this->encryptFile($path) === false) {
+					if ($this->encryptFile($path) === false) {
 						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
 						$progress->advance();
 					}
@@ -303,7 +303,7 @@ 
 		}
 
 		$source = $path;
-		$target = $path . '.encrypted.' . time();
+		$target = $path.'.encrypted.'.time();
 
 		try {
 			$this->rootView->copy($source, $target);
@@ -425,7 +425,7 @@ 
 					continue;
 				}
 
-				$subject = (string)$this->l->t('one-time password for server-side-encryption');
+				$subject = (string) $this->l->t('one-time password for server-side-encryption');
 				list($htmlBody, $textBody) = $this->createMailBody($password);
 
 				// send it out now

apps/encryption/lib/Controller/RecoveryController.php

Spacing +17 added lines, -17 removed lines

@@ -74,36 +74,36 @@ 
 	public function adminRecovery($recoveryPassword, $confirmPassword, $adminEnableRecovery) {
 		// Check if both passwords are the same
 		if (empty($recoveryPassword)) {
-			$errorMessage = (string)$this->l->t('Missing recovery key password');
+			$errorMessage = (string) $this->l->t('Missing recovery key password');
 			return new DataResponse(['data' => ['message' => $errorMessage]],
 				Http::STATUS_BAD_REQUEST);
 		}
 
 		if (empty($confirmPassword)) {
-			$errorMessage = (string)$this->l->t('Please repeat the recovery key password');
+			$errorMessage = (string) $this->l->t('Please repeat the recovery key password');
 			return new DataResponse(['data' => ['message' => $errorMessage]],
 				Http::STATUS_BAD_REQUEST);
 		}
 
 		if ($recoveryPassword !== $confirmPassword) {
-			$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
+			$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
 			return new DataResponse(['data' => ['message' => $errorMessage]],
 				Http::STATUS_BAD_REQUEST);
 		}
 
 		if (isset($adminEnableRecovery) && $adminEnableRecovery === '1') {
 			if ($this->recovery->enableAdminRecovery($recoveryPassword)) {
-				return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully enabled')]]);
+				return new DataResponse(['data' => ['message' => (string) $this->l->t('Recovery key successfully enabled')]]);
 			}
-			return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(['data' => ['message' => (string) $this->l->t('Could not enable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
 		} elseif (isset($adminEnableRecovery) && $adminEnableRecovery === '0') {
 			if ($this->recovery->disableAdminRecovery($recoveryPassword)) {
-				return new DataResponse(['data' => ['message' => (string)$this->l->t('Recovery key successfully disabled')]]);
+				return new DataResponse(['data' => ['message' => (string) $this->l->t('Recovery key successfully disabled')]]);
 			}
-			return new DataResponse(['data' => ['message' => (string)$this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
+			return new DataResponse(['data' => ['message' => (string) $this->l->t('Could not disable recovery key. Please check your recovery key password!')]], Http::STATUS_BAD_REQUEST);
 		}
 		// this response should never be sent but just in case.
-		return new DataResponse(['data' => ['message' => (string)$this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
+		return new DataResponse(['data' => ['message' => (string) $this->l->t('Missing parameters')]], Http::STATUS_BAD_REQUEST);
 	}
 
 	/**
@@ -115,22 +115,22 @@ 
 	public function changeRecoveryPassword($newPassword, $oldPassword, $confirmPassword) {
 		//check if both passwords are the same
 		if (empty($oldPassword)) {
-			$errorMessage = (string)$this->l->t('Please provide the old recovery password');
+			$errorMessage = (string) $this->l->t('Please provide the old recovery password');
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
 		}
 
 		if (empty($newPassword)) {
-			$errorMessage = (string)$this->l->t('Please provide a new recovery password');
+			$errorMessage = (string) $this->l->t('Please provide a new recovery password');
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
 		}
 
 		if (empty($confirmPassword)) {
-			$errorMessage = (string)$this->l->t('Please repeat the new recovery password');
+			$errorMessage = (string) $this->l->t('Please repeat the new recovery password');
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
 		}
 
 		if ($newPassword !== $confirmPassword) {
-			$errorMessage = (string)$this->l->t('Repeated recovery key password does not match the provided recovery key password');
+			$errorMessage = (string) $this->l->t('Repeated recovery key password does not match the provided recovery key password');
 			return new DataResponse(['data' => ['message' => $errorMessage]], Http::STATUS_BAD_REQUEST);
 		}
 
@@ -141,14 +141,14 @@ 
 			return new DataResponse(
 				[
 					'data' => [
-						'message' => (string)$this->l->t('Password successfully changed.')]
+						'message' => (string) $this->l->t('Password successfully changed.')]
 				]
 			);
 		}
 		return new DataResponse(
 			[
 				'data' => [
-					'message' => (string)$this->l->t('Could not change the password. Maybe the old password was not correct.')
+					'message' => (string) $this->l->t('Could not change the password. Maybe the old password was not correct.')
 				]
 			], Http::STATUS_BAD_REQUEST);
 	}
@@ -169,14 +169,14 @@ 
 					return new DataResponse(
 						[
 							'data' => [
-								'message' => (string)$this->l->t('Recovery Key disabled')]
+								'message' => (string) $this->l->t('Recovery Key disabled')]
 						]
 					);
 				}
 				return new DataResponse(
 					[
 						'data' => [
-							'message' => (string)$this->l->t('Recovery Key enabled')]
+							'message' => (string) $this->l->t('Recovery Key enabled')]
 					]
 				);
 			}
@@ -185,7 +185,7 @@ 
 		return new DataResponse(
 			[
 				'data' => [
-					'message' => (string)$this->l->t('Could not enable the recovery key, please try again or contact your administrator')
+					'message' => (string) $this->l->t('Could not enable the recovery key, please try again or contact your administrator')
 				]
 			], Http::STATUS_BAD_REQUEST);
 	}

apps/encryption/lib/Controller/StatusController.php

Spacing +5 added lines, -5 removed lines

@@ -70,28 +70,28 @@
 
 		$status = 'error';
 		$message = 'no valid init status';
-		switch($this->session->getStatus()) {
+		switch ($this->session->getStatus()) {
 			case Session::INIT_EXECUTED:
 				$status = 'interactionNeeded';
-				$message = (string)$this->l->t(
+				$message = (string) $this->l->t(
 					'Invalid private key for encryption app. Please update your private key password in your personal settings to recover access to your encrypted files.'
 				);
 				break;
 			case Session::NOT_INITIALIZED:
 				$status = 'interactionNeeded';
 				if ($this->encryptionManager->isEnabled()) {
-					$message = (string)$this->l->t(
+					$message = (string) $this->l->t(
 						'Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.'
 					);
 				} else {
-					$message = (string)$this->l->t(
+					$message = (string) $this->l->t(
 						'Please enable server side encryption in the admin settings in order to use the encryption module.'
 					);
 				}
 				break;
 			case Session::INIT_SUCCESSFUL:
 				$status = 'success';
-				$message = (string)$this->l->t('Encryption app is enabled and ready');
+				$message = (string) $this->l->t('Encryption app is enabled and ready');
 		}
 
 		return new DataResponse(

apps/comments/lib/Notification/Listener.php

Spacing +8 added lines, -8 removed lines

@@ -57,15 +57,15 @@ 
 		$comment = $event->getComment();
 
 		$mentions = $this->extractMentions($comment->getMentions());
-		if(empty($mentions)) {
+		if (empty($mentions)) {
 			// no one to notify
 			return;
 		}
 
 		$notification = $this->instantiateNotification($comment);
 
-		foreach($mentions as $uid) {
-			if(($comment->getActorType() === 'users' && $uid === $comment->getActorId())
+		foreach ($mentions as $uid) {
+			if (($comment->getActorType() === 'users' && $uid === $comment->getActorId())
 				|| !$this->userManager->userExists($uid)
 			) {
 				// do not notify unknown users or yourself
@@ -73,7 +73,7 @@ 
 			}
 
 			$notification->setUser($uid);
-			if($event->getEvent() === CommentsEvent::EVENT_DELETE
+			if ($event->getEvent() === CommentsEvent::EVENT_DELETE
 				|| $event->getEvent() === CommentsEvent::EVENT_PRE_UPDATE)
 			{
 				$this->notificationManager->markProcessed($notification);
@@ -94,7 +94,7 @@ 
 		$notification
 			->setApp('comments')
 			->setObject('comment', $comment->getId())
-			->setSubject('mention', [ $comment->getObjectType(), $comment->getObjectId() ])
+			->setSubject('mention', [$comment->getObjectType(), $comment->getObjectId()])
 			->setDateTime($comment->getCreationDateTime());
 
 		return $notification;
@@ -107,12 +107,12 @@ 
 	 * @return string[] containing the mentions, e.g. ['alice', 'bob']
 	 */
 	public function extractMentions(array $mentions) {
-		if(empty($mentions)) {
+		if (empty($mentions)) {
 			return [];
 		}
 		$uids = [];
-		foreach($mentions as $mention) {
-			if($mention['type'] === 'user') {
+		foreach ($mentions as $mention) {
+			if ($mention['type'] === 'user') {
 				$uids[] = $mention['id'];
 			}
 		}

apps/comments/lib/EventHandler.php

Spacing +3 added lines, -3 removed lines

@@ -49,13 +49,13 @@ 
 	 * @param CommentsEvent $event
 	 */
 	public function handle(CommentsEvent $event) {
-		if($event->getComment()->getObjectType() !== 'files') {
+		if ($event->getComment()->getObjectType() !== 'files') {
 			// this is a 'files'-specific Handler
 			return;
 		}
 
 		$eventType = $event->getEvent();
-		if($eventType === CommentsEvent::EVENT_ADD
+		if ($eventType === CommentsEvent::EVENT_ADD
 		) {
 			$this->notificationHandler($event);
 			$this->activityHandler($event);
@@ -67,7 +67,7 @@ 
 			CommentsEvent::EVENT_UPDATE,
 			CommentsEvent::EVENT_DELETE,
 		];
-		if(in_array($eventType, $applicableEvents)) {
+		if (in_array($eventType, $applicableEvents)) {
 			$this->notificationHandler($event);
 			return;
 		}

apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 		$httpClient = $this->clientService->newClient();
 
 		try {
-			$response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
+			$response = $httpClient->post($remote.'/index.php/apps/federatedfilesharing/createFederatedShare',
 				[
 					'body' =>
 						[

apps/theming/lib/ThemingDefaults.php

Spacing +30 added lines, -30 removed lines

@@ -150,37 +150,37 @@ 
 	}
 
 	public function getImprintUrl() {
-		return (string)$this->config->getAppValue('theming', 'imprintUrl', '');
+		return (string) $this->config->getAppValue('theming', 'imprintUrl', '');
 	}
 
 	public function getPrivacyUrl() {
-		return (string)$this->config->getAppValue('theming', 'privacyUrl', '');
+		return (string) $this->config->getAppValue('theming', 'privacyUrl', '');
 	}
 
 	public function getShortFooter() {
 		$slogan = $this->getSlogan();
 		$baseUrl = $this->getBaseUrl();
 		if ($baseUrl !== '') {
-			$footer = '<a href="' . $baseUrl . '" target="_blank"' .
-				' rel="noreferrer noopener" class="entity-name">' . $this->getEntity() . '</a>';
+			$footer = '<a href="'.$baseUrl.'" target="_blank"'.
+				' rel="noreferrer noopener" class="entity-name">'.$this->getEntity().'</a>';
 		} else {
-			$footer = '<span class="entity-name">' .$this->getEntity() . '</span>';
+			$footer = '<span class="entity-name">'.$this->getEntity().'</span>';
 		}
-		$footer .= ($slogan !== '' ? ' – ' . $slogan : '');
+		$footer .= ($slogan !== '' ? ' – '.$slogan : '');
 
 		$links = [
 			[
 				'text' => $this->l->t('Legal notice'),
-				'url' => (string)$this->getImprintUrl()
+				'url' => (string) $this->getImprintUrl()
 			],
 			[
 				'text' => $this->l->t('Privacy policy'),
-				'url' => (string)$this->getPrivacyUrl()
+				'url' => (string) $this->getPrivacyUrl()
 			],
 		];
 
 		$navigation = $this->navigationManager->getAll(INavigationManager::TYPE_GUEST);
-		$guestNavigation = array_map(function ($nav) {
+		$guestNavigation = array_map(function($nav) {
 			return [
 				'text' => $nav['name'],
 				'url' => $nav['href']
@@ -189,17 +189,17 @@ 
 		$links = array_merge($links, $guestNavigation);
 
 		$legalLinks = ''; $divider = '';
-		foreach($links as $link) {
-			if($link['url'] !== ''
+		foreach ($links as $link) {
+			if ($link['url'] !== ''
 				&& filter_var($link['url'], FILTER_VALIDATE_URL)
 			) {
-				$legalLinks .= $divider . '<a href="' . $link['url'] . '" class="legal" target="_blank"' .
-					' rel="noreferrer noopener">' . $link['text'] . '</a>';
+				$legalLinks .= $divider.'<a href="'.$link['url'].'" class="legal" target="_blank"'.
+					' rel="noreferrer noopener">'.$link['text'].'</a>';
 				$divider = ' · ';
 			}
 		}
-		if($legalLinks !== '') {
-			$footer .= '<br/>' . $legalLinks;
+		if ($legalLinks !== '') {
+			$footer .= '<br/>'.$legalLinks;
 		}
 
 		return $footer;
@@ -232,16 +232,16 @@ 
 
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
 
-		if(!$logo || !$logoExists) {
-			if($useSvg) {
+		if (!$logo || !$logoExists) {
+			if ($useSvg) {
 				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.svg');
 			} else {
 				$logo = $this->urlGenerator->imagePath('core', 'logo/logo.png');
 			}
-			return $logo . '?v=' . $cacheBusterCounter;
+			return $logo.'?v='.$cacheBusterCounter;
 		}
 
-		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', [ 'key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter ]);
+		return $this->urlGenerator->linkToRoute('theming.Theming.getImage', ['key' => 'logo', 'useSvg' => $useSvg, 'v' => $cacheBusterCounter]);
 	}
 
 	/**
@@ -279,17 +279,17 @@ 
 	 * @return array scss variables to overwrite
 	 */
 	public function getScssVariables() {
-		$cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
+		$cache = $this->cacheFactory->createDistributed('theming-'.$this->urlGenerator->getBaseUrl());
 		if ($value = $cache->get('getScssVariables')) {
 			return $value;
 		}
 
 		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
-			'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime') . "'",
-			'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime') . "'",
-			'theming-logoheader-mime' => "'" . $this->config->getAppValue('theming', 'logoheaderMime') . "'",
-			'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
+			'theming-cachebuster' => "'".$this->config->getAppValue('theming', 'cachebuster', '0')."'",
+			'theming-logo-mime' => "'".$this->config->getAppValue('theming', 'logoMime')."'",
+			'theming-background-mime' => "'".$this->config->getAppValue('theming', 'backgroundMime')."'",
+			'theming-logoheader-mime' => "'".$this->config->getAppValue('theming', 'logoheaderMime')."'",
+			'theming-favicon-mime' => "'".$this->config->getAppValue('theming', 'faviconMime')."'"
 		];
 
 		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
@@ -309,7 +309,7 @@ 
 		}
 
 		$variables['has-legal-links'] = 'false';
-		if($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
+		if ($this->getImprintUrl() !== '' || $this->getPrivacyUrl() !== '') {
 			$variables['has-legal-links'] = 'true';
 		}
 
@@ -347,18 +347,18 @@ 
 		if ($image === 'manifest.json') {
 			try {
 				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
+				if (file_exists($appPath.'/img/manifest.json')) {
 					return false;
 				}
 			} catch (AppPathNotFoundException $e) {}
 			$route = $this->urlGenerator->linkToRoute('theming.Theming.getManifest');
 		}
-		if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT . '/core/img/' . $image)) {
+		if (strpos($image, 'filetypes/') === 0 && file_exists(\OC::$SERVERROOT.'/core/img/'.$image)) {
 			$route = $this->urlGenerator->linkToRoute('theming.Icon.getThemedIcon', ['app' => $app, 'image' => $image]);
 		}
 
 		if ($route) {
-			return $route . '?v=' . $cacheBusterValue;
+			return $route.'?v='.$cacheBusterValue;
 		}
 
 		return false;
@@ -369,7 +369,7 @@ 
 	 */
 	private function increaseCacheBuster() {
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
 		$this->cacheFactory->createDistributed('theming-')->clear();
 		$this->cacheFactory->createDistributed('imagePath')->clear();
 

apps/files_versions/lib/Storage.php

Spacing +60 added lines, -60 removed lines

@@ -58,8 +58,8 @@ 
 
 class Storage {
 
-	const DEFAULTENABLED=true;
-	const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
+	const DEFAULTENABLED = true;
+	const DEFAULTMAXSIZE = 50; // unit: percentage; 50% of available disk space/quota
 	const VERSIONS_ROOT = 'files_versions/';
 
 	const DELETE_TRIGGER_MASTER_REMOVED = 0;
@@ -73,17 +73,17 @@ 
 
 	private static $max_versions_per_interval = [
 		//first 10sec, one version every 2sec
-		1 => ['intervalEndsAfter' => 10,      'step' => 2],
+		1 => ['intervalEndsAfter' => 10, 'step' => 2],
 		//next minute, one version every 10sec
-		2 => ['intervalEndsAfter' => 60,      'step' => 10],
+		2 => ['intervalEndsAfter' => 60, 'step' => 10],
 		//next hour, one version every minute
-		3 => ['intervalEndsAfter' => 3600,    'step' => 60],
+		3 => ['intervalEndsAfter' => 3600, 'step' => 60],
 		//next 24h, one version every hour
-		4 => ['intervalEndsAfter' => 86400,   'step' => 3600],
+		4 => ['intervalEndsAfter' => 86400, 'step' => 3600],
 		//next 30days, one version per day
 		5 => ['intervalEndsAfter' => 2592000, 'step' => 86400],
 		//until the end one version per week
-		6 => ['intervalEndsAfter' => -1,      'step' => 604800],
+		6 => ['intervalEndsAfter' => -1, 'step' => 604800],
 	];
 
 	/** @var \OCA\Files_Versions\AppInfo\Application */
@@ -157,7 +157,7 @@ 
 	 * @return int versions size
 	 */
 	private static function getVersionsSize($user) {
-		$view = new View('/' . $user);
+		$view = new View('/'.$user);
 		$fileInfo = $view->getFileInfo('/files_versions');
 		return isset($fileInfo['size']) ? $fileInfo['size'] : 0;
 	}
@@ -175,13 +175,13 @@ 
 		}
 
 		// we only handle existing files
-		if (! Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
+		if (!Filesystem::file_exists($filename) || Filesystem::is_dir($filename)) {
 			return false;
 		}
 
 		list($uid, $filename) = self::getUidAndFilename($filename);
 
-		$files_view = new View('/'.$uid .'/files');
+		$files_view = new View('/'.$uid.'/files');
 
 		$eventDispatcher = \OC::$server->getEventDispatcher();
 		$fileInfo = $files_view->getFileInfo($filename);
@@ -248,14 +248,14 @@ 
 
 		if (!Filesystem::file_exists($path)) {
 
-			$view = new View('/' . $uid . '/files_versions');
+			$view = new View('/'.$uid.'/files_versions');
 
 			$versions = self::getVersions($uid, $filename);
 			if (!empty($versions)) {
 				foreach ($versions as $v) {
-					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
-					self::deleteVersion($view, $filename . '.v' . $v['version']);
-					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path . $v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
+					self::deleteVersion($view, $filename.'.v'.$v['version']);
+					\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path.$v['version'], 'trigger' => self::DELETE_TRIGGER_MASTER_REMOVED]);
 				}
 			}
 		}
@@ -289,33 +289,33 @@ 
 		$rootView = new View('');
 
 		// did we move a directory ?
-		if ($rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if ($rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			// does the directory exists for versions too ?
-			if ($rootView->is_dir('/' . $sourceOwner . '/files_versions/' . $sourcePath)) {
+			if ($rootView->is_dir('/'.$sourceOwner.'/files_versions/'.$sourcePath)) {
 				// create missing dirs if necessary
-				self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+				self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 				// move the directory containing the versions
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath,
-					'/' . $targetOwner . '/files_versions/' . $targetPath
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath,
+					'/'.$targetOwner.'/files_versions/'.$targetPath
 				);
 			}
-		} else if ($versions = Storage::getVersions($sourceOwner, '/' . $sourcePath)) {
+		} else if ($versions = Storage::getVersions($sourceOwner, '/'.$sourcePath)) {
 			// create missing dirs if necessary
-			self::createMissingDirectories($targetPath, new View('/'. $targetOwner));
+			self::createMissingDirectories($targetPath, new View('/'.$targetOwner));
 
 			foreach ($versions as $v) {
 				// move each version one by one to the target directory
 				$rootView->$operation(
-					'/' . $sourceOwner . '/files_versions/' . $sourcePath.'.v' . $v['version'],
-					'/' . $targetOwner . '/files_versions/' . $targetPath.'.v'.$v['version']
+					'/'.$sourceOwner.'/files_versions/'.$sourcePath.'.v'.$v['version'],
+					'/'.$targetOwner.'/files_versions/'.$targetPath.'.v'.$v['version']
 				);
 			}
 		}
 
 		// if we moved versions directly for a file, schedule expiration check for that file
-		if (!$rootView->is_dir('/' . $targetOwner . '/files/' . $targetPath)) {
+		if (!$rootView->is_dir('/'.$targetOwner.'/files/'.$targetPath)) {
 			self::scheduleExpire($targetOwner, $targetPath);
 		}
 
@@ -331,13 +331,13 @@ 
 	public static function rollback(string $file, int $revision, IUser $user) {
 
 		// add expected leading slash
-		$filename = '/' . ltrim($file, '/');
+		$filename = '/'.ltrim($file, '/');
 
 		// Fetch the userfolder to trigger view hooks
 		$userFolder = \OC::$server->getUserFolder($user->getUID());
 
 		$users_view = new View('/'.$user->getUID());
-		$files_view = new View('/'. $user->getUID().'/files');
+		$files_view = new View('/'.$user->getUID().'/files');
 
 		$versionCreated = false;
 
@@ -355,7 +355,7 @@ 
 			$versionCreated = true;
 		}
 
-		$fileToRestore =  'files_versions' . $filename . '.v' . $revision;
+		$fileToRestore = 'files_versions'.$filename.'.v'.$revision;
 
 		// Restore encrypted version of the old file for the newly restored file
 		// This has to happen manually here since the file is manually copied below
@@ -371,7 +371,7 @@ 
 		);
 
 		// rollback
-		if (self::copyFileContents($users_view, $fileToRestore, 'files' . $filename)) {
+		if (self::copyFileContents($users_view, $fileToRestore, 'files'.$filename)) {
 			$files_view->touch($file, $revision);
 			Storage::scheduleExpire($user->getUID(), $file);
 
@@ -444,12 +444,12 @@ 
 			return $versions;
 		}
 		// fetch for old versions
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 
 		$pathinfo = pathinfo($filename);
 		$versionedFile = $pathinfo['basename'];
 
-		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT . '/' . $pathinfo['dirname']);
+		$dir = Filesystem::normalizePath(self::VERSIONS_ROOT.'/'.$pathinfo['dirname']);
 
 		$dirContent = false;
 		if ($view->is_dir($dir)) {
@@ -469,7 +469,7 @@ 
 						$pathparts = pathinfo($entryName);
 						$timestamp = substr($pathparts['extension'], 1);
 						$filename = $pathparts['filename'];
-						$key = $timestamp . '#' . $filename;
+						$key = $timestamp.'#'.$filename;
 						$versions[$key]['version'] = $timestamp;
 						$versions[$key]['humanReadableTimestamp'] = self::getHumanReadableTimestamp($timestamp);
 						if (empty($userFullPath)) {
@@ -477,9 +477,9 @@ 
 						} else {
 							$versions[$key]['preview'] = \OC::$server->getURLGenerator('files_version.Preview.getPreview', ['file' => $userFullPath, 'version' => $timestamp]);
 						}
-						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'] . '/' . $filename);
+						$versions[$key]['path'] = Filesystem::normalizePath($pathinfo['dirname'].'/'.$filename);
 						$versions[$key]['name'] = $versionedFile;
-						$versions[$key]['size'] = $view->filesize($dir . '/' . $entryName);
+						$versions[$key]['size'] = $view->filesize($dir.'/'.$entryName);
 						$versions[$key]['mimetype'] = \OC::$server->getMimeTypeDetector()->detectPath($versionedFile);
 					}
 				}
@@ -507,7 +507,7 @@ 
 
 		$toDelete = [];
 		foreach (array_reverse($versions['all']) as $key => $version) {
-			if ((int)$version['version'] <$threshold) {
+			if ((int) $version['version'] < $threshold) {
 				$toDelete[$key] = $version;
 			} else {
 				//Versions are sorted by time - nothing mo to iterate.
@@ -515,11 +515,11 @@ 
 			}
 		}
 
-		$view = new View('/' . $uid . '/files_versions');
+		$view = new View('/'.$uid.'/files_versions');
 		if (!empty($toDelete)) {
 			foreach ($toDelete as $version) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
-				self::deleteVersion($view, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($view, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_RETENTION_CONSTRAINT]);
 			}
 		}
@@ -535,19 +535,19 @@ 
 		$diff = time() - $timestamp;
 
 		if ($diff < 60) { // first minute
-			return  $diff . " seconds ago";
+			return  $diff." seconds ago";
 		} elseif ($diff < 3600) { //first hour
-			return round($diff / 60) . " minutes ago";
+			return round($diff / 60)." minutes ago";
 		} elseif ($diff < 86400) { // first day
-			return round($diff / 3600) . " hours ago";
+			return round($diff / 3600)." hours ago";
 		} elseif ($diff < 604800) { //first week
-			return round($diff / 86400) . " days ago";
+			return round($diff / 86400)." days ago";
 		} elseif ($diff < 2419200) { //first month
-			return round($diff / 604800) . " weeks ago";
+			return round($diff / 604800)." weeks ago";
 		} elseif ($diff < 29030400) { // first year
-			return round($diff / 2419200) . " months ago";
+			return round($diff / 2419200)." months ago";
 		} else {
-			return round($diff / 29030400) . " years ago";
+			return round($diff / 29030400)." years ago";
 		}
 
 	}
@@ -558,7 +558,7 @@ 
 	 * @return array with contains two arrays 'all' which contains all versions sorted by age and 'by_file' which contains all versions sorted by filename
 	 */
 	private static function getAllVersions($uid) {
-		$view = new View('/' . $uid . '/');
+		$view = new View('/'.$uid.'/');
 		$dirs = [self::VERSIONS_ROOT];
 		$versions = [];
 
@@ -568,7 +568,7 @@ 
 
 			foreach ($files as $file) {
 				$fileData = $file->getData();
-				$filePath = $dir . '/' . $fileData['name'];
+				$filePath = $dir.'/'.$fileData['name'];
 				if ($file['type'] === 'dir') {
 					$dirs[] = $filePath;
 				} else {
@@ -576,7 +576,7 @@ 
 					$relPathStart = strlen(self::VERSIONS_ROOT);
 					$version = substr($filePath, $versionsBegin + 2);
 					$relpath = substr($filePath, $relPathStart, $versionsBegin - $relPathStart);
-					$key = $version . '#' . $relpath;
+					$key = $version.'#'.$relpath;
 					$versions[$key] = ['path' => $relpath, 'timestamp' => $version];
 				}
 			}
@@ -617,13 +617,13 @@ 
 			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
 		} else {
 			$size = 0;
-			$toDelete = [];  // versions we want to delete
+			$toDelete = []; // versions we want to delete
 		}
 
 		foreach ($versions as $key => $version) {
 			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
 				$size += $version['size'];
-				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+				$toDelete[$key] = $version['path'].'.v'.$version['version'];
 			}
 		}
 
@@ -638,7 +638,7 @@ 
 	 */
 	protected static function getAutoExpireList($time, $versions) {
 		$size = 0;
-		$toDelete = [];  // versions we want to delete
+		$toDelete = []; // versions we want to delete
 
 		$interval = 1;
 		$step = Storage::$max_versions_per_interval[$interval]['step'];
@@ -660,9 +660,9 @@ 
 				if ($nextInterval === -1 || $prevTimestamp > $nextInterval) {
 					if ($version['version'] > $nextVersion) {
 						//distance between two version too small, mark to delete
-						$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+						$toDelete[$key] = $version['path'].'.v'.$version['version'];
 						$size += $version['size'];
-						\OC::$server->getLogger()->info('Mark to expire '. $version['path'] .' next version should be ' . $nextVersion . " or smaller. (prevTimestamp: " . $prevTimestamp . "; step: " . $step, ['app' => 'files_versions']);
+						\OC::$server->getLogger()->info('Mark to expire '.$version['path'].' next version should be '.$nextVersion." or smaller. (prevTimestamp: ".$prevTimestamp."; step: ".$step, ['app' => 'files_versions']);
 					} else {
 						$nextVersion = $version['version'] - $step;
 						$prevTimestamp = $version['version'];
@@ -717,8 +717,8 @@ 
 			// get available disk space for user
 			$user = \OC::$server->getUserManager()->get($uid);
 			if (is_null($user)) {
-				\OC::$server->getLogger()->error('Backends provided no user object for ' . $uid, ['app' => 'files_versions']);
-				throw new \OC\User\NoUserException('Backends provided no user object for ' . $uid);
+				\OC::$server->getLogger()->error('Backends provided no user object for '.$uid, ['app' => 'files_versions']);
+				throw new \OC\User\NoUserException('Backends provided no user object for '.$uid);
 			}
 
 			\OC_Util::setupFS($uid);
@@ -750,7 +750,7 @@ 
 			if ($quota >= 0) {
 				if ($softQuota) {
 					$userFolder = \OC::$server->getUserFolder($uid);
-					if(is_null($userFolder)) {
+					if (is_null($userFolder)) {
 						$availableSpace = 0;
 					} else {
 						$free = $quota - $userFolder->getSize(false); // remaining free space for user
@@ -790,18 +790,18 @@ 
 			}
 
 			$logger = \OC::$server->getLogger();
-			foreach($toDelete as $key => $path) {
+			foreach ($toDelete as $key => $path) {
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				self::deleteVersion($versionsFileview, $path);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $path, 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
 				unset($allVersions[$key]); // update array with the versions we keep
-				$logger->info('Expire: ' . $path, ['app' => 'files_versions']);
+				$logger->info('Expire: '.$path, ['app' => 'files_versions']);
 			}
 
 			// Check if enough space is available after versions are rearranged.
 			// If not we delete the oldest versions until we meet the size limit for versions,
 			// but always keep the two latest versions
-			$numOfVersions = count($allVersions) -2 ;
+			$numOfVersions = count($allVersions) - 2;
 			$i = 0;
 			// sort oldest first and make sure that we start at the first element
 			ksort($allVersions);
@@ -809,9 +809,9 @@ 
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				self::deleteVersion($versionsFileview, $version['path'] . '.v' . $version['version']);
+				self::deleteVersion($versionsFileview, $version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', ['path' => $version['path'].'.v'.$version['version'], 'trigger' => self::DELETE_TRIGGER_QUOTA_EXCEEDED]);
-				\OC::$server->getLogger()->info('running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
+				\OC::$server->getLogger()->info('running out of space! Delete oldest version: '.$version['path'].'.v'.$version['version'], ['app' => 'files_versions']);
 				$versionsSize -= $version['size'];
 				$availableSpace += $version['size'];
 				next($allVersions);
@@ -837,7 +837,7 @@ 
 		$dirParts = explode('/', $dirname);
 		$dir = "/files_versions";
 		foreach ($dirParts as $part) {
-			$dir = $dir . '/' . $part;
+			$dir = $dir.'/'.$part;
 			if (!$view->file_exists($dir)) {
 				$view->mkdir($dir);
 			}

apps/files_sharing/lib/Controller/ShareController.php

Spacing +6 added lines, -6 removed lines

@@ -229,7 +229,7 @@ 
 
 	protected function authSucceeded() {
 		// For share this was always set so it is still used in other apps
-		$this->session->set('public_link_authenticated', (string)$this->share->getId());
+		$this->session->set('public_link_authenticated', (string) $this->share->getId());
 	}
 
 	protected function authFailed() {
@@ -250,7 +250,7 @@ 
 		$itemType = $itemSource = $uidOwner = '';
 		$token = $share;
 		$exception = null;
-		if($share instanceof \OCP\Share\IShare) {
+		if ($share instanceof \OCP\Share\IShare) {
 			try {
 				$token = $share->getToken();
 				$uidOwner = $share->getSharedBy();
@@ -269,7 +269,7 @@ 
 			'errorCode' => $errorCode,
 			'errorMessage' => $errorMessage,
 		]);
-		if(!is_null($exception)) {
+		if (!is_null($exception)) {
 			throw $exception;
 		}
 	}
@@ -483,7 +483,7 @@ 
 
 		// OpenGraph Support: http://ogp.me/
 		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $shareTmpl['filename']]);
-		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->defaults->getName() . ($this->defaults->getSlogan() !== '' ? ' - ' . $this->defaults->getSlogan() : '')]);
+		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->defaults->getName().($this->defaults->getSlogan() !== '' ? ' - '.$this->defaults->getSlogan() : '')]);
 		\OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
 		\OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
 		\OCP\Util::addHeader('meta', ['property' => "og:type", 'content' => "object"]);
@@ -553,7 +553,7 @@ 
 
 		$share = $this->shareManager->getShareByToken($token);
 
-		if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
+		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
 			return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
 		}
 
@@ -636,7 +636,7 @@ 
 
 		$this->emitAccessShareHook($share);
 
-		$server_params = [ 'head' => $this->request->getMethod() === 'HEAD' ];
+		$server_params = ['head' => $this->request->getMethod() === 'HEAD'];
 
 		/**
 		 * Http range requests support