nextcloud / server

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

Indentation +44 added lines, -44 removed lines

@@ -26,11 +26,11 @@ 
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'templates',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'templates',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 ?>
 
@@ -85,10 +85,10 @@ 
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
-								[$_['usage']]));?>
+                                [$_['usage']]));?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+                                [$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
 						<?php endif ?>
 					</p>
 				</div>
@@ -96,10 +96,10 @@ 
 			</div>
 		</div>
 		<?php
-			if ($_['show_where_is_your_data_section']) {
-				include __DIR__ . '/partials/where-is-your-data.php';
-			}
-		?>
+            if ($_['show_where_is_your_data_section']) {
+                include __DIR__ . '/partials/where-is-your-data.php';
+            }
+        ?>
 	</div>
 
 	<div class="personal-settings-container">
@@ -140,17 +140,17 @@ 
 				<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']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>">
+                    switch($_['emailVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            p(image_path('core', 'actions/verify.svg'));
+                    }
+                    ?>">
 				</div>
 				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
 					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
@@ -228,17 +228,17 @@ 
 				<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']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch($_['websiteVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            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"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">
@@ -277,17 +277,17 @@ 
 				<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']) {
-						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
-							p(image_path('core', 'actions/verifying.svg'));
-							break;
-						case \OC\Accounts\AccountManager::VERIFIED:
-							p(image_path('core', 'actions/verified.svg'));
-							break;
-						default:
-							p(image_path('core', 'actions/verify.svg'));
-					}
-					?>"
+                    switch($_['twitterVerification']) {
+                        case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
+                            p(image_path('core', 'actions/verifying.svg'));
+                            break;
+                        case \OC\Accounts\AccountManager::VERIFIED:
+                            p(image_path('core', 'actions/verified.svg'));
+                            break;
+                        default:
+                            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"') ?>
 					>
 					<div class="verification-dialog popovermenu bubble menu">

Spacing +61 added lines, -61 removed lines

@@ -67,7 +67,7 @@ 
 					</div>
 				</div>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="avatarscope" value="<?php p($_['avatarScope']) ?>">
 				<?php } ?>
 			</form>
@@ -85,19 +85,19 @@ 
 					<p class="quotatext">
 						<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
 							<?php print_unescaped($l->t('You are using <strong>%s</strong>',
-								[$_['usage']]));?>
+								[$_['usage']])); ?>
 						<?php else: ?>
 							<?php print_unescaped($l->t('You are using <strong>%1$s</strong> of <strong>%2$s</strong> (<strong>%3$s %%</strong>)',
-								[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+								[$_['usage'], $_['total_space'], $_['usage_relative']])); ?>
 						<?php endif ?>
 					</p>
 				</div>
-				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
+				<progress value="<?php p($_['usage_relative']); ?>" max="100"<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
 			</div>
 		</div>
 		<?php
 			if ($_['show_where_is_your_data_section']) {
-				include __DIR__ . '/partials/where-is-your-data.php';
+				include __DIR__.'/partials/where-is-your-data.php';
 			}
 		?>
 	</div>
@@ -114,15 +114,15 @@ 
 					</div>
 				</h3>
 				<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"></span>
 				<span class="icon-error hidden" ></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
@@ -137,10 +137,10 @@ 
 						</span>
 					</div>
 				</h3>
-				<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;
@@ -153,18 +153,18 @@ 
 					?>">
 				</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" />
 			   	<span class="icon-checkmark hidden"></span>
 				<span class="icon-error hidden" ></span>
-				<?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']) { ?>
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
 				<?php } ?>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 					<input type="hidden" id="emailscope" value="<?php p($_['emailScope']) ?>">
 				<?php } ?>
 			</form>
@@ -180,12 +180,12 @@ 
 						</span>
 					</div>
 				</h3>
-				<input type="tel" id="phone" name="phone" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
+				<input type="tel" id="phone" name="phone" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 					   value="<?php p($_['phone']) ?>"
 					   placeholder="<?php p($l->t('Your phone number')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="phonescope" value="<?php p($_['phoneScope']) ?>">
 				<?php } ?>
 			</form>
@@ -202,12 +202,12 @@ 
 						</span>
 					</div>
 				</h3>
-				<input type="text" id="address" name="address" <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+				<input type="text" id="address" name="address" <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 					   placeholder="<?php p($l->t('Your postal address')); ?>"
 					   value="<?php p($_['address']) ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off" />
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="addressscope" value="<?php p($_['addressScope']) ?>">
 				<?php } ?>
 			</form>
@@ -224,11 +224,11 @@ 
 						</span>
 					</div>
 				</h3>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['website'] === ''  || $_['websiteScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<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;
@@ -239,13 +239,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>
@@ -253,10 +253,10 @@ 
 				<input type="url" name="website" id="website" value="<?php p($_['website']); ?>"
 				       placeholder="<?php p($l->t('Link https://…')); ?>"
 				       autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				/>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="websitescope" value="<?php p($_['websiteScope']) ?>">
 				<?php } ?>
 			</form>
@@ -273,11 +273,11 @@ 
 						</span>
 					</div>
 				</h3>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<div class="verify <?php if ($_['twitter'] === ''  || $_['twitterScope'] !== 'public') p('hidden'); ?>">
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
+				<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;
@@ -288,13 +288,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>
@@ -302,10 +302,10 @@ 
 				<input type="text" name="twitter" id="twitter" value="<?php p($_['twitter']); ?>"
 					   placeholder="<?php p($l->t('Twitter handle @…')); ?>"
 					   autocomplete="on" autocapitalize="none" autocorrect="off"
-					   <?php if(!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"');  ?>
+					   <?php if (!$_['lookupServerUploadEnabled']) print_unescaped('disabled="1"'); ?>
 				/>
 				<span class="icon-checkmark hidden"></span>
-				<?php if($_['lookupServerUploadEnabled']) { ?>
+				<?php if ($_['lookupServerUploadEnabled']) { ?>
 				<input type="hidden" id="twitterscope" value="<?php p($_['twitterScope']) ?>">
 				<?php } ?>
 			</form>
@@ -318,27 +318,27 @@ 
 			<?php if (isset($_['activelanguage'])) { ?>
 				<form id="language" class="section">
 					<h3>
-						<label for="languageinput"><?php p($l->t('Language'));?></label>
+						<label for="languageinput"><?php p($l->t('Language')); ?></label>
 					</h3>
-					<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 noopener">
-						<em><?php p($l->t('Help translate'));?></em>
+						<em><?php p($l->t('Help translate')); ?></em>
 					</a>
 				</form>
 			<?php } ?>
@@ -347,27 +347,27 @@ 
 			<?php if (isset($_['activelocale'])) { ?>
 				<form id="locale" class="section">
 					<h3>
-						<label for="localeinput"><?php p($l->t('Locale'));?></label>
+						<label for="localeinput"><?php p($l->t('Locale')); ?></label>
 					</h3>
-					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale'));?>">
-						<option value="<?php p($_['activelocale']['code']);?>">
-							<?php p($_['activelocale']['name']);?>
+					<select id="localeinput" name="lang" data-placeholder="<?php p($l->t('Locale')); ?>">
+						<option value="<?php p($_['activelocale']['code']); ?>">
+							<?php p($_['activelocale']['name']); ?>
 						</option>
 						<optgroup label="––––––––––"></optgroup>
-						<?php foreach($_['localesForLanguage'] as $locale):?>
-							<option value="<?php p($locale['code']);?>">
-								<?php p($locale['name']);?>
+						<?php foreach ($_['localesForLanguage'] as $locale):?>
+							<option value="<?php p($locale['code']); ?>">
+								<?php p($locale['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 						<optgroup label="––––––––––"></optgroup>
-						<option value="<?php p($_['activelocale']['code']);?>">
-							<?php p($_['activelocale']['name']);?>
+						<option value="<?php p($_['activelocale']['code']); ?>">
+							<?php p($_['activelocale']['name']); ?>
 						</option>
-						<?php foreach($_['locales'] as $locale):?>
-							<option value="<?php p($locale['code']);?>">
-								<?php p($locale['name']);?>
+						<?php foreach ($_['locales'] as $locale):?>
+							<option value="<?php p($locale['code']); ?>">
+								<?php p($locale['name']); ?>
 							</option>
-						<?php endforeach;?>
+						<?php endforeach; ?>
 					</select>
 					<div id="localeexample" class="personal-info icon-timezone">
 						<p>

settings/templates/settings/personal/partials/where-is-your-data.php

Indentation +32 added lines, -32 removed lines

@@ -21,24 +21,24 @@ 
 	<div class="personal-info icon-home">
 		<p>
 			<?php
-				if (empty($_['providerLink']) === false) {
-					echo $l->t('Your provider is %s%s%s.', [
-						'<a href="' . $_['providerLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
-						$_['provider'],
-						'</a>'
-					]);
-				} else {
-					echo $l->t('Your provider is %s.', [$_['provider']]);
-				}
-			?>
+                if (empty($_['providerLink']) === false) {
+                    echo $l->t('Your provider is %s%s%s.', [
+                        '<a href="' . $_['providerLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
+                        $_['provider'],
+                        '</a>'
+                    ]);
+                } else {
+                    echo $l->t('Your provider is %s.', [$_['provider']]);
+                }
+            ?>
 			<?php
-				if (empty($_['providerPrivacyLink']) === false) {
-					echo $l->t('Read the %sprivacy policy%s now.', [
-						'<a href="' . $_['providerPrivacyLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
-						'</a>'
-					]);
-				}
-			?>
+                if (empty($_['providerPrivacyLink']) === false) {
+                    echo $l->t('Read the %sprivacy policy%s now.', [
+                        '<a href="' . $_['providerPrivacyLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
+                        '</a>'
+                    ]);
+                }
+            ?>
 		</p>
 	</div>
 	<?php endif; ?>
@@ -47,12 +47,12 @@ 
 		<div class="personal-info icon-password">
 			<p>
 				<?php echo $l->t(
-					'Your files are encrypted with %sserver side encryption%s.',
-					[
-						'<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" title="" rel="noreferrer noopener">',
-						'</a>'
-					]
-				); ?>
+                    'Your files are encrypted with %sserver side encryption%s.',
+                    [
+                        '<a href="https://nextcloud.com/blog/encryption-in-nextcloud/" target="_blank" title="" rel="noreferrer noopener">',
+                        '</a>'
+                    ]
+                ); ?>
 			</p>
 		</div>
 	<?php endif; ?>
@@ -61,15 +61,15 @@ 
 	<div class="personal-info icon-user-admin">
 		<p>
 			<?php echo $l->t(
-				'%s%s%s is your admin. If you have any issues, %scontact them%s.',
-				[
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
-					$_['adminName'],
-					'</a>',
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
-					'</a>'
-				]
-			); ?>
+                '%s%s%s is your admin. If you have any issues, %scontact them%s.',
+                [
+                    '<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
+                    $_['adminName'],
+                    '</a>',
+                    '<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
+                    '</a>'
+                ]
+            ); ?>
 		</p>
 	</div>
 	<?php endif; ?>

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 			<?php
 				if (empty($_['providerLink']) === false) {
 					echo $l->t('Your provider is %s%s%s.', [
-						'<a href="' . $_['providerLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
+						'<a href="'.$_['providerLink'].'" target="_blank" title="" rel="noreferrer noopener">',
 						$_['provider'],
 						'</a>'
 					]);
@@ -34,7 +34,7 @@ 
 			<?php
 				if (empty($_['providerPrivacyLink']) === false) {
 					echo $l->t('Read the %sprivacy policy%s now.', [
-						'<a href="' . $_['providerPrivacyLink'] . '" target="_blank" title="" rel="noreferrer noopener">',
+						'<a href="'.$_['providerPrivacyLink'].'" target="_blank" title="" rel="noreferrer noopener">',
 						'</a>'
 					]);
 				}
@@ -63,10 +63,10 @@ 
 			<?php echo $l->t(
 				'%s%s%s is your admin. If you have any issues, %scontact them%s.',
 				[
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
+					'<a href="mailto:'.$_['adminMail'].'" target="_blank" title="" rel="noreferrer noopener">',
 					$_['adminName'],
 					'</a>',
-					'<a href="mailto:' . $_['adminMail'] . '" target="_blank" title="" rel="noreferrer noopener">',
+					'<a href="mailto:'.$_['adminMail'].'" target="_blank" title="" rel="noreferrer noopener">',
 					'</a>'
 				]
 			); ?>

settings/templates/settings/admin/server-info.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 			<label class="label" for="adminContact"><?php p($l->t('Admin contact')); ?></label>
 			<select class="form-input" name="adminContact" id="adminContact">
 				<option value=""><?php p($l->t('choose admin contact')); ?></option>
-				<?php foreach($_['adminUsers'] as $adminUser): ?>
+				<?php foreach ($_['adminUsers'] as $adminUser): ?>
 					<option
 						value="<?php p($adminUser['id']); ?>"
 						<?php if ($adminUser['id'] === $_['adminContact']): ?>selected="selected"<?php endif; ?>>

settings/routes.php

Indentation +46 added lines, -46 removed lines

@@ -38,58 +38,58 @@
 
 $application = new Application();
 $application->registerRoutes($this, [
-	'resources' => [
-		'AuthSettings' => ['url' => '/settings/personal/authtokens'],
-	],
-	'routes' => [
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
-		['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
+    'resources' => [
+        'AuthSettings' => ['url' => '/settings/personal/authtokens'],
+    ],
+    'routes' => [
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'],
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'],
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'],
+        ['name' => 'Encryption#startMigration', 'url' => '/settings/admin/startmigration', 'verb' => 'POST'],
 
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'],
-		['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'],
-		['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'],
-		['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET'],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']],
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET'],
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST'],
+        ['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST'],
+        ['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST'],
+        ['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET'],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => '']],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => '']],
 
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
-		['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET'],
-		['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+']],
-		['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
-		['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
-		['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
-		['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
-		['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
-		['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET'],
-		['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT'],
-		['name' => 'ServerInfoSettings#storeServerInfo', 'url' => '/settings/serverinfo', 'verb' => 'POST'],
-	]
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST'],
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT'],
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT'],
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET'],
+        ['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET'],
+        ['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+']],
+        ['name' => 'LogSettings#setLogLevel', 'url' => '/settings/admin/log/level', 'verb' => 'POST'],
+        ['name' => 'LogSettings#getEntries', 'url' => '/settings/admin/log/entries', 'verb' => 'GET'],
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET'],
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET'],
+        ['name' => 'Certificate#addPersonalRootCertificate', 'url' => '/settings/personal/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'],
+        ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'],
+        ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']],
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']],
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'],
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'],
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST'],
+        ['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET'],
+        ['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT'],
+        ['name' => 'ServerInfoSettings#storeServerInfo', 'url' => '/settings/serverinfo', 'verb' => 'POST'],
+    ]
 ]);
 
 /** @var $this \OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
-	->actionInclude('settings/help.php');
+    ->actionInclude('settings/help.php');
 

settings/Controller/ServerInfoSettingsController.php

Indentation +29 added lines, -29 removed lines

@@ -32,36 +32,36 @@
  */
 class ServerInfoSettingsController extends Controller {
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * ServerInfoSettingsController constructor.
-	 *
-	 * @param IConfig $config
-	 */
-	public function __construct($appName, IRequest $request, IConfig $config) {
-		parent::__construct($appName, $request);
-		$this->config = $config;
-	}
+    /**
+     * ServerInfoSettingsController constructor.
+     *
+     * @param IConfig $config
+     */
+    public function __construct($appName, IRequest $request, IConfig $config) {
+        parent::__construct($appName, $request);
+        $this->config = $config;
+    }
 
-	public function storeServerInfo(
-		string $location,
-		string $provider,
-		string $providerWebsite,
-		string $providerPrivacyLink,
-		string $adminContact
-	): void {
-		$configs = [
-			ServerInfo::SETTING_LOCATION => $location,
-			ServerInfo::SETTING_PROVIDER => $provider,
-			ServerInfo::SETTING_PROVIDER_WEBSITE => $providerWebsite,
-			ServerInfo::SETTING_PROVIDER_PRIVACY_LINK => $providerPrivacyLink,
-			ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT => $adminContact
-		];
-		$this->config->setSystemValues($configs);
-	}
+    public function storeServerInfo(
+        string $location,
+        string $provider,
+        string $providerWebsite,
+        string $providerPrivacyLink,
+        string $adminContact
+    ): void {
+        $configs = [
+            ServerInfo::SETTING_LOCATION => $location,
+            ServerInfo::SETTING_PROVIDER => $provider,
+            ServerInfo::SETTING_PROVIDER_WEBSITE => $providerWebsite,
+            ServerInfo::SETTING_PROVIDER_PRIVACY_LINK => $providerPrivacyLink,
+            ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT => $adminContact
+        ];
+        $this->config->setSystemValues($configs);
+    }
 
 }

lib/private/Settings/Personal/PersonalInfo.php

Indentation +269 added lines, -269 removed lines

@@ -43,274 +43,274 @@
 
 class PersonalInfo implements ISettings {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var AccountManager */
-	private $accountManager;
-	/** @var IGroupManager */
-	private $groupManager;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var IFactory */
-	private $l10nFactory;
-	/** @var IL10N */
-	private $l;
-	/** @var EncryptionManager */
-	private $encryptionManager;
-
-	/**
-	 * @param IConfig $config
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param AccountManager $accountManager
-	 * @param IAppManager $appManager
-	 * @param IFactory $l10nFactory
-	 * @param IL10N $l
-	 * @param EncryptionManager $encryptionManager
-	 */
-	public function __construct(
-		IConfig $config,
-		IUserManager $userManager,
-		IGroupManager $groupManager,
-		AccountManager $accountManager,
-		IAppManager $appManager,
-		IFactory $l10nFactory,
-		IL10N $l,
-		EncryptionManager $encryptionManager
-	) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->accountManager = $accountManager;
-		$this->groupManager = $groupManager;
-		$this->appManager = $appManager;
-		$this->l10nFactory = $l10nFactory;
-		$this->l = $l;
-		$this->encryptionManager = $encryptionManager;
-	}
-
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		$federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
-		$lookupServerUploadEnabled = false;
-		if($federatedFileSharingEnabled) {
-			$federatedFileSharing = new Application();
-			$shareProvider = $federatedFileSharing->getFederatedShareProvider();
-			$lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
-		}
-
-		$uid = \OC_User::getUser();
-		$user = $this->userManager->get($uid);
-		$userData = $this->accountManager->getUser($user);
-
-		$storageInfo = \OC_Helper::getStorageInfo('/');
-		if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
-			$totalSpace = $this->l->t('Unlimited');
-		} else {
-			$totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
-		}
-
-		$languageParameters = $this->getLanguages($user);
-		$localeParameters = $this->getLocales($user);
-		$messageParameters = $this->getMessageParameters($userData);
-
-		$parameters = [
-			'total_space' => $totalSpace,
-			'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
-			'usage_relative' => round($storageInfo['relative']),
-			'quota' => $storageInfo['quota'],
-			'avatarChangeSupported' => $user->canChangeAvatar(),
-			'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
-			'avatarScope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
-			'displayNameChangeSupported' => $user->canChangeDisplayName(),
-			'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
-			'displayNameScope' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
-			'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
-			'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
-			'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
-			'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
-			'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
-			'address' => $userData[AccountManager::PROPERTY_ADDRESS]['value'],
-			'addressScope' => $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
-			'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
-			'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
-			'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
-			'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
-			'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
-			'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
-			'groups' => $this->getGroups($user),
-		] + $this->getWhereIsYourDataParams() + $messageParameters + $languageParameters + $localeParameters;
-
-		return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
-	}
-
-	/**
-	 * Returns the "where is your data" template params.
-	 *
-	 * @return array
-	 */
-	private function getWhereIsYourDataParams(): array {
-
-		$adminContactConfigId = $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT);
-		$adminContact = $this->userManager->get($adminContactConfigId);
-
-		$params = [
-			'dataLocation' => $this->config->getSystemValue(ServerInfo::SETTING_LOCATION),
-			'provider' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER),
-			'providerLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_WEBSITE),
-			'providerPrivacyLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_PRIVACY_LINK),
-			'encryptionEnabled' => $this->encryptionManager->isEnabled(),
-			'adminName' => $adminContact !== null ? $adminContact->getDisplayName() : '',
-			'adminMail' => $adminContact !== null ? $adminContact->getEMailAddress() : ''
-		];
-
-		$params['show_where_is_your_data_section'] = empty($params['dataLocation']) === false
-			|| empty($params['provider']) === false
-			|| $params['encryptionEnabled'] === true
-			|| empty($params['adminName']) === false;
-
-		return $params;
-
-	}
-
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'personal-info';
-	}
-
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 * @since 9.1
-	 */
-	public function getPriority() {
-		return 10;
-	}
-
-	/**
-	 * returns a sorted list of the user's group GIDs
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getGroups(IUser $user) {
-		$groups = array_map(
-			function(IGroup $group) {
-				return $group->getDisplayName();
-			},
-			$this->groupManager->getUserGroups($user)
-		);
-		sort($groups);
-
-		return $groups;
-	}
-
-	/**
-	 * returns the user language, common language and other languages in an
-	 * associative array
-	 *
-	 * @param IUser $user
-	 * @return array
-	 */
-	private function getLanguages(IUser $user) {
-		$forceLanguage = $this->config->getSystemValue('force_language', false);
-		if($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-		$languages = $this->l10nFactory->getLanguages();
-
-		// associate the user language with the proper array
-		$userLangIndex = array_search($userConfLang, array_column($languages['commonlanguages'], 'code'));
-		$userLang = $languages['commonlanguages'][$userLangIndex];
-		// search in the other languages
-		if ($userLangIndex === false) {
-			$userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));
-			$userLang = $languages['languages'][$userLangIndex];
-		}
-		// if user language is not available but set somehow: show the actual code as name
-		if (!is_array($userLang)) {
-			$userLang = [
-				'code' => $userConfLang,
-				'name' => $userConfLang,
-			];
-		}
-
-		return array_merge(
-			array('activelanguage' => $userLang),
-			$languages
-		);
-	}
-
-	private function getLocales(IUser $user) {
-		$forceLanguage = $this->config->getSystemValue('force_locale', false);
-		if($forceLanguage !== false) {
-			return [];
-		}
-
-		$uid = $user->getUID();
-
-		$userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
-
-		$userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
-
-		$localeCodes = $this->l10nFactory->findAvailableLocales();
-
-		$userLocale = array_filter($localeCodes, function($value) use ($userLocaleString) {
-			return $userLocaleString === $value['code'];
-		});
-
-		if (!empty($userLocale))
-		{
-			$userLocale = reset($userLocale);
-		}
-
-		$localesForLanguage = array_filter($localeCodes, function($localeCode) use ($userLang) {
-			return 0 === strpos($localeCode['code'], $userLang);
-		});
-
-		return [
-			'activelocaleLang' => $userLocaleString,
-			'activelocale' => $userLocale,
-			'locales' => $localeCodes,
-			'localesForLanguage' => $localesForLanguage,
-		];
-	}
-
-	/**
-	 * @param array $userData
-	 * @return array
-	 */
-	private function getMessageParameters(array $userData) {
-		$needVerifyMessage = [AccountManager::PROPERTY_EMAIL, AccountManager::PROPERTY_WEBSITE, AccountManager::PROPERTY_TWITTER];
-		$messageParameters = [];
-		foreach ($needVerifyMessage as $property) {
-			switch ($userData[$property]['verified']) {
-				case AccountManager::VERIFIED:
-					$message = $this->l->t('Verifying');
-					break;
-				case AccountManager::VERIFICATION_IN_PROGRESS:
-					$message = $this->l->t('Verifying …');
-					break;
-				default:
-					$message = $this->l->t('Verify');
-			}
-			$messageParameters[$property . 'Message'] = $message;
-		}
-		return $messageParameters;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var AccountManager */
+    private $accountManager;
+    /** @var IGroupManager */
+    private $groupManager;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var IFactory */
+    private $l10nFactory;
+    /** @var IL10N */
+    private $l;
+    /** @var EncryptionManager */
+    private $encryptionManager;
+
+    /**
+     * @param IConfig $config
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param AccountManager $accountManager
+     * @param IAppManager $appManager
+     * @param IFactory $l10nFactory
+     * @param IL10N $l
+     * @param EncryptionManager $encryptionManager
+     */
+    public function __construct(
+        IConfig $config,
+        IUserManager $userManager,
+        IGroupManager $groupManager,
+        AccountManager $accountManager,
+        IAppManager $appManager,
+        IFactory $l10nFactory,
+        IL10N $l,
+        EncryptionManager $encryptionManager
+    ) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->accountManager = $accountManager;
+        $this->groupManager = $groupManager;
+        $this->appManager = $appManager;
+        $this->l10nFactory = $l10nFactory;
+        $this->l = $l;
+        $this->encryptionManager = $encryptionManager;
+    }
+
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        $federatedFileSharingEnabled = $this->appManager->isEnabledForUser('federatedfilesharing');
+        $lookupServerUploadEnabled = false;
+        if($federatedFileSharingEnabled) {
+            $federatedFileSharing = new Application();
+            $shareProvider = $federatedFileSharing->getFederatedShareProvider();
+            $lookupServerUploadEnabled = $shareProvider->isLookupServerUploadEnabled();
+        }
+
+        $uid = \OC_User::getUser();
+        $user = $this->userManager->get($uid);
+        $userData = $this->accountManager->getUser($user);
+
+        $storageInfo = \OC_Helper::getStorageInfo('/');
+        if ($storageInfo['quota'] === FileInfo::SPACE_UNLIMITED) {
+            $totalSpace = $this->l->t('Unlimited');
+        } else {
+            $totalSpace = \OC_Helper::humanFileSize($storageInfo['total']);
+        }
+
+        $languageParameters = $this->getLanguages($user);
+        $localeParameters = $this->getLocales($user);
+        $messageParameters = $this->getMessageParameters($userData);
+
+        $parameters = [
+            'total_space' => $totalSpace,
+            'usage' => \OC_Helper::humanFileSize($storageInfo['used']),
+            'usage_relative' => round($storageInfo['relative']),
+            'quota' => $storageInfo['quota'],
+            'avatarChangeSupported' => $user->canChangeAvatar(),
+            'lookupServerUploadEnabled' => $lookupServerUploadEnabled,
+            'avatarScope' => $userData[AccountManager::PROPERTY_AVATAR]['scope'],
+            'displayNameChangeSupported' => $user->canChangeDisplayName(),
+            'displayName' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['value'],
+            'displayNameScope' => $userData[AccountManager::PROPERTY_DISPLAYNAME]['scope'],
+            'email' => $userData[AccountManager::PROPERTY_EMAIL]['value'],
+            'emailScope' => $userData[AccountManager::PROPERTY_EMAIL]['scope'],
+            'emailVerification' => $userData[AccountManager::PROPERTY_EMAIL]['verified'],
+            'phone' => $userData[AccountManager::PROPERTY_PHONE]['value'],
+            'phoneScope' => $userData[AccountManager::PROPERTY_PHONE]['scope'],
+            'address' => $userData[AccountManager::PROPERTY_ADDRESS]['value'],
+            'addressScope' => $userData[AccountManager::PROPERTY_ADDRESS]['scope'],
+            'website' =>  $userData[AccountManager::PROPERTY_WEBSITE]['value'],
+            'websiteScope' =>  $userData[AccountManager::PROPERTY_WEBSITE]['scope'],
+            'websiteVerification' => $userData[AccountManager::PROPERTY_WEBSITE]['verified'],
+            'twitter' => $userData[AccountManager::PROPERTY_TWITTER]['value'],
+            'twitterScope' => $userData[AccountManager::PROPERTY_TWITTER]['scope'],
+            'twitterVerification' => $userData[AccountManager::PROPERTY_TWITTER]['verified'],
+            'groups' => $this->getGroups($user),
+        ] + $this->getWhereIsYourDataParams() + $messageParameters + $languageParameters + $localeParameters;
+
+        return new TemplateResponse('settings', 'settings/personal/personal.info', $parameters, '');
+    }
+
+    /**
+     * Returns the "where is your data" template params.
+     *
+     * @return array
+     */
+    private function getWhereIsYourDataParams(): array {
+
+        $adminContactConfigId = $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT);
+        $adminContact = $this->userManager->get($adminContactConfigId);
+
+        $params = [
+            'dataLocation' => $this->config->getSystemValue(ServerInfo::SETTING_LOCATION),
+            'provider' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER),
+            'providerLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_WEBSITE),
+            'providerPrivacyLink' => $this->config->getSystemValue(ServerInfo::SETTING_PROVIDER_PRIVACY_LINK),
+            'encryptionEnabled' => $this->encryptionManager->isEnabled(),
+            'adminName' => $adminContact !== null ? $adminContact->getDisplayName() : '',
+            'adminMail' => $adminContact !== null ? $adminContact->getEMailAddress() : ''
+        ];
+
+        $params['show_where_is_your_data_section'] = empty($params['dataLocation']) === false
+            || empty($params['provider']) === false
+            || $params['encryptionEnabled'] === true
+            || empty($params['adminName']) === false;
+
+        return $params;
+
+    }
+
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'personal-info';
+    }
+
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     * @since 9.1
+     */
+    public function getPriority() {
+        return 10;
+    }
+
+    /**
+     * returns a sorted list of the user's group GIDs
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getGroups(IUser $user) {
+        $groups = array_map(
+            function(IGroup $group) {
+                return $group->getDisplayName();
+            },
+            $this->groupManager->getUserGroups($user)
+        );
+        sort($groups);
+
+        return $groups;
+    }
+
+    /**
+     * returns the user language, common language and other languages in an
+     * associative array
+     *
+     * @param IUser $user
+     * @return array
+     */
+    private function getLanguages(IUser $user) {
+        $forceLanguage = $this->config->getSystemValue('force_language', false);
+        if($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userConfLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+        $languages = $this->l10nFactory->getLanguages();
+
+        // associate the user language with the proper array
+        $userLangIndex = array_search($userConfLang, array_column($languages['commonlanguages'], 'code'));
+        $userLang = $languages['commonlanguages'][$userLangIndex];
+        // search in the other languages
+        if ($userLangIndex === false) {
+            $userLangIndex = array_search($userConfLang, array_column($languages['languages'], 'code'));
+            $userLang = $languages['languages'][$userLangIndex];
+        }
+        // if user language is not available but set somehow: show the actual code as name
+        if (!is_array($userLang)) {
+            $userLang = [
+                'code' => $userConfLang,
+                'name' => $userConfLang,
+            ];
+        }
+
+        return array_merge(
+            array('activelanguage' => $userLang),
+            $languages
+        );
+    }
+
+    private function getLocales(IUser $user) {
+        $forceLanguage = $this->config->getSystemValue('force_locale', false);
+        if($forceLanguage !== false) {
+            return [];
+        }
+
+        $uid = $user->getUID();
+
+        $userLocaleString = $this->config->getUserValue($uid, 'core', 'locale', $this->l10nFactory->findLocale());
+
+        $userLang = $this->config->getUserValue($uid, 'core', 'lang', $this->l10nFactory->findLanguage());
+
+        $localeCodes = $this->l10nFactory->findAvailableLocales();
+
+        $userLocale = array_filter($localeCodes, function($value) use ($userLocaleString) {
+            return $userLocaleString === $value['code'];
+        });
+
+        if (!empty($userLocale))
+        {
+            $userLocale = reset($userLocale);
+        }
+
+        $localesForLanguage = array_filter($localeCodes, function($localeCode) use ($userLang) {
+            return 0 === strpos($localeCode['code'], $userLang);
+        });
+
+        return [
+            'activelocaleLang' => $userLocaleString,
+            'activelocale' => $userLocale,
+            'locales' => $localeCodes,
+            'localesForLanguage' => $localesForLanguage,
+        ];
+    }
+
+    /**
+     * @param array $userData
+     * @return array
+     */
+    private function getMessageParameters(array $userData) {
+        $needVerifyMessage = [AccountManager::PROPERTY_EMAIL, AccountManager::PROPERTY_WEBSITE, AccountManager::PROPERTY_TWITTER];
+        $messageParameters = [];
+        foreach ($needVerifyMessage as $property) {
+            switch ($userData[$property]['verified']) {
+                case AccountManager::VERIFIED:
+                    $message = $this->l->t('Verifying');
+                    break;
+                case AccountManager::VERIFICATION_IN_PROGRESS:
+                    $message = $this->l->t('Verifying …');
+                    break;
+                default:
+                    $message = $this->l->t('Verify');
+            }
+            $messageParameters[$property . 'Message'] = $message;
+        }
+        return $messageParameters;
+    }
 
 }

lib/private/Settings/Theming/ServerInfo.php

Indentation +74 added lines, -74 removed lines

@@ -33,89 +33,89 @@
  */
 class ServerInfo implements ISettings {
 
-	const SETTING_LOCATION = 'serverinfo.location';
-	const SETTING_PROVIDER = 'serverinfo.provider';
-	const SETTING_PROVIDER_WEBSITE = 'serverinfo.provider.website';
-	const SETTING_PROVIDER_PRIVACY_LINK = 'serverinfo.provider.privacylink';
-	const SETTING_PROVIDER_ADMIN_CONTACT = 'serverinfo.admincontact';
+    const SETTING_LOCATION = 'serverinfo.location';
+    const SETTING_PROVIDER = 'serverinfo.provider';
+    const SETTING_PROVIDER_WEBSITE = 'serverinfo.provider.website';
+    const SETTING_PROVIDER_PRIVACY_LINK = 'serverinfo.provider.privacylink';
+    const SETTING_PROVIDER_ADMIN_CONTACT = 'serverinfo.admincontact';
 
-	/**
-	 * @var IConfig
-	 */
-	private $config;
+    /**
+     * @var IConfig
+     */
+    private $config;
 
-	/**
-	 * @var IGroupManager
-	 */
-	private $groupManager;
+    /**
+     * @var IGroupManager
+     */
+    private $groupManager;
 
-	/**
-	 * ServerInfo constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IGroupManager $groupManager
-	 */
-	public function __construct(IConfig $config, IGroupManager $groupManager) {
-		$this->config = $config;
-		$this->groupManager = $groupManager;
-	}
+    /**
+     * ServerInfo constructor.
+     *
+     * @param IConfig $config
+     * @param IGroupManager $groupManager
+     */
+    public function __construct(IConfig $config, IGroupManager $groupManager) {
+        $this->config = $config;
+        $this->groupManager = $groupManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm(): TemplateResponse {
-		$parameters = [
-			'location' => $this->config->getSystemValue(self::SETTING_LOCATION),
-			'provider' => $this->config->getSystemValue(self::SETTING_PROVIDER),
-			'providerWebsite' => $this->config->getSystemValue(self::SETTING_PROVIDER_WEBSITE),
-			'providerPrivacyLink' => $this->config->getSystemValue(self::SETTING_PROVIDER_PRIVACY_LINK),
-			'adminUsers' => $this->getAdminListValues(),
-			'adminContact' => $this->config->getSystemValue(self::SETTING_PROVIDER_ADMIN_CONTACT),
-		];
-		return new TemplateResponse('settings', 'settings/admin/server-info', $parameters, '');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm(): TemplateResponse {
+        $parameters = [
+            'location' => $this->config->getSystemValue(self::SETTING_LOCATION),
+            'provider' => $this->config->getSystemValue(self::SETTING_PROVIDER),
+            'providerWebsite' => $this->config->getSystemValue(self::SETTING_PROVIDER_WEBSITE),
+            'providerPrivacyLink' => $this->config->getSystemValue(self::SETTING_PROVIDER_PRIVACY_LINK),
+            'adminUsers' => $this->getAdminListValues(),
+            'adminContact' => $this->config->getSystemValue(self::SETTING_PROVIDER_ADMIN_CONTACT),
+        ];
+        return new TemplateResponse('settings', 'settings/admin/server-info', $parameters, '');
+    }
 
-	/**
-	 * Returns the admin list values.
-	 *
-	 * @return array[] An array or arrays with the keys 'id' and 'displayName'
-	 */
-	private function getAdminListValues(): array {
-		$adminGroup = $this->groupManager->get('admin');
-		$users = $adminGroup->getUsers();
+    /**
+     * Returns the admin list values.
+     *
+     * @return array[] An array or arrays with the keys 'id' and 'displayName'
+     */
+    private function getAdminListValues(): array {
+        $adminGroup = $this->groupManager->get('admin');
+        $users = $adminGroup->getUsers();
 
-		$users = array_map(function(IUser $user) {
-			return [
-				'id' => $user->getUID(),
-				'displayName' => $user->getDisplayName()
-			];
-		}, $users);
+        $users = array_map(function(IUser $user) {
+            return [
+                'id' => $user->getUID(),
+                'displayName' => $user->getDisplayName()
+            ];
+        }, $users);
 
-		usort($your_data, function(array $a, array $b) {
-			return strcmp($a['displayName'], $b['displayName']);
-		});
+        usort($your_data, function(array $a, array $b) {
+            return strcmp($a['displayName'], $b['displayName']);
+        });
 
-		return $users;
-	}
+        return $users;
+    }
 
-	/**
-	 * Returns the server info section id.
-	 *
-	 * @return string
-	 */
-	public function getSection(): string {
-		return 'theming';
-	}
+    /**
+     * Returns the server info section id.
+     *
+     * @return string
+     */
+    public function getSection(): string {
+        return 'theming';
+    }
 
-	/**
-	 * Returns the server info settings priority.
-	 *
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 */
-	public function getPriority(): int {
-		return 10;
-	}
+    /**
+     * Returns the server info settings priority.
+     *
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     */
+    public function getPriority(): int {
+        return 10;
+    }
 
 }

lib/private/Settings/Manager.php

Indentation +320 added lines, -320 removed lines

@@ -40,324 +40,324 @@
 
 class Manager implements IManager {
 
-	/** @var ILogger */
-	private $log;
-
-	/** @var IL10N */
-	private $l;
-
-	/** @var IURLGenerator */
-	private $url;
-
-	/** @var IServerContainer */
-	private $container;
-
-	public function __construct(
-		ILogger $log,
-		IL10N $l10n,
-		IURLGenerator $url,
-		IServerContainer $container
-	) {
-		$this->log = $log;
-		$this->l = $l10n;
-		$this->url = $url;
-		$this->container = $container;
-	}
-
-	/** @var array */
-	protected $sectionClasses = [];
-
-	/** @var array */
-	protected $sections = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section Class must implement OCP\Settings\ISection
-	 *
-	 * @return void
-	 */
-	public function registerSection(string $type, string $section) {
-		if (!isset($this->sectionClasses[$type])) {
-			$this->sectionClasses[$type] = [];
-		}
-
-		$this->sectionClasses[$type][] = $section;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 *
-	 * @return ISection[]
-	 */
-	protected function getSections(string $type): array {
-		if (!isset($this->sections[$type])) {
-			$this->sections[$type] = [];
-		}
-
-		if (!isset($this->sectionClasses[$type])) {
-			return $this->sections[$type];
-		}
-
-		foreach ($this->sectionClasses[$type] as $index => $class) {
-			try {
-				/** @var ISection $section */
-				$section = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$section instanceof ISection) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			$sectionID = $section->getID();
-
-			if (isset($this->sections[$type][$sectionID])) {
-				$this->log->logException(new \InvalidArgumentException('Section with the same ID already registered'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			$this->sections[$type][$sectionID] = $section;
-
-			unset($this->sectionClasses[$type][$index]);
-		}
-
-		return $this->sections[$type];
-	}
-
-	/** @var array */
-	protected $settingClasses = [];
-
-	/** @var array */
-	protected $settings = [];
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $setting Class must implement OCP\Settings\ISetting
-	 *
-	 * @return void
-	 */
-	public function registerSetting(string $type, string $setting) {
-		$this->settingClasses[$setting] = $type;
-	}
-
-	/**
-	 * @param string $type 'admin' or 'personal'
-	 * @param string $section
-	 *
-	 * @return ISettings[]
-	 */
-	protected function getSettings(string $type, string $section): array {
-		if (!isset($this->settings[$type])) {
-			$this->settings[$type] = [];
-		}
-		if (!isset($this->settings[$type][$section])) {
-			$this->settings[$type][$section] = [];
-		}
-
-		foreach ($this->settingClasses as $class => $settingsType) {
-			try {
-				/** @var ISettings $setting */
-				$setting = \OC::$server->query($class);
-			} catch (QueryException $e) {
-				$this->log->logException($e, ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!$setting instanceof ISettings) {
-				$this->log->logException(new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'), ['level' => ILogger::INFO]);
-				continue;
-			}
-
-			if (!isset($this->settings[$settingsType][$setting->getSection()])) {
-				$this->settings[$settingsType][$setting->getSection()] = [];
-			}
-			$this->settings[$settingsType][$setting->getSection()][] = $setting;
-
-			unset($this->settingClasses[$class]);
-		}
-
-		return $this->settings[$type][$section];
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSections(): array {
-		// built-in sections
-		$sections = [
-			0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))],
-			1 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
-			10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
-			30 => [new Section('theming', $this->l->t('Theming'), 0, $this->url->imagePath('settings', 'theming-dark.svg'))],
-			50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
-		];
-
-		$appSections = $this->getSections('admin');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string $section
-	 *
-	 * @return ISection[]
-	 */
-	private function getBuiltInAdminSettings($section): array {
-		$forms = [];
-
-		if ($section === 'overview') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Admin\Overview::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'server') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Admin\Server::class);
-			$forms[$form->getPriority()] = [$form];
-			$form = $this->container->query(Admin\Mail::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'security') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Admin\Security::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'theming') {
-			$form = $this->container->query(Theming\ServerInfo::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'sharing') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Admin\Sharing::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @param string $section
-	 *
-	 * @return ISection[]
-	 */
-	private function getBuiltInPersonalSettings($section): array {
-		$forms = [];
-
-		if ($section === 'personal-info') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Personal\PersonalInfo::class);
-			$forms[$form->getPriority()] = [$form];
-			$form = new Personal\ServerDevNotice();
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'security') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Personal\Security::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = $this->container->query(Personal\Additional::class);
-			$forms[$form->getPriority()] = [$form];
-		}
-
-		return $forms;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getAdminSettings($section): array {
-		$settings = $this->getBuiltInAdminSettings($section);
-		$appSettings = $this->getSettings('admin', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSections(): array {
-		$sections = [
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
-			5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
-			15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))],
-		];
-
-		$legacyForms = \OC_App::getForms('personal');
-		if (!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
-			$sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
-		}
-
-		$appSections = $this->getSections('personal');
-
-		foreach ($appSections as $section) {
-			/** @var ISection $section */
-			if (!isset($sections[$section->getPriority()])) {
-				$sections[$section->getPriority()] = [];
-			}
-
-			$sections[$section->getPriority()][] = $section;
-		}
-
-		ksort($sections);
-
-		return $sections;
-	}
-
-	/**
-	 * @param string[] $forms
-	 *
-	 * @return bool
-	 */
-	private function hasLegacyPersonalSettingsToRender(array $forms): bool {
-		foreach ($forms as $form) {
-			if (trim($form) !== '') {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getPersonalSettings($section): array {
-		$settings = $this->getBuiltInPersonalSettings($section);
-		$appSettings = $this->getSettings('personal', $section);
-
-		foreach ($appSettings as $setting) {
-			if (!isset($settings[$setting->getPriority()])) {
-				$settings[$setting->getPriority()] = [];
-			}
-			$settings[$setting->getPriority()][] = $setting;
-		}
-
-		ksort($settings);
-		return $settings;
-	}
+    /** @var ILogger */
+    private $log;
+
+    /** @var IL10N */
+    private $l;
+
+    /** @var IURLGenerator */
+    private $url;
+
+    /** @var IServerContainer */
+    private $container;
+
+    public function __construct(
+        ILogger $log,
+        IL10N $l10n,
+        IURLGenerator $url,
+        IServerContainer $container
+    ) {
+        $this->log = $log;
+        $this->l = $l10n;
+        $this->url = $url;
+        $this->container = $container;
+    }
+
+    /** @var array */
+    protected $sectionClasses = [];
+
+    /** @var array */
+    protected $sections = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section Class must implement OCP\Settings\ISection
+     *
+     * @return void
+     */
+    public function registerSection(string $type, string $section) {
+        if (!isset($this->sectionClasses[$type])) {
+            $this->sectionClasses[$type] = [];
+        }
+
+        $this->sectionClasses[$type][] = $section;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     *
+     * @return ISection[]
+     */
+    protected function getSections(string $type): array {
+        if (!isset($this->sections[$type])) {
+            $this->sections[$type] = [];
+        }
+
+        if (!isset($this->sectionClasses[$type])) {
+            return $this->sections[$type];
+        }
+
+        foreach ($this->sectionClasses[$type] as $index => $class) {
+            try {
+                /** @var ISection $section */
+                $section = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$section instanceof ISection) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings section registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            $sectionID = $section->getID();
+
+            if (isset($this->sections[$type][$sectionID])) {
+                $this->log->logException(new \InvalidArgumentException('Section with the same ID already registered'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            $this->sections[$type][$sectionID] = $section;
+
+            unset($this->sectionClasses[$type][$index]);
+        }
+
+        return $this->sections[$type];
+    }
+
+    /** @var array */
+    protected $settingClasses = [];
+
+    /** @var array */
+    protected $settings = [];
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $setting Class must implement OCP\Settings\ISetting
+     *
+     * @return void
+     */
+    public function registerSetting(string $type, string $setting) {
+        $this->settingClasses[$setting] = $type;
+    }
+
+    /**
+     * @param string $type 'admin' or 'personal'
+     * @param string $section
+     *
+     * @return ISettings[]
+     */
+    protected function getSettings(string $type, string $section): array {
+        if (!isset($this->settings[$type])) {
+            $this->settings[$type] = [];
+        }
+        if (!isset($this->settings[$type][$section])) {
+            $this->settings[$type][$section] = [];
+        }
+
+        foreach ($this->settingClasses as $class => $settingsType) {
+            try {
+                /** @var ISettings $setting */
+                $setting = \OC::$server->query($class);
+            } catch (QueryException $e) {
+                $this->log->logException($e, ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!$setting instanceof ISettings) {
+                $this->log->logException(new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'), ['level' => ILogger::INFO]);
+                continue;
+            }
+
+            if (!isset($this->settings[$settingsType][$setting->getSection()])) {
+                $this->settings[$settingsType][$setting->getSection()] = [];
+            }
+            $this->settings[$settingsType][$setting->getSection()][] = $setting;
+
+            unset($this->settingClasses[$class]);
+        }
+
+        return $this->settings[$type][$section];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSections(): array {
+        // built-in sections
+        $sections = [
+            0 => [new Section('overview', $this->l->t('Overview'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+            1 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+            5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
+            10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+            30 => [new Section('theming', $this->l->t('Theming'), 0, $this->url->imagePath('settings', 'theming-dark.svg'))],
+            50 => [new Section('groupware', $this->l->t('Groupware'), 0, $this->url->imagePath('core', 'places/contacts.svg'))],
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+        ];
+
+        $appSections = $this->getSections('admin');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string $section
+     *
+     * @return ISection[]
+     */
+    private function getBuiltInAdminSettings($section): array {
+        $forms = [];
+
+        if ($section === 'overview') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Admin\Overview::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'server') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Admin\Server::class);
+            $forms[$form->getPriority()] = [$form];
+            $form = $this->container->query(Admin\Mail::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'security') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Admin\Security::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'theming') {
+            $form = $this->container->query(Theming\ServerInfo::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'sharing') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Admin\Sharing::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @param string $section
+     *
+     * @return ISection[]
+     */
+    private function getBuiltInPersonalSettings($section): array {
+        $forms = [];
+
+        if ($section === 'personal-info') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Personal\PersonalInfo::class);
+            $forms[$form->getPriority()] = [$form];
+            $form = new Personal\ServerDevNotice();
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'security') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Personal\Security::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+        if ($section === 'additional') {
+            /** @var ISettings $form */
+            $form = $this->container->query(Personal\Additional::class);
+            $forms[$form->getPriority()] = [$form];
+        }
+
+        return $forms;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getAdminSettings($section): array {
+        $settings = $this->getBuiltInAdminSettings($section);
+        $appSettings = $this->getSettings('admin', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSections(): array {
+        $sections = [
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
+            5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
+            15 => [new Section('sync-clients', $this->l->t('Mobile & desktop'), 0, $this->url->imagePath('core', 'clients/phone.svg'))],
+        ];
+
+        $legacyForms = \OC_App::getForms('personal');
+        if (!empty($legacyForms) && $this->hasLegacyPersonalSettingsToRender($legacyForms)) {
+            $sections[98] = [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))];
+        }
+
+        $appSections = $this->getSections('personal');
+
+        foreach ($appSections as $section) {
+            /** @var ISection $section */
+            if (!isset($sections[$section->getPriority()])) {
+                $sections[$section->getPriority()] = [];
+            }
+
+            $sections[$section->getPriority()][] = $section;
+        }
+
+        ksort($sections);
+
+        return $sections;
+    }
+
+    /**
+     * @param string[] $forms
+     *
+     * @return bool
+     */
+    private function hasLegacyPersonalSettingsToRender(array $forms): bool {
+        foreach ($forms as $form) {
+            if (trim($form) !== '') {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getPersonalSettings($section): array {
+        $settings = $this->getBuiltInPersonalSettings($section);
+        $appSettings = $this->getSettings('personal', $section);
+
+        foreach ($appSettings as $setting) {
+            if (!isset($settings[$setting->getPriority()])) {
+                $settings[$setting->getPriority()] = [];
+            }
+            $settings[$setting->getPriority()][] = $setting;
+        }
+
+        ksort($settings);
+        return $settings;
+    }
 }