Inspection of "Contacts menu" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#3233)

by Jan-Christoph

created 2017-03-15 20:31 UTC

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -106,9 +106,9 @@  discard block
 block discarded – undo
 
 	public function getShortFooter() {
 		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
+		$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+			' rel="noreferrer">'.$this->getEntity().'</a>'.
+			($slogan !== '' ? ' – '.$slogan : '');
 
 		return $footer;
 	}
@@ -129,8 +129,8 @@  discard block
 block discarded – undo
 	 */
 	public function getLogo() {
 		$logo = $this->config->getAppValue('theming', 'logoMime');
-		if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->urlGenerator->imagePath('core','logo.svg');
+		if (!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
+			return $this->urlGenerator->imagePath('core', 'logo.svg');
 		} else {
 			return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
 		}
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
 	 */
 	public function getBackground() {
 		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
-		if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
+		if (!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
+			return $this->urlGenerator->imagePath('core', 'background.jpg');
 		} else {
 			return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
 		}
@@ -158,11 +158,11 @@  discard block
 block discarded – undo
 	 */
 	public function shouldReplaceIcons() {
 		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
+		if ($value = $cache->get('shouldReplaceIcons')) {
+			return (bool) $value;
 		}
 		$value = false;
-		if(extension_loaded('imagick')) {
+		if (extension_loaded('imagick')) {
 			$checkImagick = new \Imagick();
 			if (count($checkImagick->queryFormats('SVG')) >= 1) {
 				$value = true;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
 	 */
 	private function increaseCacheBuster() {
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
 	}
 
 	/**

Please login to merge, or discard this patch.

apps/theming/lib/Util.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 	 */
 	public function invertTextColor($color) {
 		$l = $this->calculateLuminance($color);
-		if($l>0.5) {
+		if ($l > 0.5) {
 			return true;
 		} else {
 			return false;
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
 	 */
 	public function elementColor($color) {
 		$l = $this->calculateLuminance($color);
-		if($l>0.8) {
+		if ($l > 0.8) {
 			return '#555555';
 		} else {
 			return $color;
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
 	public function calculateLuminance($color) {
 		$hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
 		if (strlen($hex) === 3) {
-			$hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
+			$hex = $hex{0}.$hex{0}.$hex{1}.$hex{1}.$hex{2}.$hex{2};
 		}
 		if (strlen($hex) !== 6) {
 			return 0;
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 		$r = hexdec(substr($hex, 0, 2));
 		$g = hexdec(substr($hex, 2, 2));
 		$b = hexdec(substr($hex, 4, 2));
-		return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
+		return (0.299 * $r + 0.587 * $g + 0.114 * $b) / 255;
 	}
 
 	/**
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
 	 * @return string base64 encoded radio button svg
 	 */
 	public function generateRadioButton($color) {
-		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
+		$radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">'.
 			'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
 		return base64_encode($radioButtonIcon);
 	}
@@ -117,20 +117,20 @@  discard block
 block discarded – undo
 		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
 		try {
 			$appPath = $this->appManager->getAppPath($app);
-			$icon = $appPath . '/img/' . $app . '.svg';
+			$icon = $appPath.'/img/'.$app.'.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
-			$icon = $appPath . '/img/app.svg';
+			$icon = $appPath.'/img/app.svg';
 			if (file_exists($icon)) {
 				return $icon;
 			}
 		} catch (AppPathNotFoundException $e) {}
 
-		if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
+		if ($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
+			return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/themedinstancelogo';
 		}
-		return \OC::$SERVERROOT . '/core/img/logo.svg';
+		return \OC::$SERVERROOT.'/core/img/logo.svg';
 	}
 
 	/**
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 		$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
 		$image = str_replace(array('\0', '\\', '..'), '', $image);
 		if ($app === "core") {
-			$icon = \OC::$SERVERROOT . '/core/img/' . $image;
+			$icon = \OC::$SERVERROOT.'/core/img/'.$image;
 			if (file_exists($icon)) {
 				return $icon;
 			}
@@ -154,23 +154,23 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		$icon = $appPath . '/img/' . $image;
+		$icon = $appPath.'/img/'.$image;
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.svg';
+		$icon = $appPath.'/img/'.$image.'.svg';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.png';
+		$icon = $appPath.'/img/'.$image.'.png';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.gif';
+		$icon = $appPath.'/img/'.$image.'.gif';
 		if (file_exists($icon)) {
 			return $icon;
 		}
-		$icon = $appPath . '/img/' . $image . '.jpg';
+		$icon = $appPath.'/img/'.$image.'.jpg';
 		if (file_exists($icon)) {
 			return $icon;
 		}

Please login to merge, or discard this patch.

apps/theming/lib/Controller/IconController.php 1 patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -91,13 +91,13 @@  discard block
 block discarded – undo
 	 */
 	public function getThemedIcon($app, $image) {
 		try {
-			$iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
+			$iconFile = $this->imageManager->getCachedImage("icon-".$app.'-'.str_replace("/", "_", $image));
 		} catch (NotFoundException $exception) {
 			$icon = $this->iconBuilder->colorSvg($app, $image);
 			if ($icon === false || $icon === "") {
 				return new NotFoundResponse();
 			}
-			$iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
+			$iconFile = $this->imageManager->setCachedImage("icon-".$app.'-'.str_replace("/", "_", $image), $icon);
 		}
 		if ($iconFile !== false) {
 			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
 	public function getFavicon($app = "core") {
 		if ($this->themingDefaults->shouldReplaceIcons()) {
 			try {
-				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
+				$iconFile = $this->imageManager->getCachedImage('favIcon-'.$app);
 			} catch (NotFoundException $exception) {
 				$icon = $this->iconBuilder->getFavicon($app);
-				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
+				$iconFile = $this->imageManager->setCachedImage('favIcon-'.$app, $icon);
 			}
 			if ($iconFile !== false) {
 				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
@@ -156,10 +156,10 @@  discard block
 block discarded – undo
 	public function getTouchIcon($app = "core") {
 		if ($this->themingDefaults->shouldReplaceIcons()) {
 			try {
-				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
+				$iconFile = $this->imageManager->getCachedImage('touchIcon-'.$app);
 			} catch (NotFoundException $exception) {
 				$icon = $this->iconBuilder->getTouchIcon($app);
-				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
+				$iconFile = $this->imageManager->setCachedImage('touchIcon-'.$app, $icon);
 			}
 			if ($iconFile !== false) {
 				$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);

Please login to merge, or discard this patch.

apps/theming/lib/IconBuilder.php 1 patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 	 */
 	public function getFavicon($app) {
 		$icon = $this->renderAppIcon($app, 32);
-		if($icon === false) {
+		if ($icon === false) {
 			return false;
 		}
 		$icon->setImageFormat("png24");
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
 	 */
 	public function getTouchIcon($app) {
 		$icon = $this->renderAppIcon($app, 512);
-		if($icon === false) {
+		if ($icon === false) {
 			return false;
 		}
 		$icon->setImageFormat("png24");
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 			return false;
 		}
 
-		if($appIconContent === false) {
+		if ($appIconContent === false) {
 			return false;
 		}
 
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
 		$mime = mime_content_type($appIcon);
 
 		// generate background image with rounded corners
-		$background = '<?xml version="1.0" encoding="UTF-8"?>' .
-			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
-			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
+		$background = '<?xml version="1.0" encoding="UTF-8"?>'.
+			'<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
+			'<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
 			'</svg>';
 		// resize svg magic as this seems broken in Imagemagick
-		if($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
-			if(substr($appIconContent, 0, 5) !== "<?xml") {
+		if ($mime === "image/svg+xml" || substr($appIconContent, 0, 4) === "<svg") {
+			if (substr($appIconContent, 0, 5) !== "<?xml") {
 				$svg = "<?xml version=\"1.0\"?>".$appIconContent;
 			} else {
 				$svg = $appIconContent;
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 			$res = $tmp->getImageResolution();
 			$tmp->destroy();
 
-			if($x>$y) {
+			if ($x > $y) {
 				$max = $x;
 			} else {
 				$max = $y;
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
 
 			// convert svg to resized image
 			$appIconFile = new Imagick();
-			$resX = (int)(512 * $res['x'] / $max * 2.53);
-			$resY = (int)(512 * $res['y'] / $max * 2.53);
+			$resX = (int) (512 * $res['x'] / $max * 2.53);
+			$resY = (int) (512 * $res['y'] / $max * 2.53);
 			$appIconFile->setResolution($resX, $resY);
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 			$appIconFile->readImageBlob($svg);
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
 		}
 
 		// offset for icon positioning
-		$border_w = (int)($appIconFile->getImageWidth() * 0.05);
-		$border_h = (int)($appIconFile->getImageHeight() * 0.05);
-		$innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
-		$innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
+		$border_w = (int) ($appIconFile->getImageWidth() * 0.05);
+		$border_h = (int) ($appIconFile->getImageHeight() * 0.05);
+		$innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
+		$innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
 		$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
 		// center icon
 		$offset_w = 512 / 2 - $innerWidth / 2;

Please login to merge, or discard this patch.

apps/twofactor_backupcodes/lib/Service/BackupCodeStorage.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 
 		$uid = $user->getUID();
 		foreach (range(1, min([$number, 20])) as $i) {
-			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			$code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 
 			$dbCode = new BackupCode();
 			$dbCode->setUserId($uid);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 		$codes = $this->mapper->getBackupCodes($user);
 		$total = count($codes);
 		$used = 0;
-		array_walk($codes, function (BackupCode $code) use (&$used) {
+		array_walk($codes, function(BackupCode $code) use (&$used) {
 			if (1 === (int) $code->getUsed()) {
 				$used++;
 			}

Please login to merge, or discard this patch.

apps/twofactor_backupcodes/lib/Db/BackupCodeMapper.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -47,7 +47,7 @@
 block discarded – undo
 		$rows = $result->fetchAll();
 		$result->closeCursor();
 
-		return array_map(function ($row) {
+		return array_map(function($row) {
 			return BackupCode::fromRow($row);
 		}, $rows);
 	}

Please login to merge, or discard this patch.

apps/encryption/templates/altmail.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -3,7 +3,7 @@  discard block
 block discarded – undo
 /** @var array $_ */
 
 print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
 	print_unescaped("\n\n");
 }
@@ -12,5 +12,5 @@  discard block
 block discarded – undo
 ?>
 
 	--
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
 <?php print_unescaped("\n".$theme->getBaseUrl());

Please login to merge, or discard this patch.

apps/encryption/templates/settings-personal.php 1 patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -7,57 +7,57 @@  discard block
 block discarded – undo
 <form id="ocDefaultEncryptionModule" class="section">
 	<h2><?php p($l->t('Basic encryption module')); ?></h2>
 
-	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
 
 	<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 
-	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
+	<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
 		<p>
 			<a name="changePKPasswd" />
 			<label for="changePrivateKeyPasswd">
-				<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
+				<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
 			</label>
 			<br />
-			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
-			<?php if (  $_["recoveryEnabledForUser"] ):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
+			<?php if ($_["recoveryEnabledForUser"]):
+					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
 			endif; ?>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="oldPrivateKeyPassword" />
-			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
+			<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="newPrivateKeyPassword" />
-			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
 			<br />
 			<button
 				type="button"
 				name="submitChangePrivateKeyPassword"
-				disabled><?php p($l->t( "Update Private Key Password" )); ?>
+				disabled><?php p($l->t("Update Private Key Password")); ?>
 			</button>
 			<span class="msg"></span>
 		</p>
 
-	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
+	<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
 		<br />
 		<p id="userEnableRecovery">
-			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
+			<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
 			<span class="msg"></span>
 			<br />
-			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
+			<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
 			<br />
 			<input
 			type='radio'
 			id='userEnableRecovery'
 			name='userEnableRecovery'
 			value='1'
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
-			<label for="userEnableRecovery"><?php p( $l->t( "Enabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
+			<label for="userEnableRecovery"><?php p($l->t("Enabled")); ?></label>
 			<br />
 
 			<input
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
 			id='userDisableRecovery'
 			name='userEnableRecovery'
 			value='0'
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
-			<label for="userDisableRecovery"><?php p( $l->t( "Disabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
+			<label for="userDisableRecovery"><?php p($l->t("Disabled")); ?></label>
 		</p>
 	<?php endif; ?>
 </form>

Please login to merge, or discard this patch.

apps/encryption/templates/settings-admin.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -7,19 +7,19 @@  discard block
 block discarded – undo
 ?>
 <form id="ocDefaultEncryptionModule" class="sub-section">
 	<h3><?php p($l->t("Default encryption module")); ?></h3>
-	<?php if(!$_["initStatus"]): ?>
+	<?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: ?>
 		<p id="encryptHomeStorageSetting">
 			<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
 				   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>
+			<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>
 		<br />
-		<?php if($_['masterKeyEnabled'] === false): ?>
+		<?php if ($_['masterKeyEnabled'] === false): ?>
 			<p id="encryptionSetRecoveryKey">
-				<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
+				<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
 				<span class="msg"></span>
 				<br/>
 				<em>
@@ -38,11 +38,11 @@  discard block
 block discarded – undo
 					   name="enableRecoveryKey"
 					   id="enableRecoveryKey"
 					   status="<?php p($_["recoveryEnabled"]) ?>"
-					   value="<?php $_["recoveryEnabled"] === '0' ?  p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
+					   value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
 			</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/>

Please login to merge, or discard this patch.

		@@ -106,9 +106,9 @@ discard block
		block discarded – undo
106	106
107	107	public function getShortFooter() {
108	108	$slogan = $this->getSlogan();
109		- $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
110		- ' rel="noreferrer">' .$this->getEntity() . '</a>'.
111		- ($slogan !== '' ? ' – ' . $slogan : '');
	109	+ $footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
	110	+ ' rel="noreferrer">'.$this->getEntity().'</a>'.
	111	+ ($slogan !== '' ? ' – '.$slogan : '');
112	112
113	113	return $footer;
114	114	}
		@@ -129,8 +129,8 @@ discard block
		block discarded – undo
129	129	*/
130	130	public function getLogo() {
131	131	$logo = $this->config->getAppValue('theming', 'logoMime');
132		- if(!$logo \|\| !$this->rootFolder->nodeExists('/themedinstancelogo')) {
133		- return $this->urlGenerator->imagePath('core','logo.svg');
	132	+ if (!$logo \|\| !$this->rootFolder->nodeExists('/themedinstancelogo')) {
	133	+ return $this->urlGenerator->imagePath('core', 'logo.svg');
134	134	} else {
135	135	return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
136	136	}
		@@ -143,8 +143,8 @@ discard block
		block discarded – undo
143	143	*/
144	144	public function getBackground() {
145	145	$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
146		- if(!$backgroundLogo \|\| !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
147		- return $this->urlGenerator->imagePath('core','background.jpg');
	146	+ if (!$backgroundLogo \|\| !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
	147	+ return $this->urlGenerator->imagePath('core', 'background.jpg');
148	148	} else {
149	149	return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
150	150	}
		@@ -158,11 +158,11 @@ discard block
		block discarded – undo
158	158	*/
159	159	public function shouldReplaceIcons() {
160	160	$cache = $this->cacheFactory->create('theming');
161		- if($value = $cache->get('shouldReplaceIcons')) {
162		- return (bool)$value;
	161	+ if ($value = $cache->get('shouldReplaceIcons')) {
	162	+ return (bool) $value;
163	163	}
164	164	$value = false;
165		- if(extension_loaded('imagick')) {
	165	+ if (extension_loaded('imagick')) {
166	166	$checkImagick = new \Imagick();
167	167	if (count($checkImagick->queryFormats('SVG')) >= 1) {
168	168	$value = true;
		@@ -178,7 +178,7 @@ discard block
		block discarded – undo
178	178	*/
179	179	private function increaseCacheBuster() {
180	180	$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
181		- $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
	181	+ $this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
182	182	}
183	183
184	184	/**

		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78
79	79	$uid = $user->getUID();
80	80	foreach (range(1, min([$number, 20])) as $i) {
81		- $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
	81	+ $code = $this->random->generate(self::$CODE_LENGTH, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
82	82
83	83	$dbCode = new BackupCode();
84	84	$dbCode->setUserId($uid);
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132	$codes = $this->mapper->getBackupCodes($user);
133	133	$total = count($codes);
134	134	$used = 0;
135		- array_walk($codes, function (BackupCode $code) use (&$used) {
	135	+ array_walk($codes, function(BackupCode $code) use (&$used) {
136	136	if (1 === (int) $code->getUsed()) {
137	137	$used++;
138	138	}

		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	*/
59	59	public function invertTextColor($color) {
60	60	$l = $this->calculateLuminance($color);
61		- if($l>0.5) {
	61	+ if ($l > 0.5) {
62	62	return true;
63	63	} else {
64	64	return false;
		@@ -73,7 +73,7 @@ discard block
		block discarded – undo
73	73	*/
74	74	public function elementColor($color) {
75	75	$l = $this->calculateLuminance($color);
76		- if($l>0.8) {
	76	+ if ($l > 0.8) {
77	77	return '#555555';
78	78	} else {
79	79	return $color;
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87	public function calculateLuminance($color) {
88	88	$hex = preg_replace("/[^0-9A-Fa-f]/", '', $color);
89	89	if (strlen($hex) === 3) {
90		- $hex = $hex{0} . $hex{0} . $hex{1} . $hex{1} . $hex{2} . $hex{2};
	90	+ $hex = $hex{0}.$hex{0}.$hex{1}.$hex{1}.$hex{2}.$hex{2};
91	91	}
92	92	if (strlen($hex) !== 6) {
93	93	return 0;
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	$r = hexdec(substr($hex, 0, 2));
96	96	$g = hexdec(substr($hex, 2, 2));
97	97	$b = hexdec(substr($hex, 4, 2));
98		- return (0.299 * $r + 0.587 * $g + 0.114 * $b)/255;
	98	+ return (0.299 * $r + 0.587 * $g + 0.114 * $b) / 255;
99	99	}
100	100
101	101	/**
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	* @return string base64 encoded radio button svg
104	104	*/
105	105	public function generateRadioButton($color) {
106		- $radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">' .
	106	+ $radioButtonIcon = '<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">'.
107	107	'<path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="'.$color.'"/></svg>';
108	108	return base64_encode($radioButtonIcon);
109	109	}
		@@ -117,20 +117,20 @@ discard block
		block discarded – undo
117	117	$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
118	118	try {
119	119	$appPath = $this->appManager->getAppPath($app);
120		- $icon = $appPath . '/img/' . $app . '.svg';
	120	+ $icon = $appPath.'/img/'.$app.'.svg';
121	121	if (file_exists($icon)) {
122	122	return $icon;
123	123	}
124		- $icon = $appPath . '/img/app.svg';
	124	+ $icon = $appPath.'/img/app.svg';
125	125	if (file_exists($icon)) {
126	126	return $icon;
127	127	}
128	128	} catch (AppPathNotFoundException $e) {}
129	129
130		- if($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
131		- return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data') . '/themedinstancelogo';
	130	+ if ($this->config->getAppValue('theming', 'logoMime', '') !== '' && $this->rootFolder->nodeExists('/themedinstancelogo')) {
	131	+ return $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data').'/themedinstancelogo';
132	132	}
133		- return \OC::$SERVERROOT . '/core/img/logo.svg';
	133	+ return \OC::$SERVERROOT.'/core/img/logo.svg';
134	134	}
135	135
136	136	/**
		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	$app = str_replace(array('\0', '/', '\\', '..'), '', $app);
143	143	$image = str_replace(array('\0', '\\', '..'), '', $image);
144	144	if ($app === "core") {
145		- $icon = \OC::$SERVERROOT . '/core/img/' . $image;
	145	+ $icon = \OC::$SERVERROOT.'/core/img/'.$image;
146	146	if (file_exists($icon)) {
147	147	return $icon;
148	148	}
		@@ -154,23 +154,23 @@ discard block
		block discarded – undo
154	154	return false;
155	155	}
156	156
157		- $icon = $appPath . '/img/' . $image;
	157	+ $icon = $appPath.'/img/'.$image;
158	158	if (file_exists($icon)) {
159	159	return $icon;
160	160	}
161		- $icon = $appPath . '/img/' . $image . '.svg';
	161	+ $icon = $appPath.'/img/'.$image.'.svg';
162	162	if (file_exists($icon)) {
163	163	return $icon;
164	164	}
165		- $icon = $appPath . '/img/' . $image . '.png';
	165	+ $icon = $appPath.'/img/'.$image.'.png';
166	166	if (file_exists($icon)) {
167	167	return $icon;
168	168	}
169		- $icon = $appPath . '/img/' . $image . '.gif';
	169	+ $icon = $appPath.'/img/'.$image.'.gif';
170	170	if (file_exists($icon)) {
171	171	return $icon;
172	172	}
173		- $icon = $appPath . '/img/' . $image . '.jpg';
	173	+ $icon = $appPath.'/img/'.$image.'.jpg';
174	174	if (file_exists($icon)) {
175	175	return $icon;
176	176	}

		@@ -91,13 +91,13 @@ discard block
		block discarded – undo
91	91	*/
92	92	public function getThemedIcon($app, $image) {
93	93	try {
94		- $iconFile = $this->imageManager->getCachedImage("icon-" . $app . '-' . str_replace("/","_",$image));
	94	+ $iconFile = $this->imageManager->getCachedImage("icon-".$app.'-'.str_replace("/", "_", $image));
95	95	} catch (NotFoundException $exception) {
96	96	$icon = $this->iconBuilder->colorSvg($app, $image);
97	97	if ($icon === false \|\| $icon === "") {
98	98	return new NotFoundResponse();
99	99	}
100		- $iconFile = $this->imageManager->setCachedImage("icon-" . $app . '-' . str_replace("/","_",$image), $icon);
	100	+ $iconFile = $this->imageManager->setCachedImage("icon-".$app.'-'.str_replace("/", "_", $image), $icon);
101	101	}
102	102	if ($iconFile !== false) {
103	103	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/svg+xml']);
		@@ -125,10 +125,10 @@ discard block
		block discarded – undo
125	125	public function getFavicon($app = "core") {
126	126	if ($this->themingDefaults->shouldReplaceIcons()) {
127	127	try {
128		- $iconFile = $this->imageManager->getCachedImage('favIcon-' . $app);
	128	+ $iconFile = $this->imageManager->getCachedImage('favIcon-'.$app);
129	129	} catch (NotFoundException $exception) {
130	130	$icon = $this->iconBuilder->getFavicon($app);
131		- $iconFile = $this->imageManager->setCachedImage('favIcon-' . $app, $icon);
	131	+ $iconFile = $this->imageManager->setCachedImage('favIcon-'.$app, $icon);
132	132	}
133	133	if ($iconFile !== false) {
134	134	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
		@@ -156,10 +156,10 @@ discard block
		block discarded – undo
156	156	public function getTouchIcon($app = "core") {
157	157	if ($this->themingDefaults->shouldReplaceIcons()) {
158	158	try {
159		- $iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app);
	159	+ $iconFile = $this->imageManager->getCachedImage('touchIcon-'.$app);
160	160	} catch (NotFoundException $exception) {
161	161	$icon = $this->iconBuilder->getTouchIcon($app);
162		- $iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app, $icon);
	162	+ $iconFile = $this->imageManager->setCachedImage('touchIcon-'.$app, $icon);
163	163	}
164	164	if ($iconFile !== false) {
165	165	$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);

		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	*/
54	54	public function getFavicon($app) {
55	55	$icon = $this->renderAppIcon($app, 32);
56		- if($icon === false) {
	56	+ if ($icon === false) {
57	57	return false;
58	58	}
59	59	$icon->setImageFormat("png24");
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	*/
69	69	public function getTouchIcon($app) {
70	70	$icon = $this->renderAppIcon($app, 512);
71		- if($icon === false) {
	71	+ if ($icon === false) {
72	72	return false;
73	73	}
74	74	$icon->setImageFormat("png24");
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	return false;
94	94	}
95	95
96		- if($appIconContent === false) {
	96	+ if ($appIconContent === false) {
97	97	return false;
98	98	}
99	99
		@@ -101,13 +101,13 @@ discard block
		block discarded – undo
101	101	$mime = mime_content_type($appIcon);
102	102
103	103	// generate background image with rounded corners
104		- $background = '<?xml version="1.0" encoding="UTF-8"?>' .
105		- '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">' .
106		- '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:' . $color . ';" />' .
	104	+ $background = '<?xml version="1.0" encoding="UTF-8"?>'.
	105	+ '<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:cc="http://creativecommons.org/ns#" width="512" height="512" xmlns:xlink="http://www.w3.org/1999/xlink">'.
	106	+ '<rect x="0" y="0" rx="100" ry="100" width="512" height="512" style="fill:'.$color.';" />'.
107	107	'</svg>';
108	108	// resize svg magic as this seems broken in Imagemagick
109		- if($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
110		- if(substr($appIconContent, 0, 5) !== "<?xml") {
	109	+ if ($mime === "image/svg+xml" \|\| substr($appIconContent, 0, 4) === "<svg") {
	110	+ if (substr($appIconContent, 0, 5) !== "<?xml") {
111	111	$svg = "<?xml version=\"1.0\"?>".$appIconContent;
112	112	} else {
113	113	$svg = $appIconContent;
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	$res = $tmp->getImageResolution();
120	120	$tmp->destroy();
121	121
122		- if($x>$y) {
	122	+ if ($x > $y) {
123	123	$max = $x;
124	124	} else {
125	125	$max = $y;
		@@ -127,8 +127,8 @@ discard block
		block discarded – undo
127	127
128	128	// convert svg to resized image
129	129	$appIconFile = new Imagick();
130		- $resX = (int)(512 * $res['x'] / $max * 2.53);
131		- $resY = (int)(512 * $res['y'] / $max * 2.53);
	130	+ $resX = (int) (512 * $res['x'] / $max * 2.53);
	131	+ $resY = (int) (512 * $res['y'] / $max * 2.53);
132	132	$appIconFile->setResolution($resX, $resY);
133	133	$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
134	134	$appIconFile->readImageBlob($svg);
		@@ -141,10 +141,10 @@ discard block
		block discarded – undo
141	141	}
142	142
143	143	// offset for icon positioning
144		- $border_w = (int)($appIconFile->getImageWidth() * 0.05);
145		- $border_h = (int)($appIconFile->getImageHeight() * 0.05);
146		- $innerWidth = (int)($appIconFile->getImageWidth() - $border_w * 2);
147		- $innerHeight = (int)($appIconFile->getImageHeight() - $border_h * 2);
	144	+ $border_w = (int) ($appIconFile->getImageWidth() * 0.05);
	145	+ $border_h = (int) ($appIconFile->getImageHeight() * 0.05);
	146	+ $innerWidth = (int) ($appIconFile->getImageWidth() - $border_w * 2);
	147	+ $innerHeight = (int) ($appIconFile->getImageHeight() - $border_h * 2);
148	148	$appIconFile->adaptiveResizeImage($innerWidth, $innerHeight);
149	149	// center icon
150	150	$offset_w = 512 / 2 - $innerWidth / 2;

		@@ -47,7 +47,7 @@
		block discarded – undo
47	47	$rows = $result->fetchAll();
48	48	$result->closeCursor();
49	49
50		- return array_map(function ($row) {
	50	+ return array_map(function($row) {
51	51	return BackupCode::fromRow($row);
52	52	}, $rows);
53	53	}

		@@ -3,7 +3,7 @@ discard block
		block discarded – undo
3	3	/** @var array $_ */
4	4
5	5	print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
6		-if ( isset($_['expiration']) ) {
	6	+if (isset($_['expiration'])) {
7	7	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
8	8	print_unescaped("\n\n");
9	9	}
		@@ -12,5 +12,5 @@ discard block
		block discarded – undo
12	12	?>
13	13
14	14	--
15		-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
	15	+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
16	16	<?php print_unescaped("\n".$theme->getBaseUrl());

		@@ -7,57 +7,57 @@ discard block
		block discarded – undo
7	7	<form id="ocDefaultEncryptionModule" class="section">
8	8	<h2><?php p($l->t('Basic encryption module')); ?></h2>
9	9
10		- <?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
	10	+ <?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
11	11
12	12	<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
13	13
14		- <?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
	14	+ <?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
15	15	<p>
16	16	<a name="changePKPasswd" />
17	17	<label for="changePrivateKeyPasswd">
18		- <em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
	18	+ <em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
19	19	</label>
20	20	<br />
21		- <?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
22		- <?php if ( $_["recoveryEnabledForUser"] ):
23		- p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
	21	+ <?php p($l->t("Set your old private key password to your current log-in password:")); ?>
	22	+ <?php if ($_["recoveryEnabledForUser"]):
	23	+ p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
24	24	endif; ?>
25	25	<br />
26	26	<input
27	27	type="password"
28	28	name="changePrivateKeyPassword"
29	29	id="oldPrivateKeyPassword" />
30		- <label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
	30	+ <label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
31	31	<br />
32	32	<input
33	33	type="password"
34	34	name="changePrivateKeyPassword"
35	35	id="newPrivateKeyPassword" />
36		- <label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
	36	+ <label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
37	37	<br />
38	38	<button
39	39	type="button"
40	40	name="submitChangePrivateKeyPassword"
41		- disabled><?php p($l->t( "Update Private Key Password" )); ?>
	41	+ disabled><?php p($l->t("Update Private Key Password")); ?>
42	42	</button>
43	43	<span class="msg"></span>
44	44	</p>
45	45
46		- <?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
	46	+ <?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
47	47	<br />
48	48	<p id="userEnableRecovery">
49		- <label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
	49	+ <label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
50	50	<span class="msg"></span>
51	51	<br />
52		- <em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
	52	+ <em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
53	53	<br />
54	54	<input
55	55	type='radio'
56	56	id='userEnableRecovery'
57	57	name='userEnableRecovery'
58	58	value='1'
59		- <?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
60		- <label for="userEnableRecovery"><?php p( $l->t( "Enabled" ) ); ?></label>
	59	+ <?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
	60	+ <label for="userEnableRecovery"><?php p($l->t("Enabled")); ?></label>
61	61	<br />
62	62
63	63	<input
		@@ -65,8 +65,8 @@ discard block
		block discarded – undo
65	65	id='userDisableRecovery'
66	66	name='userEnableRecovery'
67	67	value='0'
68		- <?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
69		- <label for="userDisableRecovery"><?php p( $l->t( "Disabled" ) ); ?></label>
	68	+ <?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
	69	+ <label for="userDisableRecovery"><?php p($l->t("Disabled")); ?></label>
70	70	</p>
71	71	<?php endif; ?>
72	72	</form>

		@@ -7,19 +7,19 @@ discard block
		block discarded – undo
7	7	?>
8	8	<form id="ocDefaultEncryptionModule" class="sub-section">
9	9	<h3><?php p($l->t("Default encryption module")); ?></h3>
10		- <?php if(!$_["initStatus"]): ?>
	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	12	<?php else: ?>
13	13	<p id="encryptHomeStorageSetting">
14	14	<input type="checkbox" class="checkbox" name="encrypt_home_storage" id="encryptHomeStorage"
15	15	value="1" <?php if ($_['encryptHomeStorage']) print_unescaped('checked="checked"'); ?> />
16		- <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage'));?></label></br>
17		- <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>
	16	+ <label for="encryptHomeStorage"><?php p($l->t('Encrypt the home storage')); ?></label></br>
	17	+ <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	18	</p>
19	19	<br />
20		- <?php if($_['masterKeyEnabled'] === false): ?>
	20	+ <?php if ($_['masterKeyEnabled'] === false): ?>
21	21	<p id="encryptionSetRecoveryKey">
22		- <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
	22	+ <?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>
23	23	<span class="msg"></span>
24	24	<br/>
25	25	<em>
		@@ -38,11 +38,11 @@ discard block
		block discarded – undo
38	38	name="enableRecoveryKey"
39	39	id="enableRecoveryKey"
40	40	status="<?php p($_["recoveryEnabled"]) ?>"
41		- value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
	41	+ value="<?php $_["recoveryEnabled"] === '0' ? p($l->t("Enable recovery key")) : p($l->t("Disable recovery key")); ?>"/>
42	42	</p>
43	43	<br/><br/>
44	44
45		- <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"');?>>
	45	+ <p name="changeRecoveryPasswordBlock" id="encryptionChangeRecoveryKey" <?php if ($_['recoveryEnabled'] === '0') print_unescaped('class="hidden"'); ?>>
46	46	<?php p($l->t("Change recovery key password:")); ?>
47	47	<span class="msg"></span>
48	48	<br/>

nextcloud / server

Pull Request — master (#3233)

Category

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch