nextcloud / server

apps/encryption/lib/migration.php

Braces +3 added lines, -2 removed lines

@@ -348,8 +348,9 @@
 			$systemMountPoints = $this->getSystemMountPoints();
 			foreach ($systemMountPoints as $mountPoint) {
 				$normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';
-				if (strpos($normalized, $normalizedMountPoint) === 0)
-					return $targetDir;
+				if (strpos($normalized, $normalizedMountPoint) === 0) {
+									return $targetDir;
+				}
 			}
 		} else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) {
 			return $targetDir;

apps/encryption/templates/settings-admin.php

Braces +9 added lines, -3 removed lines

@@ -8,10 +8,13 @@ 
 <form id="ocDefaultEncryptionModule" class="sub-section">
 	<?php if(!$_["initStatus"]): ?>
 		<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
-	<?php else: ?>
+	<?php else {
+    : ?>
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
-				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
+				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"');
+}
+?> />
 			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
 			<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>
 		</p>
@@ -40,7 +43,10 @@ 
 		</p>
 		<br/><br/>
 
-		<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
+		<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') {
+    print_unescaped('class="hidden"');
+}
+?>>
 			<?php p($l->t("Change recovery key password:")); ?>
 			<span class="msg"></span>
 			<br/>

settings/templates/admin.php

Braces +144 added lines, -37 removed lines

@@ -207,75 +207,144 @@ 
 			href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
 		<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_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_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_allow_public_notification" id="allowPublicMailNotification" class="checkbox"
-				   value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') print_unescaped('checked="checked"'); ?> />
+				   value="1" <?php if ($_['allowPublicMailNotification'] == 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="allowPublicMailNotification"><?php p($l->t('Allow users to send mail notification for shared files'));?></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_allow_mail_notification" id="allowMailNotification" class="checkbox"
-				   value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
+				   value="1" <?php if ($_['allowMailNotification'] === 'yes') {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="allowMailNotification"><?php p($l->t('Allow users to send mail notification for shared files to other users'));?></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"/>
 			<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 needs to be entered.'));?></label><br />
 		</p>
 
@@ -302,15 +371,20 @@ 
 				<span class="crondate" original-title="<?php p($absolute_time);?>">
 					<?php p($l->t("Last cron job execution: %s.", [$relative_time]));?>
 				</span>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<span class="status error"></span>
-				<span class="crondate" original-title="<?php p($absolute_time);?>">
+				<span class="crondate" original-title="<?php p($absolute_time);
+}
+?>">
 					<?php p($l->t("Last cron job execution: %s. Something seems wrong.", [$relative_time]));?>
 				</span>
 			<?php endif;
-		else: ?>
+		else {
+		    : ?>
 			<span class="status error"></span>
 			<?php p($l->t("Cron was not executed yet!"));
+		}
 		endif; ?>
 	</p>
 	<?php endif; ?>
@@ -353,7 +427,10 @@ 
 	<p id="enable">
 		<input type="checkbox"
 			   id="enableEncryption" class="checkbox"
-			   value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> />
+			   value="1" <?php if ($_['encryptionEnabled']) {
+    print_unescaped('checked="checked" disabled="disabled"');
+}
+?> />
 		<label
 			for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/>
 	</p>
@@ -372,8 +449,14 @@ 
 			   value="<?php p($l->t("Enable encryption")); ?>" /></p>
 	</div>
 
-	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>">
-		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>">
+	<div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) {
+    p('hidden');
+}
+?>">
+		<div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if (empty($_['encryptionModules'])) {
 				p($l->t('No encryption module loaded, please enable an encryption module in the app menu.'));
@@ -391,12 +474,18 @@ 
 							for="<?php p($id) ?>"><?php p($module['displayName']) ?></label>
 						<br/>
 
-						<?php if ($id === 'OC_DEFAULT_MODULE') print_unescaped($_['ocDefaultEncryptionModulePanel']); ?>
+						<?php if ($id === 'OC_DEFAULT_MODULE') {
+    print_unescaped($_['ocDefaultEncryptionModulePanel']);
+}
+?>
 					<?php endforeach; ?>
 				</fieldset>
 			<?php } ?>
 		</div>
-		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>">
+		<div id="migrationWarning" class="<?php if ($_['encryptionReady']) {
+    p('hidden');
+}
+?>">
 			<?php
 			if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) {
 				p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\''));
@@ -431,11 +520,17 @@ 
 			</select>
 
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-				   <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+				   <?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php p($l->t( 'Encryption' )); ?>
 			</label>
 			<select name="mail_smtpsecure" id="mail_smtpsecure"
-					<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+					<?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 				<?php foreach ($mail_smtpsecure as $secure => $name):
 					$selected = '';
 					if ($secure == $_['mail_smtpsecure']):
@@ -454,7 +549,10 @@ 
 				   value='<?php p($_['mail_domain']) ?>' />
 		</p>
 
-		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
 			<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
 				<?php foreach ($mail_smtpauthtype as $authtype => $name):
@@ -467,11 +565,17 @@ 
 			</select>
 
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
-				   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+				   <?php if ($_['mail_smtpauth']) {
+    print_unescaped('checked="checked"');
+}
+?> />
 			<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
 		</p>
 
-		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
 			<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
 				   value='<?php p($_['mail_smtphost']) ?>' />
@@ -481,7 +585,10 @@ 
 		</p>
 	</form>
 	<form class="mail_settings" id="mail_credentials_settings">
-		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') {
+    print_unescaped(' class="hidden"');
+}
+?>>
 			<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
 			<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
 				   value='<?php p($_['mail_smtpname']) ?>' />

settings/templates/users/part.setquota.php

Braces +8 added lines, -2 removed lines

@@ -3,12 +3,18 @@
 	<span><?php p($l->t('Default Quota'));?></span>
 	<?php if((bool) $_['isAdmin']): ?>
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
+			<option <?php if($_['default_quota'] === 'none') {
+    print_unescaped('selected="selected"');
+}
+?> value='none'>
 				<?php p($l->t('Unlimited'));?>
 			</option>
 			<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset !== 'default'):?>
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
+					<option <?php if($_['default_quota']==$preset) {
+    print_unescaped('selected="selected"');
+}
+?> value='<?php p($preset);?>'>
 						<?php p($preset);?>
 					</option>
 				<?php endif;?>

settings/templates/personal.php

Braces +5 added lines, -2 removed lines

@@ -44,8 +44,11 @@
 		<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 		<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 		<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-		<?php else: ?>
-		<?php p($l->t('Picture provided by original account')); ?>
+		<?php else {
+    : ?>
+		<?php p($l->t('Picture provided by original account'));
+}
+?>
 		<?php endif; ?>
 	</div>
 

settings/templates/certificates.php

Braces +5 added lines, -2 removed lines

@@ -23,8 +23,11 @@
 					<?php p($rootCert->getIssuerName()) ?>
 				</td>
 				<td <?php if ($rootCert != ''): ?>class="remove"
-					<?php else: ?>style="visibility:hidden;"
-					<?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>"
+					<?php else {
+    : ?>style="visibility:hidden;"
+					<?php endif;
+}
+?>><img alt="<?php p($l->t('Delete')); ?>"
 										 title="<?php p($l->t('Delete')); ?>"
 										 class="svg action"
 										 src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/>

resources/updater-fixes/sabre/dav/lib/DAV/CorePlugin.php

Braces +71 added lines, -27 removed lines

@@ -78,7 +78,9 @@ 
         $path = $request->getPath();
         $node = $this->server->tree->getNodeForPath($path, 0);
 
-        if (!$node instanceof IFile) return;
+        if (!$node instanceof IFile) {
+            return;
+        }
 
         $body = $node->get();
 
@@ -132,17 +134,23 @@ 
 
                 // It's a date. We must check if the entity is modified since
                 // the specified date.
-                if (!isset($httpHeaders['Last-Modified'])) $ignoreRangeHeader = true;
-                else {
+                if (!isset($httpHeaders['Last-Modified'])) {
+                    $ignoreRangeHeader = true;
+                } else {
                     $modified = new \DateTime($httpHeaders['Last-Modified']);
-                    if ($modified > $ifRangeDate) $ignoreRangeHeader = true;
+                    if ($modified > $ifRangeDate) {
+                        $ignoreRangeHeader = true;
+                    }
                 }
 
             } catch (\Exception $e) {
 
                 // It's an entity. We can do a simple comparison.
-                if (!isset($httpHeaders['ETag'])) $ignoreRangeHeader = true;
-                elseif ($httpHeaders['ETag'] !== $ifRange) $ignoreRangeHeader = true;
+                if (!isset($httpHeaders['ETag'])) {
+                    $ignoreRangeHeader = true;
+                } elseif ($httpHeaders['ETag'] !== $ifRange) {
+                    $ignoreRangeHeader = true;
+                }
             }
         }
 
@@ -154,18 +162,25 @@ 
 
                 $start = $range[0];
                 $end = $range[1] ? $range[1] : $nodeSize - 1;
-                if ($start >= $nodeSize)
-                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+                if ($start >= $nodeSize) {
+                                    throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $range[0] . ') exceeded the size of the entity (' . $nodeSize . ')');
+                }
 
-                if ($end < $start) throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
-                if ($end >= $nodeSize) $end = $nodeSize - 1;
+                if ($end < $start) {
+                    throw new Exception\RequestedRangeNotSatisfiable('The end offset (' . $range[1] . ') is lower than the start offset (' . $range[0] . ')');
+                }
+                if ($end >= $nodeSize) {
+                    $end = $nodeSize - 1;
+                }
 
             } else {
 
                 $start = $nodeSize - $range[1];
                 $end  = $nodeSize - 1;
 
-                if ($start < 0) $start = 0;
+                if ($start < 0) {
+                    $start = 0;
+                }
 
             }
 
@@ -175,7 +190,9 @@ 
             if (!stream_get_meta_data($body)['seekable'] || fseek($body, $start, SEEK_SET) === -1) {
                 $consumeBlock = 8192;
                 for ($consumed = 0; $start - $consumed > 0;){
-                    if (feof($body)) throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
+                    if (feof($body)) {
+                        throw new Exception\RequestedRangeNotSatisfiable('The start offset (' . $start . ') exceeded the size of the entity (' . $consumed . ')');
+                    }
                     $consumed += strlen(fread($body, min($start - $consumed, $consumeBlock)));
                 }
             }
@@ -187,7 +204,9 @@ 
 
         } else {
 
-            if ($nodeSize) $response->setHeader('Content-Length', $nodeSize);
+            if ($nodeSize) {
+                $response->setHeader('Content-Length', $nodeSize);
+            }
             $response->setStatus(200);
             $response->setBody($body);
 
@@ -281,7 +300,9 @@ 
 
         $path = $request->getPath();
 
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
+        if (!$this->server->emit('beforeUnbind', [$path])) {
+            return false;
+        }
         $this->server->tree->delete($path);
         $this->server->emit('afterUnbind', [$path]);
 
@@ -329,7 +350,9 @@ 
 
         $depth = $this->server->getHTTPDepth(1);
         // The only two options for the depth of a propfind is 0 or 1 - as long as depth infinity is not enabled
-        if (!$this->server->enablePropfindDepthInfinity && $depth != 0) $depth = 1;
+        if (!$this->server->enablePropfindDepthInfinity && $depth != 0) {
+            $depth = 1;
+        }
 
         $newProperties = $this->server->getPropertiesForPath($path, $propFindXml->properties, $depth);
 
@@ -506,14 +529,18 @@ 
             $node = $this->server->tree->getNodeForPath($path);
 
             // If the node is a collection, we'll deny it
-            if (!($node instanceof IFile)) throw new Exception\Conflict('PUT is not allowed on non-files.');
+            if (!($node instanceof IFile)) {
+                throw new Exception\Conflict('PUT is not allowed on non-files.');
+            }
 
             if (!$this->server->updateFile($path, $body, $etag)) {
                 return false;
             }
 
             $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
+            if ($etag) {
+                $response->setHeader('ETag', $etag);
+            }
             $response->setStatus(204);
 
         } else {
@@ -526,7 +553,9 @@ 
             }
 
             $response->setHeader('Content-Length', '0');
-            if ($etag) $response->setHeader('ETag', $etag);
+            if ($etag) {
+                $response->setHeader('ETag', $etag);
+            }
             $response->setStatus(201);
 
         }
@@ -570,8 +599,9 @@ 
 
             $properties = $mkcol->getProperties();
 
-            if (!isset($properties['{DAV:}resourcetype']))
-                throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+            if (!isset($properties['{DAV:}resourcetype'])) {
+                            throw new Exception\BadRequest('The mkcol request must include a {DAV:}resourcetype property');
+            }
 
             $resourceType = $properties['{DAV:}resourcetype']->getValue();
             unset($properties['{DAV:}resourcetype']);
@@ -623,12 +653,20 @@ 
 
         if ($moveInfo['destinationExists']) {
 
-            if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) return false;
+            if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) {
+                return false;
+            }
 
         }
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
-        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) return false;
-        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
+        if (!$this->server->emit('beforeUnbind', [$path])) {
+            return false;
+        }
+        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) {
+            return false;
+        }
+        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) {
+            return false;
+        }
 
         if ($moveInfo['destinationExists']) {
 
@@ -674,11 +712,15 @@ 
         $copyInfo = $this->server->getCopyAndMoveInfo($request);
 
         if ($copyInfo['destinationExists']) {
-            if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) return false;
+            if (!$this->server->emit('beforeUnbind', [$copyInfo['destination']])) {
+                return false;
+            }
             $this->server->tree->delete($copyInfo['destination']);
 
         }
-        if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) return false;
+        if (!$this->server->emit('beforeBind', [$copyInfo['destination']])) {
+            return false;
+        }
         $this->server->tree->copy($path, $copyInfo['destination']);
         $this->server->emit('afterBind', [$copyInfo['destination']]);
 
@@ -871,7 +913,9 @@ 
             // If we already have a sync-token from the current propFind
             // request, we can re-use that.
             $val = $propFind->get('{http://sabredav.org/ns}sync-token');
-            if ($val) return $val;
+            if ($val) {
+                return $val;
+            }
 
             $val = $propFind->get('{DAV:}sync-token');
             if ($val && is_scalar($val)) {

resources/updater-fixes/sabre/dav/lib/CardDAV/Backend/PDO.php

Braces +9 added lines, -3 removed lines

@@ -255,7 +255,9 @@ 
 
         $result = $stmt->fetch(\PDO::FETCH_ASSOC);
 
-        if (!$result) return false;
+        if (!$result) {
+            return false;
+        }
 
         $result['etag'] = '"' . $result['etag'] . '"';
         return $result;
@@ -464,7 +466,9 @@ 
         $stmt->execute([ $addressBookId ]);
         $currentToken = $stmt->fetchColumn(0);
 
-        if (is_null($currentToken)) return null;
+        if (is_null($currentToken)) {
+            return null;
+        }
 
         $result = [
             'syncToken' => $currentToken,
@@ -476,7 +480,9 @@ 
         if ($syncToken) {
 
             $query = "SELECT uri, operation FROM " . $this->addressBookChangesTableName . " WHERE synctoken >= ? AND synctoken < ? AND addressbookid = ? ORDER BY synctoken";
-            if ($limit > 0) $query .= " LIMIT " . (int)$limit;
+            if ($limit > 0) {
+                $query .= " LIMIT " . (int)$limit;
+            }
 
             // Fetching all changes
             $stmt = $this->pdo->prepare($query);

resources/updater-fixes/sabre/dav/lib/CalDAV/Plugin.php

Braces +21 added lines, -13 removed lines

@@ -396,8 +396,9 @@ 
             // Therefore we simply expose it as a property.
             $propFind->handle('{' . self::NS_CALDAV . '}calendar-data', function() use ($node) {
                 $val = $node->get();
-                if (is_resource($val))
-                    $val = stream_get_contents($val);
+                if (is_resource($val)) {
+                                    $val = stream_get_contents($val);
+                }
 
                 // Taking out \r to not screw up the xml output
                 return str_replace("\r", "", $val);
@@ -721,8 +722,9 @@ 
      */
     function beforeWriteContent($path, DAV\IFile $node, &$data, &$modified) {
 
-        if (!$node instanceof ICalendarObject)
-            return;
+        if (!$node instanceof ICalendarObject) {
+                    return;
+        }
 
         // We're onyl interested in ICalendarObject nodes that are inside of a
         // real calendar. This is to avoid triggering validation and scheduling
@@ -730,8 +732,9 @@ 
         list($parent) = Uri\split($path);
         $parentNode = $this->server->tree->getNodeForPath($parent);
 
-        if (!$parentNode instanceof ICalendar)
-            return;
+        if (!$parentNode instanceof ICalendar) {
+                    return;
+        }
 
         $this->validateICalendar(
             $data,
@@ -759,8 +762,9 @@ 
      */
     function beforeCreateFile($path, &$data, DAV\ICollection $parentNode, &$modified) {
 
-        if (!$parentNode instanceof ICalendar)
-            return;
+        if (!$parentNode instanceof ICalendar) {
+                    return;
+        }
 
         $this->validateICalendar(
             $data,
@@ -798,7 +802,9 @@ 
         // Converting the data to unicode, if needed.
         $data = DAV\StringUtil::ensureUTF8($data);
 
-        if ($before !== md5($data)) $modified = true;
+        if ($before !== md5($data)) {
+            $modified = true;
+        }
 
         try {
 
@@ -869,8 +875,9 @@ 
 
             }
         }
-        if (!$foundType)
-            throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+        if (!$foundType) {
+                    throw new DAV\Exception\BadRequest('iCalendar object must contain at least 1 of VEVENT, VTODO or VJOURNAL');
+        }
 
         // We use an extra variable to allow event handles to tell us wether
         // the object was modified or not.
@@ -915,8 +922,9 @@ 
      */
     function htmlActionsPanel(DAV\INode $node, &$output) {
 
-        if (!$node instanceof CalendarHome)
-            return;
+        if (!$node instanceof CalendarHome) {
+                    return;
+        }
 
         $output .= '<tr><td colspan="2"><form method="post" action="">
             <h3>Create new calendar</h3>