nextcloud / server

settings/Controller/CommonSettingsTrait.php

Spacing +5 added lines, -5 removed lines

@@ -28,7 +28,7 @@ 
 use OCP\Settings\IIconSection;
 use OCP\Settings\ISettings;
 
-trait CommonSettingsTrait  {
+trait CommonSettingsTrait {
 	/** @var ISettingsManager */
 	private $settingsManager;
 
@@ -42,7 +42,7 @@ 
 			'admin' => []
 		];
 
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
+		if (\OC_User::isAdminUser(\OC_User::getUser())) {
 			$templateParameters['admin'] = $this->formatAdminSections($currentType, $currentSection);
 		}
 
@@ -54,11 +54,11 @@ 
 	protected function formatSections($sections, $currentSection, $type, $currentType) {
 		$templateParameters = [];
 		/** @var \OCP\Settings\ISection[] $prioritizedSections */
-		foreach($sections as $prioritizedSections) {
+		foreach ($sections as $prioritizedSections) {
 			foreach ($prioritizedSections as $section) {
-				if($type === 'admin') {
+				if ($type === 'admin') {
 					$settings = $this->settingsManager->getAdminSettings($section->getID());
-				} else if($type === 'personal') {
+				} else if ($type === 'personal') {
 					$settings = $this->settingsManager->getPersonalSettings($section->getID());
 				}
 				if (empty($settings)) {

lib/private/Settings/Personal/PersonalInfo.php

Spacing +10 added lines, -10 removed lines

@@ -93,7 +93,7 @@ 
 	public function getForm() {
 		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
 		$lookupServerUploadEnabled = false;
-		if($federatedFileSharingEnabled) {
+		if ($federatedFileSharingEnabled) {
 			$federatedFileSharing = new Application();
 			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
 			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
@@ -192,7 +192,7 @@ 
 	 */
 	private function getLanguages(IUser $user) {
 		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if($forceLanguage !== false) {
+		if ($forceLanguage !== false) {
 			return [];
 		}
 
@@ -204,16 +204,16 @@ 
 		$commonLanguages = [];
 		$languages = [];
 
-		foreach($languageCodes as $lang) {
+		foreach ($languageCodes as $lang) {
 			$l = \OC::$server->getL10N('settings', $lang);
 			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 			$potentialName = (string) $l->t('__language_name__');
-			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+			if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
 				$ln = array('code' => $lang, 'name' => $potentialName);
 			} elseif ($lang === 'en') {
 				$ln = ['code' => $lang, 'name' => 'English (US)'];
-			}else{//fallback to language code
-				$ln=array('code'=>$lang, 'name'=>$lang);
+			} else {//fallback to language code
+				$ln = array('code'=>$lang, 'name'=>$lang);
 			}
 
 			// put appropriate languages into appropriate arrays, to print them sorted
@@ -221,9 +221,9 @@ 
 			if ($lang === $userLang) {
 				$userLang = $ln;
 			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
-				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
+				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)] = $ln;
 			} else {
-				$languages[]=$ln;
+				$languages[] = $ln;
 			}
 		}
 
@@ -238,7 +238,7 @@ 
 		ksort($commonLanguages);
 
 		// sort now by displayed language not the iso-code
-		usort( $languages, function ($a, $b) {
+		usort($languages, function($a, $b) {
 			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 				// If a doesn't have a name, but b does, list b before a
 				return 1;
@@ -276,7 +276,7 @@ 
 				default:
 					$message = $this->l->t('Verify');
 			}
-			$messageParameters[$property . 'Message'] = $message;
+			$messageParameters[$property.'Message'] = $message;
 		}
 		return $messageParameters;
 	}

settings/templates/settings/personal/personal.info.php

Spacing +42 added lines, -42 removed lines

@@ -38,15 +38,15 @@ 
 ?>
 
 <div id="quota" class="section">
-	<div style="width:<?php p($_['usage_relative']);?>%"
-		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
+	<div style="width:<?php p($_['usage_relative']); ?>%"
+		<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
 			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-					[$_['usage'], $_['total_space']]));?>
+					[$_['usage'], $_['total_space']])); ?>
 			<?php else: ?>
 				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
-					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+					[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
 			<?php endif ?>
 		</p>
 	</div>
@@ -80,7 +80,7 @@ 
 				</div>
 			</div>
 			<span class="icon-checkmark hidden"/>
-			<?php if($_['lookupServerUploadEnabled']) { ?>
+			<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 			<?php } ?>
 		</form>
@@ -94,14 +94,14 @@ 
 					<span class="icon-password"/>
 				</h2>
 				<input type="text" id="displayname" name="displayname"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   value="<?php p($_['displayName']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
 				<?php } ?>
 				<span class="icon-checkmark hidden"/>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -112,10 +112,10 @@ 
 					<label for="email"><?php p($l->t('Email')); ?></label>
 					<span class="icon-password"/>
 				</h2>
-				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
+				<div class="verify <?php if ($_['email'] === '' || $_['emailScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
 				<?php
-					switch($_['emailVerification']) {
+					switch ($_['emailVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
 							break;
@@ -128,23 +128,23 @@ 
 					?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					<?php if (!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
 					   placeholder="<?php p($l->t('Your email address')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
-				<?php if(!$_['displayNameChangeSupported']) { ?>
-					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+				<?php if (!$_['displayNameChangeSupported']) { ?>
+					<span><?php if (isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
 				<?php } ?>
-				<?php if($_['displayNameChangeSupported']) { ?>
+				<?php if ($_['displayNameChangeSupported']) { ?>
 					<br />
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
 				<span class="icon-checkmark hidden"/>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
 		</div>
-		<?php if($_['lookupServerUploadEnabled']) { ?>
+		<?php if ($_['lookupServerUploadEnabled']) { ?>
 			<div class="personal-settings-setting-box">
 				<form id="phoneform" class="section">
 					<h2>
@@ -179,10 +179,10 @@ 
 						<label for="website"><?php p($l->t('Website')); ?></label>
 						<span class="icon-password"/>
 					</h2>
-					<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+					<div class="verify <?php if ($_['website'] === '' || $_['websiteScope'] !== 'public') p('hidden'); ?>">
 						<img id="verify-website" title="<?php p($_['websiteMessage']); ?>" data-status="<?php p($_['websiteVerification']) ?>" src="
 				<?php
-						switch($_['websiteVerification']) {
+						switch ($_['websiteVerification']) {
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 								p(image_path('core', 'actions/verifying.svg'));
 								break;
@@ -193,13 +193,13 @@ 
 								p(image_path('core', 'actions/verify.svg'));
 						}
 						?>"
-							<?php if($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+							<?php if ($_['websiteVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['websiteVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 						>
 						<div class="verification-dialog popovermenu bubble menu">
 							<div class="verification-dialog-content">
 								<p class="explainVerification"></p>
 								<p class="verificationCode"></p>
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 							</div>
 						</div>
 					</div>
@@ -216,10 +216,10 @@ 
 						<label for="twitter"><?php p($l->t('Twitter')); ?></label>
 						<span class="icon-password"/>
 					</h2>
-					<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+					<div class="verify <?php if ($_['twitter'] === '' || $_['twitterScope'] !== 'public') p('hidden'); ?>">
 						<img id="verify-twitter" title="<?php p($_['twitterMessage']); ?>" data-status="<?php p($_['twitterVerification']) ?>" src="
 				<?php
-						switch($_['twitterVerification']) {
+						switch ($_['twitterVerification']) {
 							case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 								p(image_path('core', 'actions/verifying.svg'));
 								break;
@@ -230,13 +230,13 @@ 
 								p(image_path('core', 'actions/verify.svg'));
 						}
 						?>"
-							<?php if($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
+							<?php if ($_['twitterVerification'] === \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS || $_['twitterVerification'] === \OC\Accounts\AccountManager::NOT_VERIFIED) print_unescaped(' class="verify-action"') ?>
 						>
 						<div class="verification-dialog popovermenu bubble menu">
 							<div class="verification-dialog-content">
 								<p class="explainVerification"></p>
 								<p class="verificationCode"></p>
-								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.'));?></p>
+								<p><?php p($l->t('It can take up to 24 hours before the account is displayed as verified.')); ?></p>
 							</div>
 						</div>
 					</div>
@@ -261,19 +261,19 @@ 
 </div>
 
 <?php
-if($_['passwordChangeSupported']) {
+if ($_['passwordChangeSupported']) {
 	script('jquery-showpassword');
 	?>
 	<form id="passwordform" class="section">
-		<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
+		<h2 class="inlineblock"><?php p($l->t('Password')); ?></h2>
 		<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>
 		<br>
 		<label for="pass1" class="hidden-visually"><?php p($l->t('Current password')); ?>: </label>
 		<input type="password" id="pass1" name="oldpassword"
-			   placeholder="<?php p($l->t('Current password'));?>"
+			   placeholder="<?php p($l->t('Current password')); ?>"
 			   autocomplete="off" autocapitalize="none" autocorrect="off" />
 		<div class="personal-show-container">
-			<label for="pass2" class="hidden-visually"><?php p($l->t('New password'));?>: </label>
+			<label for="pass2" class="hidden-visually"><?php p($l->t('New password')); ?>: </label>
 			<input type="password" id="pass2" name="newpassword"
 				   placeholder="<?php p($l->t('New password')); ?>"
 				   data-typetoggle="#personal-show"
@@ -290,27 +290,27 @@ 
 <?php if (isset($_['activelanguage'])) { ?>
 <form id="language" class="section">
 	<h2>
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
+		<label for="languageinput"><?php p($l->t('Language')); ?></label>
 	</h2>
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>">
-			<?php p($_['activelanguage']['name']);?>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language')); ?>">
+		<option value="<?php p($_['activelanguage']['code']); ?>">
+			<?php p($_['activelanguage']['name']); ?>
 		</option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
+		<?php foreach ($_['languages'] as $language):?>
+			<option value="<?php p($language['code']); ?>">
+				<?php p($language['name']); ?>
 			</option>
-		<?php endforeach;?>
+		<?php endforeach; ?>
 	</select>
 	<a href="https://www.transifex.com/nextcloud/nextcloud/"
 	   target="_blank" rel="noreferrer">
-		<em><?php p($l->t('Help translate'));?></em>
+		<em><?php p($l->t('Help translate')); ?></em>
 	</a>
 </form>
 <?php } ?>

lib/public/Settings/IManager.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @since 9.1.0
 	 */
-	const KEY_ADMIN_SECTION  = 'admin-section';
+	const KEY_ADMIN_SECTION = 'admin-section';
 
 	/**
 	 * @since 13.0.0
@@ -45,7 +45,7 @@ 
 	/**
 	 * @since 13.0.0
 	 */
-	const KEY_PERSONAL_SECTION  = 'personal-section';
+	const KEY_PERSONAL_SECTION = 'personal-section';
 
 	/**
 	 * sets up settings according to data specified by an apps info.xml, within

lib/private/Settings/Admin/Server.php

Spacing +2 added lines, -2 removed lines

@@ -107,7 +107,7 @@ 
 
 		$suggestedOverwriteCliUrl = '';
 		if ($this->config->getSystemValue('overwrite.cli.url', '') === '') {
-			$suggestedOverwriteCliUrl = $this->request->getServerProtocol() . '://' . $this->request->getInsecureServerHost() . \OC::$WEBROOT;
+			$suggestedOverwriteCliUrl = $this->request->getServerProtocol().'://'.$this->request->getInsecureServerHost().\OC::$WEBROOT;
 			if (!$this->config->getSystemValue('config_is_read_only', false)) {
 				// Set the overwrite URL when it was not set yet.
 				$this->config->setSystemValue('overwrite.cli.url', $suggestedOverwriteCliUrl);
@@ -134,7 +134,7 @@ 
 			'lastcron'            => $this->config->getAppValue('core', 'lastcron', false),
 			'cronErrors'		  => $this->config->getAppValue('core', 'cronErrors'),
 			'cli_based_cron_possible' => function_exists('posix_getpwuid'),
-			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir . 'config.php'))['name'] : '',
+			'cli_based_cron_user' => function_exists('posix_getpwuid') ? posix_getpwuid(fileowner(\OC::$configDir.'config.php'))['name'] : '',
 		];
 
 		return new TemplateResponse('settings', 'settings/admin/server', $parameters, '');