nextcloud / server

core/Command/Encryption/ChangeKeyStorageRoot.php

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'ownCloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -161,10 +161,10 @@ 
 	 */
 	protected function moveSystemKeys($oldRoot, $newRoot) {
 		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
+			$this->targetExists($newRoot.'/files_encryption') === false
 		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
 		}
 	}
 
@@ -193,7 +193,7 @@ 
 		$progress->start();
 
 
-		foreach($this->userManager->getBackends() as $backend) {
+		foreach ($this->userManager->getBackends() as $backend) {
 			$limit = 500;
 			$offset = 0;
 			do {
@@ -204,7 +204,7 @@ 
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
 				}
 				$offset += $limit;
-			} while(count($users) >= $limit);
+			} while (count($users) >= $limit);
 		}
 		$progress->finish();
 	}
@@ -221,13 +221,13 @@ 
 
 		if ($this->userManager->userExists($user)) {
 
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
+			$source = $oldRoot.'/'.$user.'/files_encryption';
+			$target = $newRoot.'/'.$user.'/files_encryption';
 			if (
 				$this->rootView->is_dir($source) &&
 				$this->targetExists($target) === false
 			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->prepareParentFolder($newRoot.'/'.$user);
 				$this->rootView->rename($source, $target);
 			}
 		}
@@ -245,7 +245,7 @@ 
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if ($this->rootView->file_exists($dir) === false) {
 					$this->rootView->mkdir($dir);
 				}

core/Command/Encryption/SetDefaultModule.php

Spacing +3 added lines, -3 removed lines

@@ -59,11 +59,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 		}
 	}
 }

core/Command/Group/ListCommand.php

Spacing +3 added lines, -3 removed lines

@@ -71,7 +71,7 @@ 
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
 	}
 
@@ -80,10 +80,10 @@ 
 	 * @return array
 	 */
 	private function formatGroups(array $groups) {
-		$keys = array_map(function (IGroup $group) {
+		$keys = array_map(function(IGroup $group) {
 			return $group->getGID();
 		}, $groups);
-		$values = array_map(function (IGroup $group) {
+		$values = array_map(function(IGroup $group) {
 			return array_keys($group->getUsers());
 		}, $groups);
 		return array_combine($keys, $values);

settings/templates/admin/additional-mail.php

Spacing +14 added lines, -14 removed lines

@@ -52,15 +52,15 @@ 
 
 <div class="section" id="mail_general_settings">
 	<form id="mail_general_settings_form" class="mail_settings">
-		<h2><?php p($l->t('Email server'));?></h2>
+		<h2><?php p($l->t('Email server')); ?></h2>
 		<a target="_blank" rel="noreferrer" class="icon-info"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
 
 		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
 
 		<p>
-			<label for="mail_smtpmode"><?php p($l->t( 'Send mode' )); ?></label>
+			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
 			<select name='mail_smtpmode' id='mail_smtpmode'>
 				<?php foreach ($mail_smtpmode as $smtpmode):
 					$selected = '';
@@ -68,12 +68,12 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value='<?php p($smtpmode[0])?>' <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-				<?php p($l->t( 'Encryption' )); ?>
+				<?php p($l->t('Encryption')); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
 				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
@@ -83,12 +83,12 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value='<?php p($secure)?>' <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 		</p>
 
 		<p>
-			<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
+			<label for="mail_from_address"><?php p($l->t('From address')); ?></label>
 			<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
 				   value='<?php p($_['mail_from_address']) ?>' />@
 			<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
@@ -96,7 +96,7 @@ 
 		</p>
 
 		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-			<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
+			<label for="mail_smtpauthtype"><?php p($l->t('Authentication method')); ?></label>
 			<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
 					$selected = '';
@@ -104,16 +104,16 @@ 
 						$selected = 'selected="selected"';
 					endif; ?>
 					<option value='<?php p($authtype)?>' <?php p($selected) ?>><?php p($name) ?></option>
-				<?php endforeach;?>
+				<?php endforeach; ?>
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
 				<?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
-			<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
+			<label for="mail_smtpauth"><?php p($l->t('Authentication required')); ?></label>
 		</p>
 
 		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-			<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
+			<label for="mail_smtphost"><?php p($l->t('Server address')); ?></label>
 			<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
 				   value='<?php p($_['mail_smtphost']) ?>' />
 			:
@@ -123,7 +123,7 @@ 
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
 		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-			<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
+			<label for="mail_smtpname"><?php p($l->t('Credentials')); ?></label>
 			<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value='<?php p($_['mail_smtpname']) ?>' />
 			<input type="password" name='mail_smtppassword' id="mail_smtppassword" autocomplete="off"
@@ -133,8 +133,8 @@ 
 	</form>
 
 	<br />
-	<em><?php p($l->t( 'Test email settings' )); ?></em>
-	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/>
+	<em><?php p($l->t('Test email settings')); ?></em>
+	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t('Send email')); ?>"/>
 	<span id="sendtestmail_msg" class="msg"></span>
 </div>
 

settings/templates/admin/additional.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
 
 ?>
 
-<?php foreach($_['forms'] as $form) {
+<?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 }
 };?>

settings/templates/admin/encryption.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 <div class="section" id='encryptionAPI'>
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
 	<a target="_blank" rel="noreferrer" class="icon-info"
-	   title="<?php p($l->t('Open documentation'));?>"
+	   title="<?php p($l->t('Open documentation')); ?>"
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
 
 	<p id="enable">

settings/templates/settings.php

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<?php foreach($_['forms'] as $form) {
+<?php foreach ($_['forms'] as $form) {
 	print_unescaped($form);
 };

settings/templates/users/main.php

Spacing +3 added lines, -3 removed lines

@@ -18,11 +18,11 @@
 style('settings', 'settings');
 
 $userlistParams = array();
-$allGroups=array();
-foreach($_["adminGroup"] as $group) {
+$allGroups = array();
+foreach ($_["adminGroup"] as $group) {
 	$allGroups[] = $group['name'];
 }
-foreach($_["groups"] as $group) {
+foreach ($_["groups"] as $group) {
 	$allGroups[] = $group['name'];
 }
 $userlistParams['subadmingroups'] = $allGroups;

settings/templates/users/part.grouplist.php

Spacing +6 added lines, -6 removed lines

@@ -28,24 +28,24 @@
 	</li>
 
 	<!-- The Admin Group -->
-	<?php foreach($_["adminGroup"] as $adminGroup): ?>
-		<li data-gid="admin" data-usercount="<?php if($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?>" class="isgroup">
+	<?php foreach ($_["adminGroup"] as $adminGroup): ?>
+		<li data-gid="admin" data-usercount="<?php if ($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?>" class="isgroup">
 			<a href="#"><span class="groupname"><?php p($l->t('Admins')); ?></span></a>
 			<span class="utils">
-				<span class="usercount"><?php if($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?></span>
+				<span class="usercount"><?php if ($adminGroup['usercount'] > 0) { p($adminGroup['usercount']); } ?></span>
 			</span>
 		</li>
 	<?php endforeach; ?>
 
 	<!--List of Groups-->
-	<?php foreach($_["groups"] as $group): ?>
+	<?php foreach ($_["groups"] as $group): ?>
 		<li data-gid="<?php p($group['name']) ?>" data-usercount="<?php p($group['usercount']) ?>" class="isgroup">
 			<a href="#" class="dorename">
 				<span class="groupname"><?php p($group['name']); ?></span>
 			</a>
 			<span class="utils">
-				<span class="usercount"><?php if($group['usercount'] > 0) { p($group['usercount']); } ?></span>
-				<?php if($_['isAdmin']): ?>
+				<span class="usercount"><?php if ($group['usercount'] > 0) { p($group['usercount']); } ?></span>
+				<?php if ($_['isAdmin']): ?>
 				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
 					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" />
 				</a>