Completed
Push — master ( 031add...ab3599 )
by Morris
40:08 queued 20:01
created
apps/files_sharing/lib/Controller/ShareAPIController.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -498,7 +498,7 @@
 block discarded – undo
498 498
 
499 499
 			$share->setSharedWith($shareWith);
500 500
 			$share->setPermissions($permissions);
501
-		}  else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
501
+		} else if ($shareType === Share::SHARE_TYPE_REMOTE_GROUP) {
502 502
 			if (!$this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
503 503
 				throw new OCSForbiddenException($this->l->t('Sharing %1$s failed because the back end does not allow shares from type %2$s', [$path->getPath(), $shareType]));
504 504
 			}
Please login to merge, or discard this patch.
settings/templates/settings/personal/personal.info.php 1 patch
Braces   +48 added lines, -15 removed lines patch added patch discarded remove patch
@@ -57,8 +57,11 @@  discard block
 block discarded – undo
57 57
 						<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
58 58
 						<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
59 59
 						<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
60
-					<?php else: ?>
61
-						<?php p($l->t('Picture provided by original account')); ?>
60
+					<?php else {
61
+    : ?>
62
+						<?php p($l->t('Picture provided by original account'));
63
+}
64
+?>
62 65
 					<?php endif; ?>
63 66
 				</div>
64 67
 
@@ -88,9 +91,12 @@  discard block
 block discarded – undo
88 91
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
89 92
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
90 93
 								[$_['usage']]));?>
91
-						<?php else: ?>
94
+						<?php else {
95
+    : ?>
92 96
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
93
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
97
+								[$_['usage'], $_['total_space'],  $_['usage_relative']]));
98
+}
99
+?>
94 100
 						<?php endif ?>
95 101
 					</p>
96 102
 				</div>
@@ -134,7 +140,10 @@  discard block
 block discarded – undo
134 140
 						</span>
135 141
 					</div>
136 142
 				</h3>
137
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
143
+				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') {
144
+    p('hidden');
145
+}
146
+?>">
138 147
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
139 148
 				<?php
140 149
 					switch($_['emailVerification']) {
@@ -177,7 +186,10 @@  discard block
 block discarded – undo
177 186
 						</span>
178 187
 					</div>
179 188
 				</h3>
180
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
189
+				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) {
190
+    print_unescaped('disabled="1"');
191
+}
192
+?>
181 193
 					   value="<?php p($_['phone']) ?>"
182 194
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
183 195
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -199,7 +211,10 @@  discard block
 block discarded – undo
199 211
 						</span>
200 212
 					</div>
201 213
 				</h3>
202
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
214
+				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) {
215
+    print_unescaped('disabled="1"');
216
+}
217
+?>
203 218
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
204 219
 					   value="<?php p($_['address']) ?>"
205 220
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
@@ -222,7 +237,10 @@  discard block
 block discarded – undo
222 237
 					</div>
223 238
 				</h3>
224 239
 				<?php if($_['lookupServerUploadEnabled']) { ?>
225
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
240
+				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') {
241
+    p('hidden');
242
+}
243
+?>">
226 244
 					<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
227 245
 					<?php
228 246
 					switch($_['websiteVerification']) {
@@ -236,13 +254,16 @@  discard block
 block discarded – undo
236 254
 							p(image_path('core', 'actions/verify.svg'));
237 255
 					}
238 256
 					?>"
239
-					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
257
+					<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
258
+    print_unescaped(' class="verify-action"') ?>
240 259
 					>
241 260
 					<div class="verification-dialog popovermenu bubble menu">
242 261
 						<div class="verification-dialog-content">
243 262
 							<p class="explainVerification"></p>
244 263
 							<p class="verificationCode"></p>
245
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
264
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
265
+}
266
+?></p>
246 267
 						</div>
247 268
 					</div>
248 269
 				</div>
@@ -250,7 +271,10 @@  discard block
 block discarded – undo
250 271
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
251 272
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
252 273
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
253
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
274
+					   <?php if(!$_['lookupServerUploadEnabled']) {
275
+    print_unescaped('disabled="1"');
276
+}
277
+?>
254 278
 				/>
255 279
 				<span class="icon-checkmark hidden"></span>
256 280
 				<?php if($_['lookupServerUploadEnabled']) { ?>
@@ -271,7 +295,10 @@  discard block
 block discarded – undo
271 295
 					</div>
272 296
 				</h3>
273 297
 				<?php if($_['lookupServerUploadEnabled']) { ?>
274
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
298
+				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') {
299
+    p('hidden');
300
+}
301
+?>">
275 302
 					<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
276 303
 					<?php
277 304
 					switch($_['twitterVerification']) {
@@ -285,13 +312,16 @@  discard block
 block discarded – undo
285 312
 							p(image_path('core', 'actions/verify.svg'));
286 313
 					}
287 314
 					?>"
288
-					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
315
+					<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) {
316
+    print_unescaped(' class="verify-action"') ?>
289 317
 					>
290 318
 					<div class="verification-dialog popovermenu bubble menu">
291 319
 						<div class="verification-dialog-content">
292 320
 							<p class="explainVerification"></p>
293 321
 							<p class="verificationCode"></p>
294
-							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
322
+							<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));
323
+}
324
+?></p>
295 325
 						</div>
296 326
 					</div>
297 327
 				</div>
@@ -299,7 +329,10 @@  discard block
 block discarded – undo
299 329
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
300 330
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
301 331
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
302
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
332
+					   <?php if(!$_['lookupServerUploadEnabled']) {
333
+    print_unescaped('disabled="1"');
334
+}
335
+?>
303 336
 				/>
304 337
 				<span class="icon-checkmark hidden"></span>
305 338
 				<?php if($_['lookupServerUploadEnabled']) { ?>
Please login to merge, or discard this patch.