nextcloud / server

lib/private/L10N/L10NString.php

Braces +1 added lines, -2 removed lines

@@ -61,8 +61,7 @@
 				$fn = $this->l10n->getPluralFormFunction();
 				$id = $fn($this->count);
 				$text = $translations[$this->text][$id];
-			}
-			else{
+			} else{
 				$text = $translations[$this->text];
 			}
 		}

settings/templates/settings/admin/server.php

Braces +8 added lines, -3 removed lines

@@ -165,15 +165,20 @@
 				<span class="crondate" title="<?php p($absolute_time);?>">
 				<?php p($l->t("Last job ran %s.", [$relative_time]));?>
 			</span>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<span class="status error"></span>
-				<span class="crondate" title="<?php p($absolute_time);?>">
+				<span class="crondate" title="<?php p($absolute_time);
+}
+?>">
 				<?php p($l->t("Last job execution ran %s. Something seems wrong.", [$relative_time]));?>
 			</span>
 			<?php endif;
-		else: ?>
+		else {
+		    : ?>
 			<span class="status error"></span>
 			<?php p($l->t("Background job didn’t run yet!"));
+		}
 		endif; ?>
 	</p>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"

settings/templates/settings/admin/sharing.php

Braces +96 added lines, -24 removed lines

@@ -34,73 +34,139 @@ 
         <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
 	<p id="enable">
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
-			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
-			   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowLinks'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
 	</p>
 
-	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
-			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
-			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
-			   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['enforceLinkPassword']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
 
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
 
 	</p>
-	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<?php p($l->t( 'Expire after ' )); ?>
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
 		<?php p($l->t( 'days' )); ?>
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
-			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
-			   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowResharing'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
-			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
-			   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['onlyShareWithGroupMembers']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
-			   value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
+			   value="1" <?php if ($_['shareExcludeGroups']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
 	</p>
-	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
 		<br />
 		<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
 	</p>
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
-			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
+			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered.'));?></label><br />
 	</p>
 	<p>
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
-			<?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> />
+			<?php if ($_['publicShareDisclaimerText'] !== null) {
+    print_unescaped('checked="checked"');
+}
+?> />
 		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)'));?></label>
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
 		<br/>
@@ -110,10 +176,16 @@ 
 	<h3><?php p($l->t('Default share permissions'));?></h3>
 	<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
 		   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
-	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
+	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') {
+    p('hidden');
+}
+?>">
 		<?php foreach ($_['shareApiDefaultPermissionsCheckboxes'] as $perm): ?>
 			<input type="checkbox" name="shareapi_default_permission_<?php p($perm['id']) ?>" id="shareapi_default_permission_<?php p($perm['id']) ?>"
-				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) print_unescaped('checked="checked"'); ?> />
+				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
 		<?php endforeach ?>
 	</p>

apps/files_sharing/templates/public.php

Braces +10 added lines, -4 removed lines

@@ -34,17 +34,23 @@
 		<div id="preview">
 			<?php if (isset($_['folder'])): ?>
 				<?php print_unescaped($_['folder']); ?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'audio'): ?>
 					<div id="imgframe">
-						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px">
+						<audio tabindex="0" controls="" preload="none" style="width: 100%; max-width: <?php p($_['previewMaxX']);
+}
+?>px; max-height: <?php p($_['previewMaxY']); ?>px">
 							<source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" />
 						</audio>
 					</div>
-				<?php else: ?>
+				<?php else {
+    : ?>
 					<!-- Preview frame is filled via JS to support SVG images for modern browsers -->
 					<div id="imgframe"></div>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 				<?php if ($_['previewURL'] === $_['downloadURL']): ?>
 					<div class="directDownload">
 						<a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button">

apps/files_external/lib/Lib/Storage/OwnCloud.php

Braces +1 added lines, -2 removed lines

@@ -62,8 +62,7 @@
 
 		if (isset($params['root'])){
 			$root = '/' . ltrim($params['root'], '/');
-		}
-		else{
+		} else{
 			$root = '/';
 		}
 

settings/templates/users/main.php

Braces +12 added lines, -3 removed lines

@@ -48,21 +48,30 @@
 			<div id="userlistoptions">
 				<p>
 					<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation"
-						class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_storage_location'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxStorageLocation">
 						<?php p($l->t('Show storage location')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend"
-						class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_backend'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxUserBackend">
 						<?php p($l->t('Show user backend')) ?>
 					</label>
 				</p>
 				<p>
 					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin"
-						class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> />
+						class="checkbox" <?php if ($_['show_last_login'] === 'true') {
+    print_unescaped('checked="checked"');
+}
+?> />
 					<label for="CheckboxLastLogin">
 						<?php p($l->t('Show last login')) ?>
 					</label>

apps/files_external/templates/settings.php

Braces +24 added lines, -6 removed lines

@@ -94,7 +94,10 @@ 
 
 <form data-can-create="<?php echo $canCreateMounts?'true':'false' ?>" id="files_external" class="section" data-encryption-enabled="<?php echo $_['encryptionEnabled']?'true': 'false'; ?>">
 	<h2 data-anchor-name="external-storage"><?php p($l->t('External storages')); ?></h2>
-	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) print_unescaped(''.$_['dependencies'].''); ?>
+	<?php if (isset($_['dependencies']) and ($_['dependencies'] !== '') and $canCreateMounts) {
+    print_unescaped(''.$_['dependencies'].'');
+}
+?>
 	<table id="externalStorage" class="grid" data-admin='<?php print_unescaped(json_encode($_['visibilityType'] === BackendService::VISIBILITY_ADMIN)); ?>'>
 		<thead>
 			<tr>
@@ -103,7 +106,10 @@ 
 				<th><?php p($l->t('External storage')); ?></th>
 				<th><?php p($l->t('Authentication')); ?></th>
 				<th><?php p($l->t('Configuration')); ?></th>
-				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) print_unescaped('<th>'.$l->t('Available for').'</th>'); ?>
+				<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN) {
+    print_unescaped('<th>'.$l->t('Available for').'</th>');
+}
+?>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
@@ -136,7 +142,10 @@ 
 							});
 						?>
 						<?php foreach ($sortedBackends as $backend): ?>
-							<?php if ($backend->getDeprecateTo()) continue; // ignore deprecated backends ?>
+							<?php if ($backend->getDeprecateTo()) {
+    continue;
+}
+// ignore deprecated backends ?>
 							<option value="<?php p($backend->getIdentifier()); ?>"><?php p($backend->getText()); ?></option>
 						<?php endforeach; ?>
 					</select>
@@ -164,7 +173,10 @@ 
 
 	<?php if ($_['visibilityType'] === BackendService::VISIBILITY_ADMIN): ?>
 		<input type="checkbox" name="allowUserMounting" id="allowUserMounting" class="checkbox"
-			value="1" <?php if ($_['allowUserMounting']) print_unescaped(' checked="checked"'); ?> />
+			value="1" <?php if ($_['allowUserMounting']) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 		<label for="allowUserMounting"><?php p($l->t('Allow users to mount external storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
 
 		<p id="userMountingBackends"<?php if (!$_['allowUserMounting']): ?> class="hidden"<?php endif; ?>>
@@ -177,8 +189,14 @@ 
 			<?php $i = 0; foreach ($userBackends as $backend): ?>
 				<?php if ($deprecateTo = $backend->getDeprecateTo()): ?>
 					<input type="hidden" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" data-deprecate-to="<?php p($deprecateTo->getIdentifier()); ?>" />
-				<?php else: ?>
-					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<?php else {
+    : ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i);
+}
+?>" class="checkbox" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
+    print_unescaped(' checked="checked"');
+}
+?> />
 					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php endif; ?>
 				<?php $i++; ?>

apps/files_versions/ajax/rollbackVersion.php

Braces +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
 	\OC_JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
-}else{
+} else{
 	$l = \OC::$server->getL10N('files_versions');
 	\OC_JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

apps/provisioning_api/lib/Controller/UsersController.php

Braces +1 added lines, -1 removed lines

@@ -479,7 +479,7 @@
 					}
 					if ($quota === 0) {
 						$quota = 'default';
-					}else if ($quota === -1) {
+					} else if ($quota === -1) {
 						$quota = 'none';
 					} else {
 						$quota = \OCP\Util::humanFileSize($quota);