@@ -247,8 +247,7 @@ |
||
| 247 | 247 | return new JSONResponse($e->getReturnMessage(), Http::STATUS_BAD_REQUEST); |
| 248 | 248 | } catch (AuthenticationFailedException $e) { |
| 249 | 249 | return new JSONResponse(["message" => "RESOURCE_NOT_FOUND"], Http::STATUS_FORBIDDEN); |
| 250 | - } |
|
| 251 | - catch (\Exception $e) { |
|
| 250 | + } catch (\Exception $e) { |
|
| 252 | 251 | return new JSONResponse( |
| 253 | 252 | ['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()], |
| 254 | 253 | Http::STATUS_BAD_REQUEST |
@@ -18,14 +18,20 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | <p> |
| 20 | 20 | <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox" |
| 21 | - value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 21 | + value="1" <?php if ($_['outgoingServer2serverShareEnabled']) { |
|
| 22 | + print_unescaped('checked="checked"'); |
|
| 23 | +} |
|
| 24 | +?> /> |
|
| 22 | 25 | <label for="outgoingServer2serverShareEnabled"> |
| 23 | 26 | <?php p($l->t('Allow users on this server to send shares to other servers'));?> |
| 24 | 27 | </label> |
| 25 | 28 | </p> |
| 26 | 29 | <p> |
| 27 | 30 | <input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox" |
| 28 | - value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 31 | + value="1" <?php if ($_['incomingServer2serverShareEnabled']) { |
|
| 32 | + print_unescaped('checked="checked"'); |
|
| 33 | +} |
|
| 34 | +?> /> |
|
| 29 | 35 | <label for="incomingServer2serverShareEnabled"> |
| 30 | 36 | <?php p($l->t('Allow users on this server to receive shares from other servers'));?> |
| 31 | 37 | </label><br/> |
@@ -33,14 +39,20 @@ discard block |
||
| 33 | 39 | <?php if($_['federatedGroupSharingSupported']): ?> |
| 34 | 40 | <p> |
| 35 | 41 | <input type="checkbox" name="outgoing_server2server_group_share_enabled" id="outgoingServer2serverGroupShareEnabled" class="checkbox" |
| 36 | - value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 42 | + value="1" <?php if ($_['outgoingServer2serverGroupShareEnabled']) { |
|
| 43 | + print_unescaped('checked="checked"'); |
|
| 44 | +} |
|
| 45 | +?> /> |
|
| 37 | 46 | <label for="outgoingServer2serverGroupShareEnabled"> |
| 38 | 47 | <?php p($l->t('Allow users on this server to send shares to groups on other servers'));?> |
| 39 | 48 | </label> |
| 40 | 49 | </p> |
| 41 | 50 | <p> |
| 42 | 51 | <input type="checkbox" name="incoming_server2server_group_share_enabled" id="incomingServer2serverGroupShareEnabled" class="checkbox" |
| 43 | - value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 52 | + value="1" <?php if ($_['incomingServer2serverGroupShareEnabled']) { |
|
| 53 | + print_unescaped('checked="checked"'); |
|
| 54 | +} |
|
| 55 | +?> /> |
|
| 44 | 56 | <label for="incomingServer2serverGroupShareEnabled"> |
| 45 | 57 | <?php p($l->t('Allow users on this server to receive group shares from other servers'));?> |
| 46 | 58 | </label><br/> |
@@ -48,14 +60,20 @@ discard block |
||
| 48 | 60 | <?php endif; ?> |
| 49 | 61 | <p> |
| 50 | 62 | <input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox" |
| 51 | - value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 63 | + value="1" <?php if ($_['lookupServerEnabled']) { |
|
| 64 | + print_unescaped('checked="checked"'); |
|
| 65 | +} |
|
| 66 | +?> /> |
|
| 52 | 67 | <label for="lookupServerEnabled"> |
| 53 | 68 | <?php p($l->t('Search global and public address book for users'));?> |
| 54 | 69 | </label><br/> |
| 55 | 70 | </p> |
| 56 | 71 | <p> |
| 57 | 72 | <input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox" |
| 58 | - value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 73 | + value="1" <?php if ($_['lookupServerUploadEnabled']) { |
|
| 74 | + print_unescaped('checked="checked"'); |
|
| 75 | +} |
|
| 76 | +?> /> |
|
| 59 | 77 | <label for="lookupServerUploadEnabled"> |
| 60 | 78 | <?php p($l->t('Allow users to publish their data to a global and public address book'));?> |
| 61 | 79 | </label><br/> |
@@ -226,7 +226,7 @@ |
||
| 226 | 226 | if ($share->getSharedWith() === null) { |
| 227 | 227 | throw new \InvalidArgumentException('SharedWith should not be empty'); |
| 228 | 228 | } |
| 229 | - } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
| 229 | + } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
| 230 | 230 | if ($share->getSharedWith() === null) { |
| 231 | 231 | throw new \InvalidArgumentException('SharedWith should not be empty'); |
| 232 | 232 | } |
@@ -14,10 +14,13 @@ |
||
| 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', array($theme->getName()))); ?> |
@@ -50,17 +50,23 @@ |
||
| 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"> |
@@ -15,9 +15,12 @@ |
||
| 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"> |
@@ -864,8 +864,7 @@ |
||
| 864 | 864 | $restrictions = array_values($restrictions); |
| 865 | 865 | if (empty($restrictions)) { |
| 866 | 866 | $appManager->disableApp($appId); |
| 867 | - } |
|
| 868 | - else{ |
|
| 867 | + } else{ |
|
| 869 | 868 | $appManager->enableAppForGroups($appId, $restrictions); |
| 870 | 869 | } |
| 871 | 870 | |
@@ -23,8 +23,11 @@ |
||
| 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')); ?>"/> |
@@ -76,16 +76,14 @@ |
||
| 76 | 76 | if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) { |
| 77 | 77 | if ($_['themedark']) { |
| 78 | 78 | $icon = $provider->getLightIcon(); |
| 79 | - } |
|
| 80 | - else { |
|
| 79 | + } else { |
|
| 81 | 80 | $icon = $provider->getDarkIcon(); |
| 82 | 81 | } |
| 83 | 82 | //fallback icon if the 2factor provider doesn't provide an icon. |
| 84 | 83 | } else { |
| 85 | 84 | if ($_['themedark']) { |
| 86 | 85 | $icon = image_path('core', 'actions/password-white.svg'); |
| 87 | - } |
|
| 88 | - else { |
|
| 86 | + } else { |
|
| 89 | 87 | $icon = image_path('core', 'actions/password.svg'); |
| 90 | 88 | } |
| 91 | 89 | |