Completed
Pull Request — master (#10069)
by
unknown
18:05
created
apps/files/templates/admin.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,10 @@
 block discarded – undo
14 14
 			<input type="submit" id="submitMaxUpload"
15 15
 				   value="<?php p($l->t( 'Save' )); ?>"/>
16 16
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
17
-		<?php else: ?>
18
-			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
17
+		<?php else {
18
+    : ?>
19
+			<p><em><?php p($l->t('Missing permissions to edit from here.'));
20
+}
21
+?></em></p>
19 22
 		<?php endif; ?>
20 23
 	</div>
Please login to merge, or discard this patch.
apps/files/lib/Helper.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 			} elseif ($file->isMounted()) {
76 76
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
77 77
 			}
78
-		}else{
78
+		} else{
79 79
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
80 80
 		}
81 81
 
Please login to merge, or discard this patch.
apps/files_external/templates/settings.php 2 patches
Switch Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -41,44 +41,44 @@
 block discarded – undo
41 41
 		$is_optional = $parameter->isFlagSet(DefinitionParameter::FLAG_OPTIONAL);
42 42
 
43 43
 		switch ($parameter->getType()) {
44
-		case DefinitionParameter::VALUE_PASSWORD: ?>
45
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
46
-			<input type="password"
44
+		    case DefinitionParameter::VALUE_PASSWORD: ?>
45
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
46
+    			<input type="password"
47 47
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
48
-				data-parameter="<?php p($parameter->getName()); ?>"
48
+    				data-parameter="<?php p($parameter->getName()); ?>"
49 49
 				value="<?php p($value); ?>"
50 50
 				placeholder="<?php p($placeholder); ?>"
51 51
 			/>
52 52
 			<?php
53
-			break;
54
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
55
-			<?php $checkboxId = uniqid("checkbox_"); ?>
53
+			    break;
54
+		    case DefinitionParameter::VALUE_BOOLEAN: ?>
55
+    			<?php $checkboxId = uniqid("checkbox_"); ?>
56 56
 			<div>
57 57
 			<label>
58 58
 			<input type="checkbox"
59 59
 				id="<?php p($checkboxId); ?>"
60 60
 				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
61
-				data-parameter="<?php p($parameter->getName()); ?>"
61
+    				data-parameter="<?php p($parameter->getName()); ?>"
62 62
 				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
63
-			/>
63
+    			/>
64 64
 			<?php p($placeholder); ?>
65 65
 			</label>
66 66
 			</div>
67 67
 			<?php
68
-			break;
69
-		case DefinitionParameter::VALUE_HIDDEN: ?>
70
-			<input type="hidden"
68
+			    break;
69
+		    case DefinitionParameter::VALUE_HIDDEN: ?>
70
+    			<input type="hidden"
71 71
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
72
-				data-parameter="<?php p($parameter->getName()); ?>"
72
+    				data-parameter="<?php p($parameter->getName()); ?>"
73 73
 				value="<?php p($value); ?>"
74 74
 			/>
75 75
 			<?php
76
-			break;
77
-		default: ?>
78
-			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
79
-			<input type="text"
76
+			    break;
77
+		    default: ?>
78
+    			<?php if ($is_optional) { $classes[] = 'optional'; } ?>
79
+    			<input type="text"
80 80
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
81
-				data-parameter="<?php p($parameter->getName()); ?>"
81
+    				data-parameter="<?php p($parameter->getName()); ?>"
82 82
 				value="<?php p($value); ?>"
83 83
 				placeholder="<?php p($placeholder); ?>"
84 84
 			/>
Please login to merge, or discard this patch.
Braces   +24 added lines, -6 removed lines patch added patch discarded remove patch
@@ -94,7 +94,10 @@  discard block
 block discarded – undo
94 94
 
95 95
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
96 96
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
97
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
97
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
98
+    print_unescaped(''.$_['dependencies'].'');
99
+}
100
+?>
98 101
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
99 102
 		<thead>
100 103
 			<tr>
@@ -103,7 +106,10 @@  discard block
 block discarded – undo
103 106
 				<th><?php p($l->t('External storage')); ?></th>
104 107
 				<th><?php p($l->t('Authentication')); ?></th>
105 108
 				<th><?php p($l->t('Configuration')); ?></th>
106
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
109
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
110
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
111
+}
112
+?>
107 113
 				<th>&nbsp;</th>
108 114
 				<th>&nbsp;</th>
109 115
 				<th>&nbsp;</th>
@@ -136,7 +142,10 @@  discard block
 block discarded – undo
136 142
 							});
137 143
 						?>
138 144
 						<?php foreach ($sortedBackends as $backend): ?>
139
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
145
+							<?php if ($backend->getDeprecateTo()) {
146
+    continue;
147
+}
148
+// ignore deprecated backends ?>
140 149
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
141 150
 						<?php endforeach; ?>
142 151
 					</select>
@@ -164,7 +173,10 @@  discard block
 block discarded – undo
164 173
 
165 174
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
166 175
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
167
-			value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> />
176
+			value="1" <?php if ($_['allowUserMounting']) {
177
+    print_unescaped(' checked="checked"');
178
+}
179
+?> />
168 180
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
169 181
 
170 182
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
@@ -177,8 +189,14 @@  discard block
 block discarded – undo
177 189
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
178 190
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
179 191
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
180
-				<?php else: ?>
181
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
192
+				<?php else {
193
+    : ?>
194
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
195
+}
196
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
197
+    print_unescaped(' checked="checked"');
198
+}
199
+?> />
182 200
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
183 201
 				<?php endif; ?>
184 202
 				<?php $i++; ?>
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Storage/FTP.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -93,8 +93,7 @@
 block discarded – undo
93 93
 	public function unlink($path) {
94 94
 		if ($this->is_dir($path)) {
95 95
 			return $this->rmdir($path);
96
-		}
97
-		else {
96
+		} else {
98 97
 			$url = $this->constructUrl($path);
99 98
 			$result = unlink($url);
100 99
 			clearstatcache(true, $url);
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Backend/LegacyBackend.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -62,18 +62,18 @@
 block discarded – undo
62 62
 				$placeholder = substr($placeholder, 1);
63 63
 			}
64 64
 			switch ($placeholder[0]) {
65
-			case '!':
66
-				$type = DefinitionParameter::VALUE_BOOLEAN;
67
-				$placeholder = substr($placeholder, 1);
68
-				break;
69
-			case '*':
70
-				$type = DefinitionParameter::VALUE_PASSWORD;
71
-				$placeholder = substr($placeholder, 1);
72
-				break;
73
-			case '#':
74
-				$type = DefinitionParameter::VALUE_HIDDEN;
75
-				$placeholder = substr($placeholder, 1);
76
-				break;
65
+			    case '!':
66
+				    $type = DefinitionParameter::VALUE_BOOLEAN;
67
+				    $placeholder = substr($placeholder, 1);
68
+				    break;
69
+			    case '*':
70
+				    $type = DefinitionParameter::VALUE_PASSWORD;
71
+				    $placeholder = substr($placeholder, 1);
72
+				    break;
73
+			    case '#':
74
+				    $type = DefinitionParameter::VALUE_HIDDEN;
75
+				    $placeholder = substr($placeholder, 1);
76
+				    break;
77 77
 			}
78 78
 			$this->addParameter((new DefinitionParameter($name, $placeholder))
79 79
 				->setType($type)
Please login to merge, or discard this patch.
apps/files_trashbin/ajax/delete.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,8 +40,7 @@
 block discarded – undo
40 40
 		$list[] = $folder;
41 41
 		$folder = dirname($folder);
42 42
 	}
43
-}
44
-else {
43
+} else {
45 44
 	$deleteAll = false;
46 45
 	$files = (string)$_POST['files'];
47 46
 	$list = json_decode($files);
Please login to merge, or discard this patch.
apps/dav/lib/DAV/Sharing/Plugin.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,8 +119,9 @@
 block discarded – undo
119 119
 
120 120
 		// Only handling xml
121 121
 		$contentType = $request->getHeader('Content-Type');
122
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false)
123
-			return;
122
+		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
123
+					return;
124
+		}
124 125
 
125 126
 		// Making sure the node exists
126 127
 		try {
Please login to merge, or discard this patch.
apps/dav/lib/Connector/Sabre/FilesPlugin.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -245,7 +245,9 @@
 block discarded – undo
245 245
 	function httpGet(RequestInterface $request, ResponseInterface $response) {
246 246
 		// Only handle valid files
247 247
 		$node = $this->tree->getNodeForPath($request->getPath());
248
-		if (!($node instanceof IFile)) return;
248
+		if (!($node instanceof IFile)) {
249
+		    return;
250
+		}
249 251
 
250 252
 		// adds a 'Content-Disposition: attachment' header in case no disposition
251 253
 		// header has been set before
Please login to merge, or discard this patch.
apps/dav/lib/Connector/LegacyDAVACL.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,9 @@
 block discarded – undo
38 38
 	public function getCurrentUserPrincipals() {
39 39
 		$principalV2 = $this->getCurrentUserPrincipal();
40 40
 
41
-		if (is_null($principalV2)) return [];
41
+		if (is_null($principalV2)) {
42
+		    return [];
43
+		}
42 44
 
43 45
 		$principalV1 = $this->convertPrincipal($principalV2, false);
44 46
 		return array_merge(
Please login to merge, or discard this patch.