nextcloud / server

lib/private/Files/Config/UserMountCache.php

Spacing +10 added lines, -10 removed lines

@@ -87,11 +87,11 @@ 
 
 	public function registerMounts(IUser $user, array $mounts) {
 		// filter out non-proper storages coming from unit tests
-		$mounts = array_filter($mounts, function (IMountPoint $mount) {
+		$mounts = array_filter($mounts, function(IMountPoint $mount) {
 			return $mount instanceof SharedMount || $mount->getStorage() && $mount->getStorage()->getCache();
 		});
 		/** @var ICachedMountInfo[] $newMounts */
-		$newMounts = array_map(function (IMountPoint $mount) use ($user) {
+		$newMounts = array_map(function(IMountPoint $mount) use ($user) {
 			// filter out any storages which aren't scanned yet since we aren't interested in files from those storages (yet)
 			if ($mount->getStorageRootId() === -1) {
 				return null;
@@ -102,7 +102,7 @@ 
 		$newMounts = array_values(array_filter($newMounts));
 
 		$cachedMounts = $this->getMountsForUser($user);
-		$mountDiff = function (ICachedMountInfo $mount1, ICachedMountInfo $mount2) {
+		$mountDiff = function(ICachedMountInfo $mount1, ICachedMountInfo $mount2) {
 			// since we are only looking for mounts for a specific user comparing on root id is enough
 			return $mount1->getRootId() - $mount2->getRootId();
 		};
@@ -163,7 +163,7 @@ 
 			], ['root_id', 'user_id']);
 		} else {
 			// in some cases this is legitimate, like orphaned shares
-			$this->logger->debug('Could not get storage info for mount at ' . $mount->getMountPoint());
+			$this->logger->debug('Could not get storage info for mount at '.$mount->getMountPoint());
 		}
 	}
 
@@ -194,7 +194,7 @@ 
 		if (is_null($user)) {
 			return null;
 		}
-		return new CachedMountInfo($user, (int)$row['storage_id'], (int)$row['root_id'], $row['mount_point'], $row['mount_id'], isset($row['path']) ? $row['path'] : '');
+		return new CachedMountInfo($user, (int) $row['storage_id'], (int) $row['root_id'], $row['mount_point'], $row['mount_id'], isset($row['path']) ? $row['path'] : '');
 	}
 
 	/**
@@ -268,12 +268,12 @@ 
 			$row = $query->execute()->fetch();
 			if (is_array($row)) {
 				$this->cacheInfoCache[$fileId] = [
-					(int)$row['storage'],
+					(int) $row['storage'],
 					$row['path'],
-					(int)$row['mimetype']
+					(int) $row['mimetype']
 				];
 			} else {
-				throw new NotFoundException('File with id "' . $fileId . '" not found');
+				throw new NotFoundException('File with id "'.$fileId.'" not found');
 			}
 		}
 		return $this->cacheInfoCache[$fileId];
@@ -294,13 +294,13 @@ 
 		$mountsForStorage = $this->getMountsForStorageId($storageId, $user);
 
 		// filter mounts that are from the same storage but a different directory
-		return array_filter($mountsForStorage, function (ICachedMountInfo $mount) use ($internalPath, $fileId) {
+		return array_filter($mountsForStorage, function(ICachedMountInfo $mount) use ($internalPath, $fileId) {
 			if ($fileId === $mount->getRootId()) {
 				return true;
 			}
 			$internalMountPath = $mount->getRootInternalPath();
 
-			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath . '/';
+			return $internalMountPath === '' || substr($internalPath, 0, strlen($internalMountPath) + 1) === $internalMountPath.'/';
 		});
 	}
 

settings/Controller/UsersController.php

Spacing +24 added lines, -24 removed lines

@@ -335,7 +335,7 @@ 
 			}
 		}
 
-		$userIds = array_map(function (array $data) {
+		$userIds = array_map(function(array $data) {
 			return $data['name'];
 		}, $users);
 		$usedSpace = $this->userMountCache->getUsedSpaceForUsers($userIds);
@@ -361,7 +361,7 @@ 
 		if ($email !== '' && !$this->mailer->validateMailAddress($email)) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('Invalid mail address')
+					'message' => (string) $this->l10n->t('Invalid mail address')
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
@@ -397,7 +397,7 @@ 
 		if ($this->userManager->userExists($username)) {
 			return new DataResponse(
 				[
-					'message' => (string)$this->l10n->t('A user with that name already exists.')
+					'message' => (string) $this->l10n->t('A user with that name already exists.')
 				],
 				Http::STATUS_CONFLICT
 			);
@@ -408,7 +408,7 @@ 
 			if ($email === '') {
 				return new DataResponse(
 					[
-						'message' => (string)$this->l10n->t('To send a password link to the user an email address is required.')
+						'message' => (string) $this->l10n->t('To send a password link to the user an email address is required.')
 					],
 					Http::STATUS_UNPROCESSABLE_ENTITY
 				);
@@ -427,7 +427,7 @@ 
 			}
 			return new DataResponse(
 				[
-					'message' => (string)$message,
+					'message' => (string) $message,
 				],
 				Http::STATUS_FORBIDDEN
 			);
@@ -453,7 +453,7 @@ 
 					$emailTemplate = $this->newUserMailHelper->generateTemplate($user, $generatePasswordResetToken);
 					$this->newUserMailHelper->sendMail($user, $emailTemplate);
 				} catch (\Exception $e) {
-					$this->log->error("Can't send new user mail to $email: " . $e->getMessage(), ['app' => 'settings']);
+					$this->log->error("Can't send new user mail to $email: ".$e->getMessage(), ['app' => 'settings']);
 				}
 			}
 			// fetch users groups
@@ -467,7 +467,7 @@ 
 
 		return new DataResponse(
 			[
-				'message' => (string)$this->l10n->t('Unable to create user.')
+				'message' => (string) $this->l10n->t('Unable to create user.')
 			],
 			Http::STATUS_FORBIDDEN
 		);
@@ -490,7 +490,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Unable to delete user.')
+						'message' => (string) $this->l10n->t('Unable to delete user.')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -502,7 +502,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Authentication error')
+						'message' => (string) $this->l10n->t('Authentication error')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -527,7 +527,7 @@ 
 			[
 				'status' => 'error',
 				'data' => [
-					'message' => (string)$this->l10n->t('Unable to delete user.')
+					'message' => (string) $this->l10n->t('Unable to delete user.')
 				]
 			],
 			Http::STATUS_FORBIDDEN
@@ -542,11 +542,11 @@ 
 	 * @return DataResponse
 	 */
 	public function setEnabled($id, $enabled) {
-		$enabled = (bool)$enabled;
+		$enabled = (bool) $enabled;
 		if ($enabled) {
-			$errorMsgGeneral = (string)$this->l10n->t('Error while enabling user.');
+			$errorMsgGeneral = (string) $this->l10n->t('Error while enabling user.');
 		} else {
-			$errorMsgGeneral = (string)$this->l10n->t('Error while disabling user.');
+			$errorMsgGeneral = (string) $this->l10n->t('Error while disabling user.');
 		}
 
 		$userId = $this->userSession->getUser()->getUID();
@@ -569,7 +569,7 @@ 
 					[
 						'status' => 'error',
 						'data' => [
-							'message' => (string)$this->l10n->t('Authentication error')
+							'message' => (string) $this->l10n->t('Authentication error')
 						]
 					],
 					Http::STATUS_FORBIDDEN
@@ -621,11 +621,11 @@ 
 
 		$accountData = $this->accountManager->getUser($user);
 		$cloudId = $user->getCloudId();
-		$message = "Use my Federated Cloud ID to share with me: " . $cloudId;
+		$message = "Use my Federated Cloud ID to share with me: ".$cloudId;
 		$signature = $this->signMessage($user, $message);
 
-		$code = $message . ' ' . $signature;
-		$codeMd5 = $message . ' ' . md5($signature);
+		$code = $message.' '.$signature;
+		$codeMd5 = $message.' '.md5($signature);
 
 		switch ($account) {
 			case 'verify-twitter':
@@ -730,7 +730,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid mail address')
+						'message' => (string) $this->l10n->t('Invalid mail address')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -774,7 +774,7 @@ 
 						'websiteScope' => $data[AccountManager::PROPERTY_WEBSITE]['scope'],
 						'address' => $data[AccountManager::PROPERTY_ADDRESS]['value'],
 						'addressScope' => $data[AccountManager::PROPERTY_ADDRESS]['scope'],
-						'message' => (string)$this->l10n->t('Settings saved')
+						'message' => (string) $this->l10n->t('Settings saved')
 					]
 				],
 				Http::STATUS_OK
@@ -945,7 +945,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Forbidden')
+						'message' => (string) $this->l10n->t('Forbidden')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -957,7 +957,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid mail address')
+						'message' => (string) $this->l10n->t('Invalid mail address')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -969,7 +969,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Invalid user')
+						'message' => (string) $this->l10n->t('Invalid user')
 					]
 				],
 				Http::STATUS_UNPROCESSABLE_ENTITY
@@ -982,7 +982,7 @@ 
 				[
 					'status' => 'error',
 					'data' => [
-						'message' => (string)$this->l10n->t('Unable to change mail address')
+						'message' => (string) $this->l10n->t('Unable to change mail address')
 					]
 				],
 				Http::STATUS_FORBIDDEN
@@ -1000,7 +1000,7 @@ 
 					'data' => [
 						'username' => $id,
 						'mailAddress' => $mailAddress,
-						'message' => (string)$this->l10n->t('Email saved')
+						'message' => (string) $this->l10n->t('Email saved')
 					]
 				],
 				Http::STATUS_OK

settings/templates/users/part.userlist.php

Spacing +16 added lines, -16 removed lines

@@ -1,15 +1,15 @@ 
-<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']);?>">
+<table id="userlist" class="hascontrols grid" data-groups="<?php p($_['allGroups']); ?>">
 	<thead>
 		<tr>
 			<th id="headerAvatar" scope="col"></th>
 			<th id="headerName" scope="col"><?php p($l->t('Username'))?></th>
-			<th id="headerDisplayName" scope="col"><?php p($l->t( 'Full name' )); ?></th>
-			<th id="headerPassword" scope="col"><?php p($l->t( 'Password' )); ?></th>
-			<th class="mailAddress" scope="col"><?php p($l->t( 'Email' )); ?></th>
-			<th id="headerGroups" scope="col"><?php p($l->t( 'Groups' )); ?></th>
-		<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerDisplayName" scope="col"><?php p($l->t('Full name')); ?></th>
+			<th id="headerPassword" scope="col"><?php p($l->t('Password')); ?></th>
+			<th class="mailAddress" scope="col"><?php p($l->t('Email')); ?></th>
+			<th id="headerGroups" scope="col"><?php p($l->t('Groups')); ?></th>
+		<?php if (is_array($_['subadmins']) || $_['subadmins']): ?>
 			<th id="headerSubAdmins" scope="col"><?php p($l->t('Group admin for')); ?></th>
-		<?php endif;?>
+		<?php endif; ?>
 			<th id="headerQuota" scope="col"><?php p($l->t('Quota')); ?></th>
 			<th class="storageLocation" scope="col"><?php p($l->t('Storage location')); ?></th>
 			<th class="userBackend" scope="col"><?php p($l->t('User backend')); ?></th>
@@ -37,27 +37,27 @@ 
 			<td class="groups"><div class="groupsListContainer multiselect button"
 				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
 			</td>
-		<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+		<?php if (is_array($_['subadmins']) || $_['subadmins']): ?>
 			<td class="subadmins"><div class="groupsListContainer multiselect button"
 				><span class="title groupsList"></span><span class="icon-triangle-s"></span></div>
 			</td>
-		<?php endif;?>
+		<?php endif; ?>
 			<td class="quota">
 				<div class="quota_progress_container"><div class="quota_progress"></div></div>
 				<select class="quota-user" data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
 					<option	value='default'>
-						<?php p($l->t('Default'));?>
+						<?php p($l->t('Default')); ?>
 					</option>
 					<option value='none'>
-						<?php p($l->t('Unlimited'));?>
+						<?php p($l->t('Unlimited')); ?>
 					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-						<option value='<?php p($preset);?>'>
-							<?php p($preset);?>
+					<?php foreach ($_['quota_preset'] as $preset):?>
+						<option value='<?php p($preset); ?>'>
+							<?php p($preset); ?>
 						</option>
-					<?php endforeach;?>
+					<?php endforeach; ?>
 					<option value='other' data-new>
-						<?php p($l->t('Other'));?> ...
+						<?php p($l->t('Other')); ?> ...
 					</option>
 				</select>
 			</td>