Completed
Pull Request — master (#5859)
by Robin
14:35
created
settings/templates/certificates.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -23,8 +23,11 @@
 block discarded – undo
23 23
 					<?php p($rootCert->getIssuerName()) ?>
24 24
 				</td>
25 25
 				<td <?php if ($rootCert != ''): ?>class="remove"
26
-					<?php else: ?>style="visibility:hidden;"
27
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
26
+					<?php else {
27
+    : ?>style="visibility:hidden;"
28
+					<?php endif;
29
+}
30
+?>><img alt="<?php p($l->t('Delete')); ?>"
28 31
 										 title="<?php p($l->t('Delete')); ?>"
29 32
 										 class="action"
30 33
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>
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
@@ -72,17 +72,23 @@
 block discarded – undo
72 72
 	<div id="preview">
73 73
 			<?php if (isset($_['folder'])): ?>
74 74
 				<?php print_unescaped($_['folder']); ?>
75
-			<?php else: ?>
75
+			<?php else {
76
+    : ?>
76 77
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?>
77 78
 					<div id="imgframe">
78
-						<video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
79
+						<video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']);
80
+}
81
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
79 82
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
80 83
 						</video>
81 84
 					</div>
82
-				<?php else: ?>
85
+				<?php else {
86
+    : ?>
83 87
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
84 88
 					<div id="imgframe"></div>
85
-				<?php endif; ?>
89
+				<?php endif;
90
+}
91
+?>
86 92
 				<div class="directDownload">
87 93
 					<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">
88 94
 						<span class="icon icon-download"></span>
Please login to merge, or discard this patch.
settings/templates/settings/admin/server.php 1 patch
Braces   +8 added lines, -3 removed lines patch added patch discarded remove patch
@@ -166,15 +166,20 @@
 block discarded – undo
166 166
 					<span class="crondate" title="<?php p($absolute_time);?>">
167 167
 					<?php p($l->t("Last job ran %s.", [$relative_time]));?>
168 168
 				</span>
169
-				<?php else: ?>
169
+				<?php else {
170
+    : ?>
170 171
 					<span class="status error"></span>
171
-					<span class="crondate" title="<?php p($absolute_time);?>">
172
+					<span class="crondate" title="<?php p($absolute_time);
173
+}
174
+?>">
172 175
 					<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
173 176
 				</span>
174 177
 				<?php endif;
175
-			else: ?>
178
+			else {
179
+			    : ?>
176 180
 				<span class="status error"></span>
177 181
 				<?php p($l->t("Background job didn’t run yet!"));
182
+			}
178 183
 			endif; ?>
179 184
 		</p>
180 185
 	<?php endif; ?>
Please login to merge, or discard this patch.
apps/files_external/templates/settings.php 1 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.
apps/files/templates/admin.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,10 @@
 block discarded – undo
16 16
 			<input type="submit" id="submitMaxUpload"
17 17
 				   value="<?php p($l->t('Save')); ?>"/>
18 18
 			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p>
19
-		<?php else: ?>
20
-			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p>
19
+		<?php else {
20
+    : ?>
21
+			<p><em><?php p($l->t('Missing permissions to edit from here.'));
22
+}
23
+?></em></p>
21 24
 		<?php endif; ?>
22 25
 	</div>
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
@@ -18,8 +18,11 @@  discard block
 block discarded – undo
18 18
 			<?php if (is_array($err)):?>
19 19
 				<?php print_unescaped($err['error']); ?>
20 20
 				<span class='hint'><?php print_unescaped($err['hint']); ?></span>
21
-			<?php else: ?>
22
-				<?php print_unescaped($err); ?>
21
+			<?php else {
22
+    : ?>
23
+				<?php print_unescaped($err);
24
+}
25
+?>
23 26
 			<?php endif; ?>
24 27
 		</p>
25 28
 		<?php endforeach; ?>
@@ -91,11 +94,14 @@  discard block
 block discarded – undo
91 94
 				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
92 95
 		</p>
93 96
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
94
-		<?php else: ?>
97
+		<?php else {
98
+    : ?>
95 99
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
96 100
 			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
97 101
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
98
-		<?php endif; ?>
102
+		<?php endif;
103
+}
104
+?>
99 105
 		<?php endforeach; ?>
100 106
 		</div>
101 107
 	</fieldset>
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
 	<ul>
19 20
 		<li class="error">
20
-			<?php p($l->t('File not found')); ?><br>
21
+			<?php p($l->t('File not found'));
22
+}
23
+?><br>
21 24
 			<p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
22 25
 			<p class="hint"><a href="<?php p(\OC::$server->getURLGenerator()->linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', [$theme->getName()])); ?></a></p>
23 26
 		</li>
Please login to merge, or discard this patch.