Completed
Pull Request — master (#6788)
by Markus
14:10
created
core/Command/Encryption/ListModules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 				if (!$item['default']) {
72 72
 					$item = $item['displayName'];
73 73
 				} else {
74
-					$item = $item['displayName'] . ' [default*]';
74
+					$item = $item['displayName'].' [default*]';
75 75
 				}
76 76
 			});
77 77
 		}
Please login to merge, or discard this patch.
core/Command/Encryption/ChangeKeyStorageRoot.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 		}
143 143
 
144 144
 		$result = $this->rootView->file_put_contents(
145
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
145
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
146 146
 			'ownCloud will detect this folder as key storage root only if this file exists'
147 147
 		);
148 148
 
@@ -161,10 +161,10 @@  discard block
 block discarded – undo
161 161
 	 */
162 162
 	protected function moveSystemKeys($oldRoot, $newRoot) {
163 163
 		if (
164
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
165
-			$this->targetExists($newRoot . '/files_encryption') === false
164
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
165
+			$this->targetExists($newRoot.'/files_encryption') === false
166 166
 		) {
167
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
167
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
168 168
 		}
169 169
 	}
170 170
 
@@ -193,7 +193,7 @@  discard block
 block discarded – undo
193 193
 		$progress->start();
194 194
 
195 195
 
196
-		foreach($this->userManager->getBackends() as $backend) {
196
+		foreach ($this->userManager->getBackends() as $backend) {
197 197
 			$limit = 500;
198 198
 			$offset = 0;
199 199
 			do {
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
 					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
205 205
 				}
206 206
 				$offset += $limit;
207
-			} while(count($users) >= $limit);
207
+			} while (count($users) >= $limit);
208 208
 		}
209 209
 		$progress->finish();
210 210
 	}
@@ -221,13 +221,13 @@  discard block
 block discarded – undo
221 221
 
222 222
 		if ($this->userManager->userExists($user)) {
223 223
 
224
-			$source = $oldRoot . '/' . $user . '/files_encryption';
225
-			$target = $newRoot . '/' . $user . '/files_encryption';
224
+			$source = $oldRoot.'/'.$user.'/files_encryption';
225
+			$target = $newRoot.'/'.$user.'/files_encryption';
226 226
 			if (
227 227
 				$this->rootView->is_dir($source) &&
228 228
 				$this->targetExists($target) === false
229 229
 			) {
230
-				$this->prepareParentFolder($newRoot . '/' . $user);
230
+				$this->prepareParentFolder($newRoot.'/'.$user);
231 231
 				$this->rootView->rename($source, $target);
232 232
 			}
233 233
 		}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
 			$sub_dirs = explode('/', ltrim($path, '/'));
246 246
 			$dir = '';
247 247
 			foreach ($sub_dirs as $sub_dir) {
248
-				$dir .= '/' . $sub_dir;
248
+				$dir .= '/'.$sub_dir;
249 249
 				if ($this->rootView->file_exists($dir) === false) {
250 250
 					$this->rootView->mkdir($dir);
251 251
 				}
Please login to merge, or discard this patch.
core/Command/Encryption/SetDefaultModule.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,11 +59,11 @@
 block discarded – undo
59 59
 		$moduleId = $input->getArgument('module');
60 60
 
61 61
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
62
-			$output->writeln('"' . $moduleId . '"" is already the default module');
62
+			$output->writeln('"'.$moduleId.'"" is already the default module');
63 63
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
64
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
64
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
65 65
 		} else {
66
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
66
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
67 67
 		}
68 68
 	}
69 69
 }
Please login to merge, or discard this patch.
core/Command/Group/ListCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	}
72 72
 
73 73
 	protected function execute(InputInterface $input, OutputInterface $output) {
74
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
74
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
75 75
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
76 76
 	}
77 77
 
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 	 * @return array
81 81
 	 */
82 82
 	private function formatGroups(array $groups) {
83
-		$keys = array_map(function (IGroup $group) {
83
+		$keys = array_map(function(IGroup $group) {
84 84
 			return $group->getGID();
85 85
 		}, $groups);
86
-		$values = array_map(function (IGroup $group) {
86
+		$values = array_map(function(IGroup $group) {
87 87
 			return array_keys($group->getUsers());
88 88
 		}, $groups);
89 89
 		return array_combine($keys, $values);
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,17 +29,17 @@
 block discarded – undo
29 29
 // because base.php will already use 5.6 syntax.
30 30
 if (version_compare(PHP_VERSION, '5.6.0') === -1) {
31 31
 	echo 'This version of Nextcloud requires at least PHP 5.6.0<br/>';
32
-	echo 'You are currently running ' . PHP_VERSION . '. Please update your PHP version.';
32
+	echo 'You are currently running '.PHP_VERSION.'. Please update your PHP version.';
33 33
 	return;
34 34
 }
35 35
 
36 36
 try {
37 37
 
38
-	require_once __DIR__ . '/lib/base.php';
38
+	require_once __DIR__.'/lib/base.php';
39 39
 
40 40
 	OC::handleRequest();
41 41
 
42
-} catch(\OC\ServiceUnavailableException $ex) {
42
+} catch (\OC\ServiceUnavailableException $ex) {
43 43
 	\OC::$server->getLogger()->logException($ex, array('app' => 'index'));
44 44
 
45 45
 	//show the user a detailed error page
Please login to merge, or discard this patch.
settings/templates/settings.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,6 +4,6 @@
 block discarded – undo
4 4
  * See the COPYING-README file.
5 5
  */?>
6 6
 
7
-<?php foreach($_['forms'] as $form) {
7
+<?php foreach ($_['forms'] as $form) {
8 8
 	print_unescaped($form);
9 9
 };
Please login to merge, or discard this patch.
settings/templates/users/part.setquota.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@
 block discarded – undo
1 1
 <div class="quota">
2 2
 	<!-- Default storage -->
3
-	<span><?php p($l->t('Default quota'));?></span>
4
-	<?php if((bool) $_['isAdmin']): ?>
3
+	<span><?php p($l->t('Default quota')); ?></span>
4
+	<?php if ((bool) $_['isAdmin']): ?>
5 5
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
6
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
7
-				<?php p($l->t('Unlimited'));?>
6
+			<option <?php if ($_['default_quota'] === 'none') print_unescaped('selected="selected"'); ?> value='none'>
7
+				<?php p($l->t('Unlimited')); ?>
8 8
 			</option>
9
-			<?php foreach($_['quota_preset'] as $preset):?>
10
-				<?php if($preset !== 'default'):?>
11
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
12
-						<?php p($preset);?>
9
+			<?php foreach ($_['quota_preset'] as $preset):?>
10
+				<?php if ($preset !== 'default'):?>
11
+					<option <?php if ($_['default_quota'] == $preset) print_unescaped('selected="selected"'); ?> value='<?php p($preset); ?>'>
12
+						<?php p($preset); ?>
13 13
 					</option>
14
-				<?php endif;?>
15
-			<?php endforeach;?>
16
-			<?php if($_['defaultQuotaIsUserDefined']):?>
17
-				<option selected="selected" value='<?php p($_['default_quota']);?>'>
18
-					<?php p($_['default_quota']);?>
14
+				<?php endif; ?>
15
+			<?php endforeach; ?>
16
+			<?php if ($_['defaultQuotaIsUserDefined']):?>
17
+				<option selected="selected" value='<?php p($_['default_quota']); ?>'>
18
+					<?php p($_['default_quota']); ?>
19 19
 				</option>
20
-			<?php endif;?>
20
+			<?php endif; ?>
21 21
 			<option data-new value='other'>
22
-				<?php p($l->t('Other'));?>
22
+				<?php p($l->t('Other')); ?>
23 23
 				...
24 24
 			</option>
25 25
 		</select>
26 26
 	<?php endif; ?>
27
-	<?php if((bool) !$_['isAdmin']): ?>
27
+	<?php if ((bool) !$_['isAdmin']): ?>
28 28
 		:
29
-		<?php if( $_['default_quota'] === 'none'): ?>
30
-			<?php p($l->t('Unlimited'));?>
29
+		<?php if ($_['default_quota'] === 'none'): ?>
30
+			<?php p($l->t('Unlimited')); ?>
31 31
 		<?php else: ?>
32
-			<?php p($_['default_quota']);?>
32
+			<?php p($_['default_quota']); ?>
33 33
 		<?php endif; ?>
34 34
 	<?php endif; ?>
35 35
 </div>
Please login to merge, or discard this patch.
settings/templates/users/part.createuser.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
 		<div class="groups"><div class="groupsListContainer multiselect button" data-placeholder="<?php p($l->t('Groups'))?>"><span class="title groupsList"></span><span class="icon-triangle-s"></span></div></div>
14 14
 		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
15 15
 	</form>
16
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
16
+	<?php if ((bool) $_['recoveryAdminEnabled']): ?>
17 17
 	<div class="recoveryPassword">
18 18
 	<input id="recoveryPassword"
19 19
 		   type="password"
Please login to merge, or discard this patch.
settings/ajax/setquota.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -35,42 +35,42 @@
 block discarded – undo
35 35
 $lastConfirm = (int) \OC::$server->getSession()->get('last-password-confirm');
36 36
 if ($lastConfirm < (time() - 30 * 60 + 15)) { // allow 15 seconds delay
37 37
 	$l = \OC::$server->getL10N('core');
38
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Password confirmation is required'))));
38
+	OC_JSON::error(array('data' => array('message' => $l->t('Password confirmation is required'))));
39 39
 	exit();
40 40
 }
41 41
 
42
-$username = isset($_POST["username"]) ? (string)$_POST["username"] : '';
42
+$username = isset($_POST["username"]) ? (string) $_POST["username"] : '';
43 43
 
44 44
 $isUserAccessible = false;
45 45
 $currentUserObject = \OC::$server->getUserSession()->getUser();
46 46
 $targetUserObject = \OC::$server->getUserManager()->get($username);
47
-if($targetUserObject !== null && $currentUserObject !== null) {
47
+if ($targetUserObject !== null && $currentUserObject !== null) {
48 48
 	$isUserAccessible = \OC::$server->getGroupManager()->getSubAdmin()->isUserAccessible($currentUserObject, $targetUserObject);
49 49
 }
50 50
 
51
-if(($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
51
+if (($username === '' && !OC_User::isAdminUser(OC_User::getUser()))
52 52
 	|| (!OC_User::isAdminUser(OC_User::getUser())
53 53
 		&& !$isUserAccessible)) {
54 54
 	$l = \OC::$server->getL10N('core');
55
-	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
55
+	OC_JSON::error(array('data' => array('message' => $l->t('Authentication error'))));
56 56
 	exit();
57 57
 }
58 58
 
59 59
 //make sure the quota is in the expected format
60
-$quota= (string)$_POST["quota"];
61
-if($quota !== 'none' and $quota !== 'default') {
62
-	$quota= OC_Helper::computerFileSize($quota);
63
-	$quota=OC_Helper::humanFileSize($quota);
60
+$quota = (string) $_POST["quota"];
61
+if ($quota !== 'none' and $quota !== 'default') {
62
+	$quota = OC_Helper::computerFileSize($quota);
63
+	$quota = OC_Helper::humanFileSize($quota);
64 64
 }
65 65
 
66 66
 // Return Success story
67
-if($username) {
67
+if ($username) {
68 68
 	$targetUserObject->setQuota($quota);
69
-}else{//set the default quota when no username is specified
70
-	if($quota === 'default') {//'default' as default quota makes no sense
71
-		$quota='none';
69
+} else {//set the default quota when no username is specified
70
+	if ($quota === 'default') {//'default' as default quota makes no sense
71
+		$quota = 'none';
72 72
 	}
73 73
 	\OC::$server->getAppConfig()->setValue('files', 'default_quota', $quota);
74 74
 }
75
-OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
75
+OC_JSON::success(array("data" => array("username" => $username, 'quota' => $quota)));
76 76
 
Please login to merge, or discard this patch.