@@ -23,7 +23,6 @@  | 
                                                    ||
| 23 | 23 | namespace OCA\User_LDAP\Controller;  | 
                                                        
| 24 | 24 | |
| 25 | 25 | use OC\HintException;  | 
                                                        
| 26 | -use OC_Util;  | 
                                                        |
| 27 | 26 | use OCP\AppFramework\Controller;  | 
                                                        
| 28 | 27 | use OCP\AppFramework\Http\RedirectResponse;  | 
                                                        
| 29 | 28 | use OCP\AppFramework\Http\TemplateResponse;  | 
                                                        
@@ -14,7 +14,10 @@  | 
                                                    ||
| 14 | 14 | <input type="submit" id="submitMaxUpload"  | 
                                                        
| 15 | 15 | value="<?php p($l->t( 'Save' )); ?>"/>  | 
                                                        
| 16 | 16 |  			<p><em><?php p($l->t('With PHP-FPM it might take 5 minutes for changes to be applied.')); ?></em></p> | 
                                                        
| 17 | - <?php else: ?>  | 
                                                        |
| 18 | -			<p><em><?php p($l->t('Missing permissions to edit from here.')); ?></em></p> | 
                                                        |
| 17 | +		<?php else { | 
                                                        |
| 18 | + : ?>  | 
                                                        |
| 19 | +			<p><em><?php p($l->t('Missing permissions to edit from here.')); | 
                                                        |
| 20 | +}  | 
                                                        |
| 21 | +?></em></p>  | 
                                                        |
| 19 | 22 | <?php endif; ?>  | 
                                                        
| 20 | 23 | </div>  | 
                                                        
@@ -75,7 +75,7 @@  | 
                                                    ||
| 75 | 75 |  			} elseif ($file->isMounted()) { | 
                                                        
| 76 | 76 |  				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external'); | 
                                                        
| 77 | 77 | }  | 
                                                        
| 78 | -		}else{ | 
                                                        |
| 78 | +		} else{ | 
                                                        |
| 79 | 79 | $icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());  | 
                                                        
| 80 | 80 | }  | 
                                                        
| 81 | 81 | |
@@ -93,8 +93,7 @@  | 
                                                    ||
| 93 | 93 |  	public function unlink($path) { | 
                                                        
| 94 | 94 |  		if ($this->is_dir($path)) { | 
                                                        
| 95 | 95 | return $this->rmdir($path);  | 
                                                        
| 96 | - }  | 
                                                        |
| 97 | -		else { | 
                                                        |
| 96 | +		} else { | 
                                                        |
| 98 | 97 | $url = $this->constructUrl($path);  | 
                                                        
| 99 | 98 | $result = unlink($url);  | 
                                                        
| 100 | 99 | clearstatcache(true, $url);  | 
                                                        
@@ -62,8 +62,7 @@  | 
                                                    ||
| 62 | 62 |  			if (substr($root, 0, 1) !== '/'){ | 
                                                        
| 63 | 63 | $root = '/' . $root;  | 
                                                        
| 64 | 64 | }  | 
                                                        
| 65 | - }  | 
                                                        |
| 66 | -		else{ | 
                                                        |
| 65 | +		} else{ | 
                                                        |
| 67 | 66 | $root = '/';  | 
                                                        
| 68 | 67 | }  | 
                                                        
| 69 | 68 | |
@@ -335,7 +335,7 @@  | 
                                                    ||
| 335 | 335 | }  | 
                                                        
| 336 | 336 |  					if($quota === 0) { | 
                                                        
| 337 | 337 | $quota = 'default';  | 
                                                        
| 338 | -					}else if($quota === -1) { | 
                                                        |
| 338 | +					} else if($quota === -1) { | 
                                                        |
| 339 | 339 | $quota = 'none';  | 
                                                        
| 340 | 340 |  					} else { | 
                                                        
| 341 | 341 | $quota = \OCP\Util::humanFileSize($quota);  | 
                                                        
@@ -48,11 +48,20 @@  | 
                                                    ||
| 48 | 48 | <br />  | 
                                                        
| 49 | 49 |  		<?php p($l->t('Notify members of the following groups about available updates:')); ?> | 
                                                        
| 50 | 50 | <input name="oca_updatenotification_groups_list" type="hidden" id="oca_updatenotification_groups_list" value="<?php p($_['notify_groups']) ?>" style="width: 400px">  | 
                                                        
| 51 | -		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) p('hidden'); ?>"> | 
                                                        |
| 51 | +		<em class="<?php if (!in_array($currentChannel, ['daily', 'git'])) { | 
                                                        |
| 52 | +    p('hidden'); | 
                                                        |
| 53 | +}  | 
                                                        |
| 54 | +?>">  | 
                                                        |
| 52 | 55 | <br />  | 
                                                        
| 53 | 56 |  			<?php p($l->t('Only notification for app updates are available.')); ?> | 
                                                        
| 54 | -			<?php if ($currentChannel === 'daily') p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); ?> | 
                                                        |
| 55 | -			<?php if ($currentChannel === 'git') p($l->t('The selected update channel does not support updates of the server.')); ?> | 
                                                        |
| 57 | +			<?php if ($currentChannel === 'daily') { | 
                                                        |
| 58 | +    p($l->t('The selected update channel makes dedicated notifications for the server obsolete.')); | 
                                                        |
| 59 | +}  | 
                                                        |
| 60 | +?>  | 
                                                        |
| 61 | +			<?php if ($currentChannel === 'git') { | 
                                                        |
| 62 | +    p($l->t('The selected update channel does not support updates of the server.')); | 
                                                        |
| 63 | +}  | 
                                                        |
| 64 | +?>  | 
                                                        |
| 56 | 65 | </em>  | 
                                                        
| 57 | 66 | </p>  | 
                                                        
| 58 | 67 | </form>  | 
                                                        
@@ -9,10 +9,13 @@ discard block  | 
                                                    ||
| 9 | 9 |  	<h3><?php p($l->t("Default encryption module")); ?></h3> | 
                                                        
| 10 | 10 | <?php if(!$_["initStatus"]): ?>  | 
                                                        
| 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 | -				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> /> | 
                                                        |
| 16 | +				   value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); | 
                                                        |
| 17 | +}  | 
                                                        |
| 18 | +?> />  | 
                                                        |
| 16 | 19 |  			<label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br> | 
                                                        
| 17 | 20 | <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>  | 
                                                        
| 18 | 21 | </p>  | 
                                                        
@@ -42,7 +45,10 @@ discard block  | 
                                                    ||
| 42 | 45 | </p>  | 
                                                        
| 43 | 46 | <br/><br/>  | 
                                                        
| 44 | 47 | |
| 45 | -			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>> | 
                                                        |
| 48 | +			<p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') { | 
                                                        |
| 49 | +    print_unescaped('class="hidden"'); | 
                                                        |
| 50 | +}  | 
                                                        |
| 51 | +?>>  | 
                                                        |
| 46 | 52 |  				<?php p($l->t("Change recovery key password:")); ?> | 
                                                        
| 47 | 53 | <span class="msg"></span>  | 
                                                        
| 48 | 54 | <br/>  | 
                                                        
@@ -348,8 +348,9 @@  | 
                                                    ||
| 348 | 348 | $systemMountPoints = $this->getSystemMountPoints();  | 
                                                        
| 349 | 349 |  			foreach ($systemMountPoints as $mountPoint) { | 
                                                        
| 350 | 350 | $normalizedMountPoint = \OC\Files\Filesystem::normalizePath($mountPoint['mountpoint']) . '/';  | 
                                                        
| 351 | - if (strpos($normalized, $normalizedMountPoint) === 0)  | 
                                                        |
| 352 | - return $targetDir;  | 
                                                        |
| 351 | +				if (strpos($normalized, $normalizedMountPoint) === 0) { | 
                                                        |
| 352 | + return $targetDir;  | 
                                                        |
| 353 | + }  | 
                                                        |
| 353 | 354 | }  | 
                                                        
| 354 | 355 |  		} else if ($trash === false && $this->view->file_exists('/' . $user. '/files/' . $filePath)) { | 
                                                        
| 355 | 356 | return $targetDir;  |