Passed
Push — master ( ff6610...e81fdf )
by Robin
14:53 queued 15s
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.
core/templates/installation.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,8 +17,11 @@  discard block
 block discarded – undo
17 17
 			<?php if (is_array($err)):?>
18 18
 				<?php p($err['error']); ?>
19 19
 				<span class='hint'><?php p($err['hint']); ?></span>
20
-			<?php else: ?>
21
-				<?php p($err); ?>
20
+			<?php else {
21
+    : ?>
22
+				<?php p($err);
23
+}
24
+?>
22 25
 			<?php endif; ?>
23 26
 		</p>
24 27
 		<?php endforeach; ?>
@@ -90,11 +93,14 @@  discard block
 block discarded – undo
90 93
 				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
91 94
 		</p>
92 95
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
93
-		<?php else: ?>
96
+		<?php else {
97
+    : ?>
94 98
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
95 99
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
96 100
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
97
-		<?php endif; ?>
101
+		<?php endif;
102
+}
103
+?>
98 104
 		<?php endforeach; ?>
99 105
 		</div>
100 106
 	</fieldset>
Please login to merge, or discard this patch.
core/templates/twofactorselectchallenge.php 1 patch
Braces   +13 added lines, -5 removed lines patch added patch discarded remove patch
@@ -27,11 +27,15 @@  discard block
 block discarded – undo
27 27
 					<?php p($l->t('Set up two-factor authentication')) ?>
28 28
 				</a>
29 29
 			<?php } ?>
30
-		<?php else: ?>
30
+		<?php else {
31
+    : ?>
31 32
 			<strong><?php p($l->t('Two-factor authentication is enforced but has not been configured on your account. Use one of your backup codes to log in or contact your admin for assistance.')) ?></strong>
32
-		<?php endif; ?>
33
+		<?php endif;
34
+}
35
+?>
33 36
 	</p>
34
-	<?php else: ?>
37
+	<?php else {
38
+    : ?>
35 39
 	<ul>
36 40
 	<?php foreach ($_['providers'] as $provider): ?>
37 41
 		<li>
@@ -45,6 +49,7 @@  discard block
 block discarded – undo
45 49
 				<?php
46 50
 				if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
47 51
 					$icon = $provider->getLightIcon();
52
+}
48 53
 				} else {
49 54
 					$icon = image_path('core', 'actions/password-white.svg');
50 55
 				}
@@ -61,7 +66,8 @@  discard block
 block discarded – undo
61 66
 	<?php endif ?>
62 67
 	<?php if (!is_null($_['backupProvider'])): ?>
63 68
 	<p>
64
-		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else: ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
69
+		<a class="<?php if ($noProviders): ?>button primary two-factor-primary<?php else {
70
+    : ?>two-factor-secondary<?php endif ?>" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge',
65 71
 			[
66 72
 				'challengeProviderId' => $_['backupProvider']->getId(),
67 73
 				'redirect_url' => $_['redirect_url'],
@@ -70,7 +76,9 @@  discard block
 block discarded – undo
70 76
 			<?php p($l->t('Use backup code')) ?>
71 77
 		</a>
72 78
 	</p>
73
-	<?php endif; ?>
79
+	<?php endif;
80
+}
81
+?>
74 82
 	<p><a class="two-factor-secondary" href="<?php print_unescaped($_['logout_url']); ?>">
75 83
 		<?php p($l->t('Cancel login')) ?>
76 84
 	</a></p>
Please login to merge, or discard this patch.
core/templates/publicshareauth.php 1 patch
Braces   +20 added lines, -8 removed lines patch added patch discarded remove patch
@@ -10,9 +10,12 @@  discard block
 block discarded – undo
10 10
 	<!-- password prompt form. It should be hidden when we show the email prompt form -->
11 11
 	<?php if (!isset($_['identityOk'])): ?>
12 12
 		<form method="post" id="password-input-form">
13
-	<?php else: ?>
13
+	<?php else {
14
+    : ?>
14 15
 		<form method="post" id="password-input-form" style="display:none;">
15
-	<?php endif; ?>
16
+	<?php endif;
17
+}
18
+?>
16 19
 		<fieldset class="warning">
17 20
 			<?php if (!isset($_['wrongpw'])): ?>
18 21
 				<div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div>
@@ -38,9 +41,12 @@  discard block
 block discarded – undo
38 41
 	<!-- email prompt form. It should initially be hidden -->
39 42
 	<?php if (isset($_['identityOk'])): ?>
40 43
 		<form method="post" id="email-input-form">
41
-	<?php else: ?>
44
+	<?php else {
45
+    : ?>
42 46
 		<form method="post" id="email-input-form" style="display:none;">
43
-	<?php endif; ?>
47
+	<?php endif;
48
+}
49
+?>
44 50
 		<fieldset class="warning">
45 51
 			<div class="warning-info" id="email-prompt"><?php p($l->t('Please type in your email address to request a temporary password')); ?></div>
46 52
 			 <p>
@@ -53,8 +59,11 @@  discard block
 block discarded – undo
53 59
 			<?php if (isset($_['identityOk'])): ?>
54 60
 				<?php if ($_['identityOk']): ?>
55 61
 					<div class="warning-info" id="identification-success"><?php p($l->t('Password sent!')); ?></div>
56
-				<?php else: ?>
57
-					<div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share')); ?></div>
62
+				<?php else {
63
+    : ?>
64
+					<div class="warning" id="identification-failure"><?php p($l->t('You are not authorized to request a password for this share'));
65
+}
66
+?></div>
58 67
 				<?php endif; ?>
59 68
 			<?php endif; ?>
60 69
 		</fieldset>
@@ -73,9 +82,12 @@  discard block
 block discarded – undo
73 82
 				id="request-password-back-button"
74 83
 	<?php if (isset($_['identityOk'])): ?>
75 84
 				style="display:block;">
76
-	<?php else: ?>
85
+	<?php else {
86
+    : ?>
77 87
 				style="display:none;">
78
-	<?php endif; ?>
88
+	<?php endif;
89
+}
90
+?>
79 91
 				<?php p($l->t('Back')); ?></a>
80 92
 		</fieldset>
81 93
 	</form>
Please login to merge, or discard this patch.
core/templates/404-profile.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,10 +15,13 @@
 block discarded – undo
15 15
 ?>
16 16
 <?php if (isset($_['content'])) : ?>
17 17
 	<?php print_unescaped($_['content']) ?>
18
-<?php else : ?>
18
+<?php else {
19
+    : ?>
19 20
 	<div class="body-login-container update">
20 21
 		<div class="icon-big icon-error"></div>
21
-		<h2><?php p($l->t('Profile not found')); ?></h2>
22
+		<h2><?php p($l->t('Profile not found'));
23
+}
24
+?></h2>
22 25
 		<p class="infogroup"><?php p($l->t('The profile does not exist.')); ?></p>
23 26
 		<p><a class="button primary" href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>">
24 27
 				<?php p($l->t('Back to %s', [$theme->getName()])); ?>
Please login to merge, or discard this patch.
apps/files_sharing/templates/public.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,7 +59,8 @@  discard block
 block discarded – undo
59 59
 		<div id="preview">
60 60
 			<?php if (isset($_['folder'])): ?>
61 61
 				<?php print_unescaped($_['folder']); ?>
62
-			<?php else: ?>
62
+			<?php else {
63
+    : ?>
63 64
 				<!-- preview frame to open file in with viewer -->
64 65
 				<div id="imgframe"></div>
65 66
 				<?php if (isset($_['mimetype']) && strpos($_['mimetype'], 'image') === 0) { ?>
@@ -68,7 +69,9 @@  discard block
 block discarded – undo
68 69
 							<?php p($_['filename'])?> (<?php p($_['fileSize']) ?>)
69 70
 						</div>
70 71
 						<?php if (!$_['hideDownload']) { ?>
71
-							<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
72
+							<a href="<?php p($_['downloadURL']);
73
+}
74
+?>" id="downloadFile" class="button">
72 75
 								<span class="icon icon-download"></span>
73 76
 								<?php p($l->t('Download'))?>
74 77
 							</a>
Please login to merge, or discard this patch.