nextcloud / server

apps/user_ldap/lib/Migration/UUIDFixInsert.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
 					$offset += $batchSize;
 				} catch (\InvalidArgumentException $e) {
 					if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) {
-						$batchSize = (int)floor(count($records) * 0.8);
+						$batchSize = (int) floor(count($records) * 0.8);
 						$retry = true;
 					}
 				}

apps/user_ldap/lib/UserPluginManager.php

Spacing +4 added lines, -4 removed lines

@@ -60,12 +60,12 @@ 
 		$this->respondToActions |= $respondToActions;
 
 		foreach ($this->which as $action => $v) {
-			if (is_int($action) && (bool)($respondToActions & $action)) {
+			if (is_int($action) && (bool) ($respondToActions & $action)) {
 				$this->which[$action] = $plugin;
 				\OC::$server->getLogger()->debug("Registered action ".$action." to plugin ".get_class($plugin), ['app' => 'user_ldap']);
 			}
 		}
-		if (method_exists($plugin,'deleteUser')) {
+		if (method_exists($plugin, 'deleteUser')) {
 			$this->which['deleteUser'] = $plugin;
 			\OC::$server->getLogger()->debug("Registered action deleteUser to plugin ".get_class($plugin), ['app' => 'user_ldap']);
 		}
@@ -92,7 +92,7 @@ 
 		$plugin = $this->which[Backend::CREATE_USER];
 
 		if ($plugin) {
-			return $plugin->createUser($username,$password);
+			return $plugin->createUser($username, $password);
 		}
 		throw new \Exception('No plugin implements createUser in this LDAP Backend.');
 	}
@@ -108,7 +108,7 @@ 
 		$plugin = $this->which[Backend::SET_PASSWORD];
 
 		if ($plugin) {
-			return $plugin->setPassword($uid,$password);
+			return $plugin->setPassword($uid, $password);
 		}
 		throw new \Exception('No plugin implements setPassword in this LDAP Backend.');
 	}

apps/user_ldap/templates/renewpassword.php

Spacing +3 added lines, -3 removed lines

@@ -24,14 +24,14 @@ 
 		<?php endif; ?>
 		<div id="message" class="hidden">
 			<img class="float-spinner" alt=""
-				src="<?php p(image_path('core', 'loading-dark.gif'));?>">
+				src="<?php p(image_path('core', 'loading-dark.gif')); ?>">
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
 		</div>
 		<p class="grouptop">
 			<input type="password" id="oldPassword" name="oldPassword"
-				placeholder="<?php echo $l->t('Current password');?>"
+				placeholder="<?php echo $l->t('Current password'); ?>"
 				autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 			<label for="oldPassword" class="infield"><?php p($l->t('Current password')); ?></label>
 		</p>
@@ -40,7 +40,7 @@ 
 			<input type="checkbox" id="personal-show" name="show" class="hidden-visually" /><label for="personal-show"></label>
 			<label id="newPassword-label" for="newPassword" class="infield"><?php p($l->t('New password')); ?></label>
 			<input type="password" id="newPassword" name="newPassword"
-				placeholder="<?php echo $l->t('New password');?>"
+				placeholder="<?php echo $l->t('New password'); ?>"
 				data-typetoggle="#personal-show" autofocus autocomplete="off" autocapitalize="off" autocorrect="off" required/>
 		</p>
 		

apps/user_ldap/templates/part.wizard-server.php

Spacing +18 added lines, -18 removed lines

@@ -14,14 +14,14 @@ 
 		</select>
 		<button type="button" id="ldap_action_add_configuration"
 			name="ldap_action_add_configuration" class="icon-add icon-default-style"
-			title="<?php p($l->t('Add a new configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Add a new configuration')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_copy_configuration"
 			name="ldap_action_copy_configuration"
 			class="ldapIconCopy icon-default-style"
-			title="<?php p($l->t('Copy current configuration into new directory binding'));?>">&nbsp;</button>
+			title="<?php p($l->t('Copy current configuration into new directory binding')); ?>">&nbsp;</button>
 		<button type="button" id="ldap_action_delete_configuration"
 			name="ldap_action_delete_configuration" class="icon-delete icon-default-style"
-			title="<?php p($l->t('Delete the current configuration'));?>">&nbsp;</button>
+			title="<?php p($l->t('Delete the current configuration')); ?>">&nbsp;</button>
 		</p>
 
 		<div class="hostPortCombinator">
@@ -30,14 +30,14 @@ 
 					<div class="table">
 						<input type="text" class="host" id="ldap_host"
 							name="ldap_host"
-							placeholder="<?php p($l->t('Host'));?>"
-							title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://'));?>"
+							placeholder="<?php p($l->t('Host')); ?>"
+							title="<?php p($l->t('You can omit the protocol, unless you require SSL. If so, start with ldaps://')); ?>"
 							/>
 						<span class="hostPortCombinatorSpan">
 							<input type="number" id="ldap_port" name="ldap_port"
-								placeholder="<?php p($l->t('Port'));?>" />
+								placeholder="<?php p($l->t('Port')); ?>" />
 							<button class="ldapDetectPort" name="ldapDetectPort" type="button">
-								<?php p($l->t('Detect Port'));?>
+								<?php p($l->t('Detect Port')); ?>
 							</button>
 						</span>
 					</div>
@@ -47,19 +47,19 @@ 
 			<div class="tablerow">
 				<input type="text" id="ldap_dn" name="ldap_dn"
 				class="tablecell"
-				placeholder="<?php p($l->t('User DN'));?>" autocomplete="off"
-				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('User DN')); ?>" autocomplete="off"
+				title="<?php p($l->t('The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 			</div>
 
 			<div class="tablerow">
 				<input type="password" id="ldap_agent_password"
 				class="tablecell" name="ldap_agent_password"
-				placeholder="<?php p($l->t('Password'));?>" autocomplete="off"
-				title="<?php p($l->t('For anonymous access, leave DN and Password empty.'));?>"
+				placeholder="<?php p($l->t('Password')); ?>" autocomplete="off"
+				title="<?php p($l->t('For anonymous access, leave DN and Password empty.')); ?>"
 				/>
 				<button class="ldapSaveAgentCredentials" name="ldapSaveAgentCredentials" type="button">
-					<?php p($l->t('Save Credentials'));?>
+					<?php p($l->t('Save Credentials')); ?>
 				</button>
 			</div>
 			<div class="tablerow">&nbsp;</div>
@@ -67,24 +67,24 @@ 
 			<div class="tablerow">
 				<textarea id="ldap_base" name="ldap_base"
 					class="tablecell"
-					placeholder="<?php p($l->t('One Base DN per line'));?>"
-					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab'));?>">
+					placeholder="<?php p($l->t('One Base DN per line')); ?>"
+					title="<?php p($l->t('You can specify Base DN for users and groups in the Advanced tab')); ?>">
 				</textarea>
 				<button class="ldapDetectBase" name="ldapDetectBase" type="button">
-					<?php p($l->t('Detect Base DN'));?>
+					<?php p($l->t('Detect Base DN')); ?>
 				</button>
 				<button class="ldapTestBase" name="ldapTestBase" type="button">
-					<?php p($l->t('Test Base DN'));?>
+					<?php p($l->t('Test Base DN')); ?>
 				</button>
 			</div>
 
 			<div class="tablerow left">
 				<input type="checkbox" id="ldap_experienced_admin" value="1"
 					name="ldap_experienced_admin" class="tablecell"
-					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
+					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.')); ?>"
 					/>
 				<label for="ldap_experienced_admin" class="tablecell">
-					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
+					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)')); ?>
 				</label>
 			</div>
 

apps/user_ldap/ajax/setConfiguration.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 \OC_JSON::checkAppEnabled('user_ldap');
 \OC_JSON::callCheck();
 
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 
 // Checkboxes are not submitted, when they are unchecked. Set them manually.
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,

apps/user_ldap/ajax/wizard.php

Spacing +2 added lines, -2 removed lines

@@ -39,13 +39,13 @@
 if (!isset($_POST['action'])) {
 	\OC_JSON::error(['message' => $l->t('No action specified')]);
 }
-$action = (string)$_POST['action'];
+$action = (string) $_POST['action'];
 
 
 if (!isset($_POST['ldap_serverconfig_chooser'])) {
 	\OC_JSON::error(['message' => $l->t('No configuration specified')]);
 }
-$prefix = (string)$_POST['ldap_serverconfig_chooser'];
+$prefix = (string) $_POST['ldap_serverconfig_chooser'];
 
 $ldapWrapper = new \OCA\User_LDAP\LDAP();
 $configuration = new \OCA\User_LDAP\Configuration($prefix);

apps/user_ldap/ajax/clearMappings.php

Spacing +3 added lines, -3 removed lines

@@ -33,16 +33,16 @@
 \OC_JSON::checkAppEnabled('user_ldap');
 \OC_JSON::callCheck();
 
-$subject = (string)$_POST['ldap_clear_mapping'];
+$subject = (string) $_POST['ldap_clear_mapping'];
 $mapping = null;
 try {
 	if ($subject === 'user') {
 		$mapping = new UserMapping(\OC::$server->getDatabaseConnection());
 		$result = $mapping->clearCb(
-			function ($uid) {
+			function($uid) {
 				\OC::$server->getUserManager()->emit('\OC\User', 'preUnassignedUserId', [$uid]);
 			},
-			function ($uid) {
+			function($uid) {
 				\OC::$server->getUserManager()->emit('\OC\User', 'postUnassignedUserId', [$uid]);
 			}
 		);

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Spacing +8 added lines, -8 removed lines

@@ -146,7 +146,7 @@ 
 		$supportedShareTypes = $this->config->getSupportedShareTypes($resourceType);
 		if (!in_array($shareType, $supportedShareTypes)) {
 			return new JSONResponse(
-				['message' => 'Share type "' . $shareType . '" not implemented'],
+				['message' => 'Share type "'.$shareType.'" not implemented'],
 				Http::STATUS_NOT_IMPLEMENTED
 			);
 		}
@@ -159,7 +159,7 @@ 
 
 			if (!$this->userManager->userExists($shareWith)) {
 				return new JSONResponse(
-					['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
+					['message' => 'User "'.$shareWith.'" does not exists at '.$this->urlGenerator->getBaseUrl()],
 					Http::STATUS_BAD_REQUEST
 				);
 			}
@@ -168,7 +168,7 @@ 
 		if ($shareType === 'group') {
 			if (!$this->groupManager->groupExists($shareWith)) {
 				return new JSONResponse(
-					['message' => 'Group "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
+					['message' => 'Group "'.$shareWith.'" does not exists at '.$this->urlGenerator->getBaseUrl()],
 					Http::STATUS_BAD_REQUEST
 				);
 			}
@@ -201,7 +201,7 @@ 
 			);
 		} catch (\Exception $e) {
 			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST
 			);
 		}
@@ -268,12 +268,12 @@ 
 			return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN);
 		} catch (\Exception $e) {
 			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST
 			);
 		}
 
-		return new JSONResponse($result,Http::STATUS_CREATED);
+		return new JSONResponse($result, Http::STATUS_CREATED);
 	}
 
 	/**
@@ -284,13 +284,13 @@ 
 	 */
 	private function mapUid($uid) {
 		// FIXME this should be a method in the user management instead
-		$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
+		$this->logger->debug('shareWith before, '.$uid, ['app' => $this->appName]);
 		\OCP\Util::emitHook(
 			'\OCA\Files_Sharing\API\Server2Server',
 			'preLoginNameUsedAsUserName',
 			['uid' => &$uid]
 		);
-		$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
+		$this->logger->debug('shareWith after, '.$uid, ['app' => $this->appName]);
 
 		return $uid;
 	}

apps/encryption/lib/Recovery.php

Spacing +7 added lines, -7 removed lines

@@ -126,7 +126,7 @@ 
 		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
 		$header = $this->crypt->generateHeader();
 		if ($encryptedRecoveryKey) {
-			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
+			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header.$encryptedRecoveryKey);
 			return true;
 		}
 		return false;
@@ -187,9 +187,9 @@ 
 				$value);
 
 			if ($value === '1') {
-				$this->addRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->addRecoveryKeys('/'.$this->user->getUID().'/files/');
 			} else {
-				$this->removeRecoveryKeys('/' . $this->user->getUID() . '/files/');
+				$this->removeRecoveryKeys('/'.$this->user->getUID().'/files/');
 			}
 
 			return true;
@@ -207,7 +207,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->addRecoveryKeys($filePath . '/');
+				$this->addRecoveryKeys($filePath.'/');
 			} else {
 				$fileKey = $this->keyManager->getFileKey($filePath, $this->user->getUID());
 				if (!empty($fileKey)) {
@@ -235,7 +235,7 @@ 
 		foreach ($dirContent as $item) {
 			$filePath = $item->getPath();
 			if ($item['type'] === 'dir') {
-				$this->removeRecoveryKeys($filePath . '/');
+				$this->removeRecoveryKeys($filePath.'/');
 			} else {
 				$this->keyManager->deleteShareKey($filePath, $this->keyManager->getRecoveryKeyId());
 			}
@@ -253,7 +253,7 @@ 
 
 		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
 		if ($privateKey !== false) {
-			$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
+			$this->recoverAllFiles('/'.$user.'/files/', $privateKey, $user);
 		}
 	}
 
@@ -271,7 +271,7 @@ 
 			// Get relative path from encryption/keyfiles
 			$filePath = $item->getPath();
 			if ($this->view->is_dir($filePath)) {
-				$this->recoverAllFiles($filePath . '/', $privateKey, $uid);
+				$this->recoverAllFiles($filePath.'/', $privateKey, $uid);
 			} else {
 				$this->recoverFile($filePath, $privateKey, $uid);
 			}