Passed
Push — master ( b5e9f7...9ff7f5 )
by Georg
10:36 queued 10s
created
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_external/templates/settings.php 2 patches
Switch Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -41,48 +41,48 @@
 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) {
46
-			$classes[] = 'optional';
47
-		} ?>
48
-			<input type="password"
44
+		    case DefinitionParameter::VALUE_PASSWORD: ?>
45
+    			<?php if ($is_optional) {
46
+			    $classes[] = 'optional';
47
+		    } ?>
48
+    			<input type="password"
49 49
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
50
-				data-parameter="<?php p($parameter->getName()); ?>"
50
+    				data-parameter="<?php p($parameter->getName()); ?>"
51 51
 				value="<?php p($value); ?>"
52 52
 				placeholder="<?php p($placeholder); ?>"
53 53
 			/>
54 54
 			<?php
55
-			break;
56
-		case DefinitionParameter::VALUE_BOOLEAN: ?>
57
-			<?php $checkboxId = uniqid("checkbox_"); ?>
55
+			    break;
56
+		    case DefinitionParameter::VALUE_BOOLEAN: ?>
57
+    			<?php $checkboxId = uniqid("checkbox_"); ?>
58 58
 			<div>
59 59
 			<label>
60 60
 			<input type="checkbox"
61 61
 				id="<?php p($checkboxId); ?>"
62 62
 				<?php if (!empty($classes)): ?> class="checkbox <?php p(implode(' ', $classes)); ?>"<?php endif; ?>
63
-				data-parameter="<?php p($parameter->getName()); ?>"
63
+    				data-parameter="<?php p($parameter->getName()); ?>"
64 64
 				<?php if ($value === true): ?> checked="checked"<?php endif; ?>
65
-			/>
65
+    			/>
66 66
 			<?php p($placeholder); ?>
67 67
 			</label>
68 68
 			</div>
69 69
 			<?php
70
-			break;
71
-		case DefinitionParameter::VALUE_HIDDEN: ?>
72
-			<input type="hidden"
70
+			    break;
71
+		    case DefinitionParameter::VALUE_HIDDEN: ?>
72
+    			<input type="hidden"
73 73
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
74
-				data-parameter="<?php p($parameter->getName()); ?>"
74
+    				data-parameter="<?php p($parameter->getName()); ?>"
75 75
 				value="<?php p($value); ?>"
76 76
 			/>
77 77
 			<?php
78
-			break;
79
-		default: ?>
80
-			<?php if ($is_optional) {
81
-			$classes[] = 'optional';
82
-		} ?>
83
-			<input type="text"
78
+			    break;
79
+		    default: ?>
80
+    			<?php if ($is_optional) {
81
+			    $classes[] = 'optional';
82
+		    } ?>
83
+    			<input type="text"
84 84
 				<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
85
-				data-parameter="<?php p($parameter->getName()); ?>"
85
+    				data-parameter="<?php p($parameter->getName()); ?>"
86 86
 				value="<?php p($value); ?>"
87 87
 				placeholder="<?php p($placeholder); ?>"
88 88
 			/>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -194,8 +194,11 @@
 block discarded – undo
194 194
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
195 195
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
196 196
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
197
-				<?php else: ?>
198
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
197
+				<?php else {
198
+    : ?>
199
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
200
+}
201
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
199 202
 				print_unescaped(' checked="checked"');
200 203
 			} ?> />
201 204
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
Please login to merge, or discard this patch.
apps/encryption/templates/settings-admin.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,11 +9,13 @@
 block discarded – undo
9 9
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
10 10
 	<?php if (!$_["initStatus"] && $_['masterKeyEnabled'] === false): ?>
11 11
 		<?php p($l->t("Encryption app is enabled but your keys are not initialized, please log-out and log-in again")); ?>
12
-	<?php else: ?>
12
+	<?php else {
13
+    : ?>
13 14
 		<p id="encryptHomeStorageSetting">
14 15
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15 16
 				   value="1" <?php if ($_['encryptHomeStorage']) {
16 17
 	print_unescaped('checked="checked"');
18
+}
17 19
 } ?> />
18 20
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
19 21
 			<em><?php p($l->t("Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted")); ?></em>
Please login to merge, or discard this patch.
core/templates/twofactorshowchallenge.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,8 +16,11 @@
 block discarded – undo
16 16
 	<?php if ($error): ?>
17 17
 			<?php if ($error_message): ?>
18 18
 				<p><strong><?php p($error_message); ?></strong></p>
19
-			<?php else: ?>
20
-				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
19
+			<?php else {
20
+    : ?>
21
+				<p><strong><?php p($l->t('Error while validating your second factor'));
22
+}
23
+?></strong></p>
21 24
 			<?php endif; ?>
22 25
 	<?php endif; ?>
23 26
 	<?php print_unescaped($template); ?>
Please login to merge, or discard this patch.
apps/files_sharing/templates/public.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -50,17 +50,23 @@
 block discarded – undo
50 50
 		<div id="preview">
51 51
 			<?php if (isset($_['folder'])): ?>
52 52
 				<?php print_unescaped($_['folder']); ?>
53
-			<?php else: ?>
53
+			<?php else {
54
+    : ?>
54 55
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?>
55 56
 					<div id="imgframe">
56
-						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
57
+						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']);
58
+}
59
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
57 60
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
58 61
 						</audio>
59 62
 					</div>
60
-				<?php else: ?>
63
+				<?php else {
64
+    : ?>
61 65
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
62 66
 					<div id="imgframe"></div>
63
-				<?php endif; ?>
67
+				<?php endif;
68
+}
69
+?>
64 70
 				<?php if ($_['previewURL'] === $_['downloadURL'] && !$_['hideDownload']): ?>
65 71
 					<div class="directDownload">
66 72
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
Please login to merge, or discard this patch.
apps/files/templates/appnavigation.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,9 +15,12 @@
 block discarded – undo
15 15
 					<p><?php p($l->t('%s used', [$_['usage']])); ?></p>
16 16
 				</a>
17 17
 			</li>
18
-		<?php else: ?>
18
+		<?php else {
19
+    : ?>
19 20
 			<li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
20
-				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
21
+				title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']]));
22
+}
23
+?>">
21 24
 				<a href="#" class="icon-quota svg">
22 25
 					<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
23 26
 					<div class="quota-container">
Please login to merge, or discard this patch.
core/Command/Log/Manage.php 1 patch
Switch Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -142,18 +142,18 @@  discard block
 block discarded – undo
142 142
 	protected function convertLevelString($level) {
143 143
 		$level = strtolower($level);
144 144
 		switch ($level) {
145
-		case 'debug':
146
-			return 0;
147
-		case 'info':
148
-			return 1;
149
-		case 'warning':
150
-		case 'warn':
151
-			return 2;
152
-		case 'error':
153
-		case 'err':
154
-			return 3;
155
-		case 'fatal':
156
-			return 4;
145
+		    case 'debug':
146
+			    return 0;
147
+		    case 'info':
148
+			    return 1;
149
+		    case 'warning':
150
+		    case 'warn':
151
+			    return 2;
152
+		    case 'error':
153
+		    case 'err':
154
+			    return 3;
155
+		    case 'fatal':
156
+			    return 4;
157 157
 		}
158 158
 		throw new \InvalidArgumentException('Invalid log level string');
159 159
 	}
@@ -165,16 +165,16 @@  discard block
 block discarded – undo
165 165
 	 */
166 166
 	protected function convertLevelNumber($levelNum) {
167 167
 		switch ($levelNum) {
168
-		case 0:
169
-			return 'Debug';
170
-		case 1:
171
-			return 'Info';
172
-		case 2:
173
-			return 'Warning';
174
-		case 3:
175
-			return 'Error';
176
-		case 4:
177
-			return 'Fatal';
168
+		    case 0:
169
+			    return 'Debug';
170
+		    case 1:
171
+			    return 'Info';
172
+		    case 2:
173
+			    return 'Warning';
174
+		    case 3:
175
+			    return 'Error';
176
+		    case 4:
177
+			    return 'Fatal';
178 178
 		}
179 179
 		throw new \InvalidArgumentException('Invalid log level number');
180 180
 	}
Please login to merge, or discard this patch.
core/templates/404.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,10 +14,13 @@
 block discarded – undo
14 14
 ?>
15 15
 <?php if (isset($_['content'])): ?>
16 16
 	<?php print_unescaped($_['content']) ?>
17
-<?php else: ?>
17
+<?php else {
18
+    : ?>
18 19
 	<div class="body-login-container update">
19 20
 		<div class="icon-big icon-search icon-white"></div>
20
-		<h2><?php p($l->t('File not found')); ?></h2>
21
+		<h2><?php p($l->t('File not found'));
22
+}
23
+?></h2>
21 24
 		<p class="infogroup"><?php p($l->t('The document could not be found on the server. Maybe the share was deleted or has expired?')); ?></p>
22 25
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
23 26
 			<?php p($l->t('Back to %s', [$theme->getName()])); ?>
Please login to merge, or discard this patch.
apps/settings/templates/settings/personal/personal.info.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,8 +55,11 @@  discard block
 block discarded – undo
55 55
 						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
56 56
 						<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
57 57
 						<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
58
-					<?php else: ?>
59
-						<?php p($l->t('Picture provided by original account')); ?>
58
+					<?php else {
59
+    : ?>
60
+						<?php p($l->t('Picture provided by original account'));
61
+}
62
+?>
60 63
 					<?php endif; ?>
61 64
 				</div>
62 65
 
@@ -86,9 +89,12 @@  discard block
 block discarded – undo
86 89
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
87 90
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
88 91
 								[$_['usage']]));?>
89
-						<?php else: ?>
92
+						<?php else {
93
+    : ?>
90 94
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
91
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
95
+								[$_['usage'], $_['total_space'],  $_['usage_relative']]));
96
+}
97
+?>
92 98
 						<?php endif ?>
93 99
 					</p>
94 100
 				</div>
Please login to merge, or discard this patch.