nextcloud / server

apps/settings/lib/Controller/ChangePasswordController.php

Spacing +1 added lines, -1 removed lines

@@ -229,7 +229,7 @@
 						'message' => $this->l->t('Please provide an admin recovery password; otherwise, all user data will be lost.'),
 					]
 				]);
-			} elseif ($recoveryEnabledForUser && ! $validRecoveryPassword) {
+			} elseif ($recoveryEnabledForUser && !$validRecoveryPassword) {
 				return new JSONResponse([
 					'status' => 'error',
 					'data' => [

apps/settings/templates/settings/admin/overview.php

Spacing +9 added lines, -9 removed lines

@@ -28,21 +28,21 @@ 
 ?>
 
 <div id="security-warning" class="section">
-	<h2 class="inlineblock"><?php p($l->t('Security & setup warnings'));?></h2>
-	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation'));?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.'));?></p>
+	<h2 class="inlineblock"><?php p($l->t('Security & setup warnings')); ?></h2>
+	<a target="_blank" rel="noreferrer" class="icon-info" title="<?php p($l->t('Open documentation')); ?>" href="<?php p(link_to_docs('admin-warnings')); ?>"></a>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the linked documentation for more information.')); ?></p>
 
 	<div id="security-warning-state-ok" class="hidden">
-		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.'));?></span>
+		<span class="icon icon-checkmark-white"></span><span class="message"><?php p($l->t('All checks passed.')); ?></span>
 	</div>
 	<div id="security-warning-state-failure" class="hidden">
-		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.'));?></span>
+		<span class="icon icon-close-white"></span><span class="message"><?php p($l->t('There are some errors regarding your setup.')); ?></span>
 	</div>
 	<div id="security-warning-state-warning" class="hidden">
-		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.'));?></span>
+		<span class="icon icon-error-white"></span><span class="message"><?php p($l->t('There are some warnings regarding your setup.')); ?></span>
 	</div>
 	<div id="security-warning-state-loading">
-		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.'));?></span>
+		<span class="icon loading"></span><span class="message"><?php p($l->t('Checking for system and security issues.')); ?></span>
 	</div>
 
 	<div id="postsetupchecks" data-check-wellknown="<?php if ($_['checkForWorkingWellKnownSetup']) {
@@ -59,13 +59,13 @@ 
 	</p>
 
 	<p class="extra-top-margin">
-		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com']));?>
+		<?php print_unescaped($l->t('Check the security of your Nextcloud over <a target="_blank" rel="noreferrer noopener" href="%s">our security scan ↗</a>.', ['https://scan.nextcloud.com'])); ?>
 	</p>
 
 </div>
 
 <div id="version" class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
-	<h2><?php p($l->t('Version'));?></h2>
+	<h2><?php p($l->t('Version')); ?></h2>
 	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer noopener" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 </div>

apps/settings/templates/settings/additional.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
 
 <?php foreach ($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p(''); ?>"><?php print_unescaped($form['form']); ?></div>
 	<?php }
 } ?>

apps/dav/lib/Connector/Sabre/Exception/InvalidPath.php

Spacing +3 added lines, -3 removed lines

@@ -49,17 +49,17 @@
 	 * @param \DOMElement $errorNode
 	 * @return void
 	 */
-	public function serialize(\Sabre\DAV\Server $server,\DOMElement $errorNode) {
+	public function serialize(\Sabre\DAV\Server $server, \DOMElement $errorNode) {
 
 		// set ownCloud namespace
 		$errorNode->setAttribute('xmlns:o', self::NS_OWNCLOUD);
 
 		// adding the retry node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:retry', var_export($this->retry, true));
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:retry', var_export($this->retry, true));
 		$errorNode->appendChild($error);
 
 		// adding the message node
-		$error = $errorNode->ownerDocument->createElementNS('o:','o:reason', $this->getMessage());
+		$error = $errorNode->ownerDocument->createElementNS('o:', 'o:reason', $this->getMessage());
 		$errorNode->appendChild($error);
 	}
 }

apps/dav/lib/Connector/Sabre/QuotaPlugin.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 			return;
 		}
 
-		return $this->checkQuota($parent->getPath() . '/' . basename($uri));
+		return $this->checkQuota($parent->getPath().'/'.basename($uri));
 	}
 
 	/**
@@ -163,7 +163,7 @@ 
 				// there is still enough space for the remaining chunks
 				$length -= $chunkHandler->getCurrentSize();
 				// use target file name for free space check in case of shared files
-				$path = rtrim($parentPath, '/') . '/' . $info['name'];
+				$path = rtrim($parentPath, '/').'/'.$info['name'];
 			}
 			$freeSpace = $this->getFreeSpace($path);
 			if ($freeSpace >= 0 && $length > $freeSpace) {

apps/dav/lib/Connector/Sabre/FilesReportPlugin.php

Spacing +9 added lines, -9 removed lines

@@ -186,14 +186,14 @@ 
 			return;
 		}
 
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$requestedProps = [];
 		$filterRules = [];
 
 		// parse report properties and gather filter info
 		foreach ($report as $reportProps) {
 			$name = $reportProps['name'];
-			if ($name === $ns . 'filter-rules') {
+			if ($name === $ns.'filter-rules') {
 				$filterRules = $reportProps['value'];
 			} elseif ($name === '{DAV:}prop') {
 				// propfind properties
@@ -254,7 +254,7 @@ 
 		if (empty($filesUri)) {
 			return '';
 		}
-		return '/' . $filesUri;
+		return '/'.$filesUri;
 	}
 
 	/**
@@ -266,19 +266,19 @@ 
 	 * @throws TagNotFoundException whenever a tag was not found
 	 */
 	protected function processFilterRules($filterRules) {
-		$ns = '{' . $this::NS_OWNCLOUD . '}';
+		$ns = '{'.$this::NS_OWNCLOUD.'}';
 		$resultFileIds = null;
 		$systemTagIds = [];
 		$circlesIds = [];
 		$favoriteFilter = null;
 		foreach ($filterRules as $filterRule) {
-			if ($filterRule['name'] === $ns . 'systemtag') {
+			if ($filterRule['name'] === $ns.'systemtag') {
 				$systemTagIds[] = $filterRule['value'];
 			}
 			if ($filterRule['name'] === self::CIRCLE_PROPERTYNAME) {
 				$circlesIds[] = $filterRule['value'];
 			}
-			if ($filterRule['name'] === $ns . 'favorite') {
+			if ($filterRule['name'] === $ns.'favorite') {
 				$favoriteFilter = true;
 			}
 		}
@@ -326,7 +326,7 @@ 
 			}
 
 			if (!empty($unknownTagIds)) {
-				throw new TagNotFoundException('Tag with ids ' . implode(', ', $unknownTagIds) . ' not found');
+				throw new TagNotFoundException('Tag with ids '.implode(', ', $unknownTagIds).' not found');
 			}
 		}
 
@@ -379,7 +379,7 @@ 
 	public function prepareResponses($filesUri, $requestedProps, $nodes) {
 		$responses = [];
 		foreach ($nodes as $node) {
-			$propFind = new PropFind($filesUri . $node->getPath(), $requestedProps);
+			$propFind = new PropFind($filesUri.$node->getPath(), $requestedProps);
 
 			$this->server->getPropertiesByNode($propFind, $node);
 			// copied from Sabre Server's getPropertiesForPath
@@ -392,7 +392,7 @@ 
 			}
 
 			$responses[] = new Response(
-				rtrim($this->server->getBaseUri(), '/') . $filesUri . $node->getPath(),
+				rtrim($this->server->getBaseUri(), '/').$filesUri.$node->getPath(),
 				$result,
 				200
 			);

apps/dav/lib/Connector/Sabre/ServerFactory.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 		}
 
 		// wait with registering these until auth is handled and the filesystem is setup
-		$server->on('beforeMethod:*', function () use ($server, $objectTree, $viewCallBack) {
+		$server->on('beforeMethod:*', function() use ($server, $objectTree, $viewCallBack) {
 			// ensure the skeleton is copied
 			$userFolder = \OC::$server->getUserFolder();
 

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

Spacing +9 added lines, -9 removed lines

@@ -106,7 +106,7 @@ 
 	 * @return boolean
 	 */
 	public function httpGet(RequestInterface $request, ResponseInterface $response):bool {
-		if ($request->getPath() !== 'provisioning/' . AppleProvisioningNode::FILENAME) {
+		if ($request->getPath() !== 'provisioning/'.AppleProvisioningNode::FILENAME) {
 			return true;
 		}
 
@@ -144,19 +144,19 @@ 
 		$carddavUUID = call_user_func($this->uuidClosure);
 		$profileUUID = call_user_func($this->uuidClosure);
 
-		$caldavIdentifier = $reverseDomain . '.' . $caldavUUID;
-		$carddavIdentifier = $reverseDomain . '.' . $carddavUUID;
-		$profileIdentifier = $reverseDomain . '.' . $profileUUID;
+		$caldavIdentifier = $reverseDomain.'.'.$caldavUUID;
+		$carddavIdentifier = $reverseDomain.'.'.$carddavUUID;
+		$profileIdentifier = $reverseDomain.'.'.$profileUUID;
 
 		$caldavDescription = $this->l10n->t('Configures a CalDAV account');
-		$caldavDisplayname = $description . ' CalDAV';
+		$caldavDisplayname = $description.' CalDAV';
 		$carddavDescription = $this->l10n->t('Configures a CardDAV account');
-		$carddavDisplayname = $description . ' CardDAV';
+		$carddavDisplayname = $description.' CardDAV';
 
-		$filename = $userId . '-' . AppleProvisioningNode::FILENAME;
+		$filename = $userId.'-'.AppleProvisioningNode::FILENAME;
 
 		$xmlSkeleton = $this->getTemplate();
-		$body = vsprintf($xmlSkeleton, array_map(function ($v) {
+		$body = vsprintf($xmlSkeleton, array_map(function($v) {
 			return \htmlspecialchars($v, ENT_XML1, 'UTF-8');
 		}, [
 			$description,
@@ -182,7 +182,7 @@ 
 		));
 
 		$response->setStatus(200);
-		$response->setHeader('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$response->setHeader('Content-Disposition', 'attachment; filename="'.$filename.'"');
 		$response->setHeader('Content-Type', 'application/xml; charset=utf-8');
 		$response->setBody($body);
 

apps/dav/lib/CalDAV/CachedSubscription.php

Spacing +5 added lines, -5 removed lines

@@ -60,16 +60,16 @@ 
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],
 			[
-				'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
+				'privilege' => '{'.Plugin::NS_CALDAV.'}read-free-busy',
 				'principal' => '{DAV:}authenticated',
 				'protected' => true,
 			],
@@ -89,12 +89,12 @@ 
 
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-write',
+				'principal' => $this->getOwner().'/calendar-proxy-write',
 				'protected' => true,
 			],
 			[
 				'privilege' => '{DAV:}read',
-				'principal' => $this->getOwner() . '/calendar-proxy-read',
+				'principal' => $this->getOwner().'/calendar-proxy-read',
 				'protected' => true,
 			],