nextcloud / server

lib/private/Contacts/ContactsMenu/ContactsStore.php

Spacing +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 			$options
 		);
 
-		$entries = array_map(function (array $contact) {
+		$entries = array_map(function(array $contact) {
 			return $this->contactArrayToEntry($contact);
 		}, $allContacts);
 		return $this->filterContacts(
@@ -147,7 +147,7 @@ 
 
 		$selfUID = $self->getUID();
 
-		return array_values(array_filter($entries, function (IEntry $entry) use ($skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $restrictEnumerationGroup, $restrictEnumerationPhone, $allowEnumerationFullMatch, $filter) {
+		return array_values(array_filter($entries, function(IEntry $entry) use ($skipLocal, $ownGroupsOnly, $selfGroups, $selfUID, $disallowEnumeration, $restrictEnumerationGroup, $restrictEnumerationPhone, $allowEnumerationFullMatch, $filter) {
 			if ($entry->getProperty('UID') === $selfUID) {
 				return false;
 			}
@@ -245,7 +245,7 @@ 
 
 		$userId = $user->getUID();
 		$allContacts = $this->contactsManager->search($shareWith, $filter);
-		$contacts = array_filter($allContacts, function ($contact) use ($userId) {
+		$contacts = array_filter($allContacts, function($contact) use ($userId) {
 			return $contact['UID'] !== $userId;
 		});
 		$match = null;

apps/provisioning_api/lib/Controller/UsersController.php

Spacing +8 added lines, -8 removed lines

@@ -279,7 +279,7 @@ 
 		$matches = [];
 		foreach ($userMatches as $phone => $userId) {
 			// Not using the ICloudIdManager as that would run a search for each contact to find the display name in the address book
-			$matches[$normalizedNumberToKey[$phone]] = $userId . '@' . $cloudUrl;
+			$matches[$normalizedNumberToKey[$phone]] = $userId.'@'.$cloudUrl;
 			$this->knownUserService->storeIsKnownToUser($knownTo, $userId);
 		}
 
@@ -343,7 +343,7 @@ 
 					throw new OCSException('group '.$group.' does not exist', 104);
 				}
 				if (!$isAdmin && !$subAdminManager->isSubAdminOfGroup($user, $this->groupManager->get($group))) {
-					throw new OCSException('insufficient privileges for group '. $group, 105);
+					throw new OCSException('insufficient privileges for group '.$group, 105);
 				}
 			}
 		} else {
@@ -358,7 +358,7 @@ 
 				$group = $this->groupManager->get($groupid);
 				// Check if group exists
 				if ($group === null) {
-					throw new OCSException('Subadmin group does not exist',  102);
+					throw new OCSException('Subadmin group does not exist', 102);
 				}
 				// Check if trying to make subadmin of admin group
 				if ($group->getGID() === 'admin') {
@@ -399,11 +399,11 @@ 
 
 		try {
 			$newUser = $this->userManager->createUser($userid, $password);
-			$this->logger->info('Successful addUser call with userid: ' . $userid, ['app' => 'ocs_api']);
+			$this->logger->info('Successful addUser call with userid: '.$userid, ['app' => 'ocs_api']);
 
 			foreach ($groups as $group) {
 				$this->groupManager->get($group)->addUser($newUser);
-				$this->logger->info('Added userid ' . $userid . ' to group ' . $group, ['app' => 'ocs_api']);
+				$this->logger->info('Added userid '.$userid.' to group '.$group, ['app' => 'ocs_api']);
 			}
 			foreach ($subadminGroups as $group) {
 				$subAdminManager->createSubAdmin($newUser, $group);
@@ -695,7 +695,7 @@ 
 							$this->knownUserService->deleteByContactUserId($targetUser->getUID());
 						}
 					} catch (\InvalidArgumentException $e) {
-						throw new OCSException('Invalid ' . $e->getMessage(), 102);
+						throw new OCSException('Invalid '.$e->getMessage(), 102);
 					}
 				}
 				break;
@@ -942,7 +942,7 @@ 
 		} elseif (!$this->groupManager->isAdmin($loggedInUser->getUID())) {
 			/** @var IGroup[] $subAdminGroups */
 			$subAdminGroups = $subAdminManager->getSubAdminsGroups($loggedInUser);
-			$subAdminGroups = array_map(function (IGroup $subAdminGroup) {
+			$subAdminGroups = array_map(function(IGroup $subAdminGroup) {
 				return $subAdminGroup->getGID();
 			}, $subAdminGroups);
 			$userGroups = $this->groupManager->getUserGroupIds($targetUser);
@@ -979,7 +979,7 @@ 
 		}
 		// Check if group exists
 		if ($group === null) {
-			throw new OCSException('Group does not exist',  102);
+			throw new OCSException('Group does not exist', 102);
 		}
 		// Check if trying to make subadmin of admin group
 		if ($group->getGID() === 'admin') {

apps/provisioning_api/lib/AppInfo/Application.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 
-		$context->registerService(NewUserMailHelper::class, function (ContainerInterface $c) {
+		$context->registerService(NewUserMailHelper::class, function(ContainerInterface $c) {
 			return new NewUserMailHelper(
 				$c->get(Defaults::class),
 				$c->get(IURLGenerator::class),
@@ -73,7 +73,7 @@ 
 				Util::getDefaultEmailAddress('no-reply')
 			);
 		});
-		$context->registerService(ProvisioningApiMiddleware::class, function (ContainerInterface $c) {
+		$context->registerService(ProvisioningApiMiddleware::class, function(ContainerInterface $c) {
 			$user = $c->get(IUserManager::class)->get($c->get('UserId'));
 			$isAdmin = false;
 			$isSubAdmin = false;

apps/provisioning_api/composer/composer/autoload_static.php

Spacing +18 added lines, -18 removed lines

@@ -6,37 +6,37 @@
 
 class ComposerStaticInitProvisioning_API
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\Provisioning_API\\' => 21,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\Provisioning_API\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__ . '/..' . '/../lib/Controller/AUserData.php',
-        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__ . '/..' . '/../lib/Controller/AppConfigController.php',
-        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__ . '/..' . '/../lib/Controller/AppsController.php',
-        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__ . '/..' . '/../lib/Controller/GroupsController.php',
-        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__ . '/..' . '/../lib/Controller/UsersController.php',
-        'OCA\\Provisioning_API\\FederatedShareProviderFactory' => __DIR__ . '/..' . '/../lib/FederatedShareProviderFactory.php',
-        'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => __DIR__ . '/..' . '/../lib/Listener/UserDeletedListener.php',
-        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__ . '/..' . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__ . '/..' . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\Provisioning_API\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\Provisioning_API\\Controller\\AUserData' => __DIR__.'/..'.'/../lib/Controller/AUserData.php',
+        'OCA\\Provisioning_API\\Controller\\AppConfigController' => __DIR__.'/..'.'/../lib/Controller/AppConfigController.php',
+        'OCA\\Provisioning_API\\Controller\\AppsController' => __DIR__.'/..'.'/../lib/Controller/AppsController.php',
+        'OCA\\Provisioning_API\\Controller\\GroupsController' => __DIR__.'/..'.'/../lib/Controller/GroupsController.php',
+        'OCA\\Provisioning_API\\Controller\\UsersController' => __DIR__.'/..'.'/../lib/Controller/UsersController.php',
+        'OCA\\Provisioning_API\\FederatedShareProviderFactory' => __DIR__.'/..'.'/../lib/FederatedShareProviderFactory.php',
+        'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => __DIR__.'/..'.'/../lib/Listener/UserDeletedListener.php',
+        'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => __DIR__.'/..'.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+        'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => __DIR__.'/..'.'/../lib/Middleware/ProvisioningApiMiddleware.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitProvisioning_API::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitProvisioning_API::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitProvisioning_API::$classMap;

apps/provisioning_api/composer/composer/autoload_classmap.php

Spacing +11 added lines, -11 removed lines

@@ -6,15 +6,15 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir . '/../lib/Controller/AUserData.php',
-    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir . '/../lib/Controller/AppConfigController.php',
-    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir . '/../lib/Controller/AppsController.php',
-    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir . '/../lib/Controller/GroupsController.php',
-    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir . '/../lib/Controller/UsersController.php',
-    'OCA\\Provisioning_API\\FederatedShareProviderFactory' => $baseDir . '/../lib/FederatedShareProviderFactory.php',
-    'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => $baseDir . '/../lib/Listener/UserDeletedListener.php',
-    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir . '/../lib/Middleware/Exceptions/NotSubAdminException.php',
-    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir . '/../lib/Middleware/ProvisioningApiMiddleware.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\Provisioning_API\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\Provisioning_API\\Controller\\AUserData' => $baseDir.'/../lib/Controller/AUserData.php',
+    'OCA\\Provisioning_API\\Controller\\AppConfigController' => $baseDir.'/../lib/Controller/AppConfigController.php',
+    'OCA\\Provisioning_API\\Controller\\AppsController' => $baseDir.'/../lib/Controller/AppsController.php',
+    'OCA\\Provisioning_API\\Controller\\GroupsController' => $baseDir.'/../lib/Controller/GroupsController.php',
+    'OCA\\Provisioning_API\\Controller\\UsersController' => $baseDir.'/../lib/Controller/UsersController.php',
+    'OCA\\Provisioning_API\\FederatedShareProviderFactory' => $baseDir.'/../lib/FederatedShareProviderFactory.php',
+    'OCA\\Provisioning_API\\Listener\\UserDeletedListener' => $baseDir.'/../lib/Listener/UserDeletedListener.php',
+    'OCA\\Provisioning_API\\Middleware\\Exceptions\\NotSubAdminException' => $baseDir.'/../lib/Middleware/Exceptions/NotSubAdminException.php',
+    'OCA\\Provisioning_API\\Middleware\\ProvisioningApiMiddleware' => $baseDir.'/../lib/Middleware/ProvisioningApiMiddleware.php',
 );

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

Spacing +16 added lines, -16 removed lines

@@ -159,7 +159,7 @@ 
 
 				if ($user !== null) {
 					return [
-						'uri' => 'principals/users/' . $user->getUID() . '/' . $name,
+						'uri' => 'principals/users/'.$user->getUID().'/'.$name,
 					];
 				}
 				return null;
@@ -190,7 +190,7 @@ 
 				?: $this->groupManager->get($name);
 			if ($group instanceof IGroup) {
 				return [
-					'uri' => 'principals/groups/' . $name,
+					'uri' => 'principals/groups/'.$name,
 					'{DAV:}displayname' => $group->getDisplayName(),
 				];
 			}
@@ -223,7 +223,7 @@ 
 		if ($this->hasGroups || $needGroups) {
 			$userGroups = $this->groupManager->getUserGroups($user);
 			foreach ($userGroups as $userGroup) {
-				$groups[] = 'principals/groups/' . urlencode($userGroup->getGID());
+				$groups[] = 'principals/groups/'.urlencode($userGroup->getGID());
 			}
 		}
 
@@ -294,7 +294,7 @@ 
 					if (!$allowEnumeration) {
 						if ($allowEnumerationFullMatch) {
 							$users = $this->userManager->getByEmail($value);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
+							$users = \array_filter($users, static function(IUser $user) use ($value) {
 								return $user->getEMailAddress() === $value;
 							});
 						} else {
@@ -302,7 +302,7 @@ 
 						}
 					} else {
 						$users = $this->userManager->getByEmail($value);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+						$users = \array_filter($users, function(IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
 							if ($allowEnumerationFullMatch && $user->getEMailAddress() === $value) {
 								return true;
 							}
@@ -326,7 +326,7 @@ 
 						});
 					}
 
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
 						// is sharing restricted to groups only?
 						if ($restrictGroups !== false) {
 							$userGroups = $this->groupManager->getUserGroupIds($user);
@@ -335,7 +335,7 @@ 
 							}
 						}
 
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
+						$carry[] = $this->principalPrefix.'/'.$user->getUID();
 						return $carry;
 					}, []);
 					break;
@@ -345,7 +345,7 @@ 
 					if (!$allowEnumeration) {
 						if ($allowEnumerationFullMatch) {
 							$users = $this->userManager->searchDisplayName($value, $searchLimit);
-							$users = \array_filter($users, static function (IUser $user) use ($value) {
+							$users = \array_filter($users, static function(IUser $user) use ($value) {
 								return $user->getDisplayName() === $value;
 							});
 						} else {
@@ -353,7 +353,7 @@ 
 						}
 					} else {
 						$users = $this->userManager->searchDisplayName($value, $searchLimit);
-						$users = \array_filter($users, function (IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
+						$users = \array_filter($users, function(IUser $user) use ($currentUser, $value, $limitEnumerationPhone, $limitEnumerationGroup, $allowEnumerationFullMatch, $currentUserGroups) {
 							if ($allowEnumerationFullMatch && $user->getDisplayName() === $value) {
 								return true;
 							}
@@ -377,7 +377,7 @@ 
 						});
 					}
 
-					$results[] = array_reduce($users, function (array $carry, IUser $user) use ($restrictGroups) {
+					$results[] = array_reduce($users, function(array $carry, IUser $user) use ($restrictGroups) {
 						// is sharing restricted to groups only?
 						if ($restrictGroups !== false) {
 							$userGroups = $this->groupManager->getUserGroupIds($user);
@@ -386,7 +386,7 @@ 
 							}
 						}
 
-						$carry[] = $this->principalPrefix . '/' . $user->getUID();
+						$carry[] = $this->principalPrefix.'/'.$user->getUID();
 						return $carry;
 					}, []);
 					break;
@@ -482,7 +482,7 @@ 
 					}
 				}
 
-				return $this->principalPrefix . '/' . $user->getUID();
+				return $this->principalPrefix.'/'.$user->getUID();
 			}
 		}
 		if (substr($uri, 0, 10) === 'principal:') {
@@ -504,7 +504,7 @@ 
 		$userId = $user->getUID();
 		$displayName = $user->getDisplayName();
 		$principal = [
-			'uri' => $this->principalPrefix . '/' . $userId,
+			'uri' => $this->principalPrefix.'/'.$userId,
 			'{DAV:}displayname' => is_null($displayName) ? $userId : $displayName,
 			'{urn:ietf:params:xml:ns:caldav}calendar-user-type' => 'INDIVIDUAL',
 		];
@@ -543,7 +543,7 @@ 
 		}
 
 		$principal = [
-			'uri' => 'principals/circles/' . $circleUniqueId,
+			'uri' => 'principals/circles/'.$circleUniqueId,
 			'{DAV:}displayname' => $circle->getName(),
 		];
 
@@ -573,9 +573,9 @@ 
 
 			$circles = \OCA\Circles\Api\v1\Circles::joinedCircles($name, true);
 
-			$circles = array_map(function ($circle) {
+			$circles = array_map(function($circle) {
 				/** @var \OCA\Circles\Model\Circle $circle */
-				return 'principals/circles/' . urlencode($circle->getUniqueId());
+				return 'principals/circles/'.urlencode($circle->getUniqueId());
 			}, $circles);
 
 			return $circles;

apps/settings/templates/settings/admin/sharing.php

Spacing +24 added lines, -24 removed lines

@@ -27,17 +27,17 @@ 
 ?>
 
 <div class="section" id="shareAPI">
-	<h2><?php p($l->t('Sharing'));?></h2>
+	<h2><?php p($l->t('Sharing')); ?></h2>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
-        <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
+        <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.')); ?></p>
 	<p id="enable">
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
 			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
+		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API')); ?></label><br/>
 	</p>
 
 	<p id="internalShareSettings" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
@@ -47,7 +47,7 @@ 
 			   value="1" <?php if ($_['shareDefaultInternalExpireDateSet'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares'));?></label><br/>
+		<label for="shareapiDefaultInternalExpireDate"><?php p($l->t('Set default expiration date for shares')); ?></label><br/>
 	</p>
 	<p id="setDefaultInternalExpireDate" class="double-indent <?php if ($_['shareDefaultInternalExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -60,7 +60,7 @@ 
 			   value="1" <?php if ($_['shareInternalEnforceExpireDate'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+		<label for="shareapiInternalEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
 	</p>
 
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
@@ -70,7 +70,7 @@ 
 			   value="1" <?php if ($_['allowLinks'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
+		<label for="allowLinks"><?php p($l->t('Allow users to share via link')); ?></label><br/>
 	</p>
 
 	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
@@ -80,23 +80,23 @@ 
 			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
+		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads')); ?></label><br/>
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
 			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
+		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password')); ?></label><br/>
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
 			   value="1" <?php if ($_['enforceLinkPassword']) {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
+		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection')); ?></label><br/>
 
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
 			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date for link shares'));?></label><br/>
+		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date for link shares')); ?></label><br/>
 
 	</p>
 	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
@@ -110,7 +110,7 @@ 
 			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
+		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
 	</p>
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -119,7 +119,7 @@ 
 			   value="1" <?php if ($_['allowResharing'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
+		<label for="allowResharing"><?php p($l->t('Allow resharing')); ?></label><br/>
 	</p>
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -128,7 +128,7 @@ 
 			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
+		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups')); ?></label><br />
 	</p>
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -137,7 +137,7 @@ 
 			   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
+		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups')); ?></label><br/>
 	</p>
 	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -146,7 +146,7 @@ 
 			   value="1" <?php if ($_['shareExcludeGroups']) {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
+		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing')); ?></label><br/>
 	</p>
 	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -163,7 +163,7 @@ 
 			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog'));?></label><br />
+		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog')); ?></label><br />
 	</p>
 
 	<p id="shareapi_restrict_user_enumeration_to_group_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
@@ -173,7 +173,7 @@ 
 			<?php if ($_['restrictUserEnumerationToGroup'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Allow username autocompletion to users within the same groups'));?></label><br />
+		<label for="shareapi_restrict_user_enumeration_to_group"><?php p($l->t('Allow username autocompletion to users within the same groups')); ?></label><br />
 	</p>
 
 	<p id="shareapi_restrict_user_enumeration_to_phone_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
@@ -183,12 +183,12 @@ 
 			<?php if ($_['restrictUserEnumerationToPhone'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches'));?></label><br />
+		<label for="shareapi_restrict_user_enumeration_to_phone"><?php p($l->t('Allow username autocompletion to users based on phonebook matches')); ?></label><br />
 	</p>
 	<p id="shareapi_restrict_user_enumeration_combinewarning_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no' || $_['allowShareDialogUserEnumeration'] === 'no') {
 	p('hidden');
 }?>">
-		<em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.'));?></em><br />
+		<em><?php p($l->t('If autocompletion "same group" and "phonebook matches" are enabled a match in either is enough to show the user.')); ?></em><br />
 	</p>
 	<p id="shareapi_restrict_user_enumeration_full_match_setting" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
 	p('hidden');
@@ -197,7 +197,7 @@ 
 				<?php if ($_['restrictUserEnumerationFullMatch'] === 'yes') {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="shareapi_restrict_user_enumeration_full_match"><?php p($l->t('Allow username autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)'));?></label><br />
+		<label for="shareapi_restrict_user_enumeration_full_match"><?php p($l->t('Allow username autocompletion when entering the full name or email address (ignoring missing phonebook match and being in the same group)')); ?></label><br />
 	</p>
 
 	<p>
@@ -205,7 +205,7 @@ 
 			<?php if ($_['publicShareDisclaimerText'] !== null) {
 	print_unescaped('checked="checked"');
 } ?> />
-		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page (only shown when the file list is hidden)'));?></label>
+		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page (only shown when the file list is hidden)')); ?></label>
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
 		<br/>
 		<textarea placeholder="<?php p($l->t('This text will be shown on the public link upload page when the file list is hidden.')) ?>" id="publicShareDisclaimerText" <?php if ($_['publicShareDisclaimerText'] === null) {
@@ -213,7 +213,7 @@ 
 } ?>><?php p($_['publicShareDisclaimerText']) ?></textarea>
 	</p>
 
-	<h3><?php p($l->t('Default share permissions'));?></h3>
+	<h3><?php p($l->t('Default share permissions')); ?></h3>
 	<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
 		   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
 	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
@@ -224,7 +224,7 @@ 
 				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) {
 	print_unescaped('checked="checked"');
 } ?> />
-			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
+			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']); ?></label>
 		<?php endforeach ?>
 	</p>
 </div>