nextcloud / server

lib/private/NavigationManager.php

Indentation +218 added lines, -218 removed lines

@@ -41,241 +41,241 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	/** @var bool */
-	protected $init = false;
-	/** @var IAppManager|AppManager */
-	protected $appManager;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IFactory */
-	private $l10nFac;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IGroupManager|Manager */
-	private $groupManager;
-	/** @var IConfig */
-	private $config;
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    /** @var bool */
+    protected $init = false;
+    /** @var IAppManager|AppManager */
+    protected $appManager;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IFactory */
+    private $l10nFac;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IGroupManager|Manager */
+    private $groupManager;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IAppManager $appManager,
-						 IURLGenerator $urlGenerator,
-						 IFactory $l10nFac,
-						 IUserSession $userSession,
-						 IGroupManager $groupManager,
-						 IConfig $config) {
-		$this->appManager = $appManager;
-		$this->urlGenerator = $urlGenerator;
-		$this->l10nFac = $l10nFac;
-		$this->userSession = $userSession;
-		$this->groupManager = $groupManager;
-		$this->config = $config;
-	}
+    public function __construct(IAppManager $appManager,
+                            IURLGenerator $urlGenerator,
+                            IFactory $l10nFac,
+                            IUserSession $userSession,
+                            IGroupManager $groupManager,
+                            IConfig $config) {
+        $this->appManager = $appManager;
+        $this->urlGenerator = $urlGenerator;
+        $this->l10nFac = $l10nFac;
+        $this->userSession = $userSession;
+        $this->groupManager = $groupManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * Creates a new navigation entry
-	 *
-	 * @param array|\Closure $entry Array containing: id, name, order, icon and href key
-	 *					The use of a closure is preferred, because it will avoid
-	 * 					loading the routing of your app, unless required.
-	 * @return void
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
+    /**
+     * Creates a new navigation entry
+     *
+     * @param array|\Closure $entry Array containing: id, name, order, icon and href key
+     *					The use of a closure is preferred, because it will avoid
+     * 					loading the routing of your app, unless required.
+     * @return void
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
 
-		$entry['active'] = false;
-		if(!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if(!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-		$this->entries[] = $entry;
-	}
+        $entry['active'] = false;
+        if(!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if(!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+        $this->entries[] = $entry;
+    }
 
-	/**
-	 * returns all the added Menu entries
-	 * @param string $type
-	 * @return array an array of the added entries
-	 */
-	public function getAll($type = 'link') {
-		$this->init();
-		foreach ($this->closureEntries as $c) {
-			$this->add($c());
-		}
-		$this->closureEntries = array();
+    /**
+     * returns all the added Menu entries
+     * @param string $type
+     * @return array an array of the added entries
+     */
+    public function getAll($type = 'link') {
+        $this->init();
+        foreach ($this->closureEntries as $c) {
+            $this->add($c());
+        }
+        $this->closureEntries = array();
 
-		if ($type === 'all') {
-			return $this->entries;
-		}
+        if ($type === 'all') {
+            return $this->entries;
+        }
 
-		return array_filter($this->entries, function($entry) use ($type) {
-			return $entry['type'] === $type;
-		});
-	}
+        return array_filter($this->entries, function($entry) use ($type) {
+            return $entry['type'] === $type;
+        });
+    }
 
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
 
-	/**
-	 * Sets the current navigation entry of the currently running app
-	 * @param string $id of the app entry to activate (from added $entry)
-	 */
-	public function setActiveEntry($id) {
-		$this->activeEntry = $id;
-	}
+    /**
+     * Sets the current navigation entry of the currently running app
+     * @param string $id of the app entry to activate (from added $entry)
+     */
+    public function setActiveEntry($id) {
+        $this->activeEntry = $id;
+    }
 
-	/**
-	 * gets the active Menu entry
-	 * @return string id or empty string
-	 *
-	 * This function returns the id of the active navigation entry (set by
-	 * setActiveEntry
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
+    /**
+     * gets the active Menu entry
+     * @return string id or empty string
+     *
+     * This function returns the id of the active navigation entry (set by
+     * setActiveEntry
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
 
-	private function init() {
-		if ($this->init) {
-			return;
-		}
-		$this->init = true;
+    private function init() {
+        if ($this->init) {
+            return;
+        }
+        $this->init = true;
 
-		$l = $this->l10nFac->get('lib');
-		if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
-			$this->add([
-				'type' => 'settings',
-				'id' => 'help',
-				'order' => 5,
-				'href' => $this->urlGenerator->linkToRoute('settings_help'),
-				'name' => $l->t('Help'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
+        $l = $this->l10nFac->get('lib');
+        if ($this->config->getSystemValue('knowledgebaseenabled', true)) {
+            $this->add([
+                'type' => 'settings',
+                'id' => 'help',
+                'order' => 5,
+                'href' => $this->urlGenerator->linkToRoute('settings_help'),
+                'name' => $l->t('Help'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
 
-		if ($this->userSession->isLoggedIn()) {
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-			}
+        if ($this->userSession->isLoggedIn()) {
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+            }
 
-			// Personal and (if applicable) admin settings
-			$this->add([
-				'type' => 'settings',
-				'id' => 'settings',
-				'order' => 1,
-				'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-				'name' => $l->t('Settings'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-			]);
+            // Personal and (if applicable) admin settings
+            $this->add([
+                'type' => 'settings',
+                'id' => 'settings',
+                'order' => 1,
+                'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                'name' => $l->t('Settings'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+            ]);
 
-			// Logout
-			$this->add([
-				'type' => 'settings',
-				'id' => 'logout',
-				'order' => 99999,
-				'href' => $this->urlGenerator->linkToRouteAbsolute(
-					'core.login.logout',
-					['requesttoken' => \OCP\Util::callRegister()]
-				),
-				'name' => $l->t('Log out'),
-				'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
-			]);
+            // Logout
+            $this->add([
+                'type' => 'settings',
+                'id' => 'logout',
+                'order' => 99999,
+                'href' => $this->urlGenerator->linkToRouteAbsolute(
+                    'core.login.logout',
+                    ['requesttoken' => \OCP\Util::callRegister()]
+                ),
+                'name' => $l->t('Log out'),
+                'icon' => $this->urlGenerator->imagePath('core', 'actions/logout.svg'),
+            ]);
 
-			if ($this->isSubadmin()) {
-				// User management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_users',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings_users'),
-					'name' => $l->t('Users'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
+            if ($this->isSubadmin()) {
+                // User management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_users',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings_users'),
+                    'name' => $l->t('Users'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
 
-		if ($this->appManager === 'null') {
-			return;
-		}
-		foreach ($this->appManager->getInstalledApps() as $app) {
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (empty($info['navigations'])) {
-				continue;
-			}
-			foreach ($info['navigations'] as $nav) {
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				if (!isset($nav['route'])) {
-					continue;
-				}
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = isset($nav['id']) ? $nav['id'] : $app;
-				$order = isset($nav['order']) ? $nav['order'] : 100;
-				$type = isset($nav['type']) ? $nav['type'] : 'link';
-				$route = $this->urlGenerator->linkToRoute($nav['route']);
-				$icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
-				foreach ([$icon, "$app.svg"] as $i) {
-					try {
-						$icon = $this->urlGenerator->imagePath($app, $i);
-						break;
-					} catch (\RuntimeException $ex) {
-						// no icon? - ignore it then
-					}
-				}
-				if ($icon === null) {
-					$icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
-				}
+        if ($this->appManager === 'null') {
+            return;
+        }
+        foreach ($this->appManager->getInstalledApps() as $app) {
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (empty($info['navigations'])) {
+                continue;
+            }
+            foreach ($info['navigations'] as $nav) {
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                if (!isset($nav['route'])) {
+                    continue;
+                }
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = isset($nav['id']) ? $nav['id'] : $app;
+                $order = isset($nav['order']) ? $nav['order'] : 100;
+                $type = isset($nav['type']) ? $nav['type'] : 'link';
+                $route = $this->urlGenerator->linkToRoute($nav['route']);
+                $icon = isset($nav['icon']) ? $nav['icon'] : 'app.svg';
+                foreach ([$icon, "$app.svg"] as $i) {
+                    try {
+                        $icon = $this->urlGenerator->imagePath($app, $i);
+                        break;
+                    } catch (\RuntimeException $ex) {
+                        // no icon? - ignore it then
+                    }
+                }
+                if ($icon === null) {
+                    $icon = $this->urlGenerator->imagePath('core', 'default-app-icon');
+                }
 
-				$this->add([
-					'id' => $id,
-					'order' => $order,
-					'href' => $route,
-					'icon' => $icon,
-					'type' => $type,
-					'name' => $l->t($nav['name']),
-				]);
-			}
-		}
-	}
+                $this->add([
+                    'id' => $id,
+                    'order' => $order,
+                    'href' => $route,
+                    'icon' => $icon,
+                    'type' => $type,
+                    'name' => $l->t($nav['name']),
+                ]);
+            }
+        }
+    }
 
-	private function isAdmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->isAdmin($user->getUID());
-		}
-		return false;
-	}
+    private function isAdmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->isAdmin($user->getUID());
+        }
+        return false;
+    }
 
-	private function isSubadmin() {
-		$user = $this->userSession->getUser();
-		if ($user !== null) {
-			return $this->groupManager->getSubAdmin()->isSubAdmin($user);
-		}
-		return false;
-	}
+    private function isSubadmin() {
+        $user = $this->userSession->getUser();
+        if ($user !== null) {
+            return $this->groupManager->getSubAdmin()->isSubAdmin($user);
+        }
+        return false;
+    }
 }

lib/public/Settings/IManager.php

Indentation +85 added lines, -85 removed lines

@@ -27,99 +27,99 @@
  * @since 9.1
  */
 interface IManager {
-	/**
-	 * @since 9.1.0
-	 */
-	const KEY_ADMIN_SETTINGS = 'admin';
+    /**
+     * @since 9.1.0
+     */
+    const KEY_ADMIN_SETTINGS = 'admin';
 
-	/**
-	 * @since 9.1.0
-	 */
-	const KEY_ADMIN_SECTION  = 'admin-section';
+    /**
+     * @since 9.1.0
+     */
+    const KEY_ADMIN_SECTION  = 'admin-section';
 
-	/**
-	 * @since 12.0.0
-	 */
-	const KEY_PERSONAL_SETTINGS = 'personal';
+    /**
+     * @since 12.0.0
+     */
+    const KEY_PERSONAL_SETTINGS = 'personal';
 
-	/**
-	 * @since 12.0.0
-	 */
-	const KEY_PERSONAL_SECTION  = 'personal-section';
+    /**
+     * @since 12.0.0
+     */
+    const KEY_PERSONAL_SECTION  = 'personal-section';
 
-	/**
-	 * sets up settings according to data specified by an apps info.xml, within
-	 * the <settings> element.
-	 *
-	 * @param array $settings an associative array, allowed keys are as specified
-	 *                        by the KEY_ constant of  this interface. The value
-	 *                        must always be a class name, implement either
-	 *                        IAdmin or ISection. I.e. only one section and admin
-	 *                        setting can be configured per app.
-	 * @since 9.1.0
-	 */
-	public function setupSettings(array $settings);
+    /**
+     * sets up settings according to data specified by an apps info.xml, within
+     * the <settings> element.
+     *
+     * @param array $settings an associative array, allowed keys are as specified
+     *                        by the KEY_ constant of  this interface. The value
+     *                        must always be a class name, implement either
+     *                        IAdmin or ISection. I.e. only one section and admin
+     *                        setting can be configured per app.
+     * @since 9.1.0
+     */
+    public function setupSettings(array $settings);
 
-	/**
-	 * attempts to remove an apps section and/or settings entry. A listener is
-	 * added centrally making sure that this method is called ones an app was
-	 * disabled.
-	 *
-	 * What this does not help with is when applications change their settings
-	 * or section classes during their life time. New entries will be added,
-	 * but inactive ones will still reside in the database.
-	 *
-	 * @param string $appId
-	 * @since 9.1.0
-	 */
-	public function onAppDisabled($appId);
+    /**
+     * attempts to remove an apps section and/or settings entry. A listener is
+     * added centrally making sure that this method is called ones an app was
+     * disabled.
+     *
+     * What this does not help with is when applications change their settings
+     * or section classes during their life time. New entries will be added,
+     * but inactive ones will still reside in the database.
+     *
+     * @param string $appId
+     * @since 9.1.0
+     */
+    public function onAppDisabled($appId);
 
-	/**
-	 * The method should check all registered classes whether they are still
-	 * instantiable and remove them, if not. This method is called by a
-	 * background job once, after one or more apps were updated.
-	 *
-	 * An app`s info.xml can change during an update and make it unknown whether
-	 * a registered class name was changed or not. An old one would just stay
-	 * registered. Another case is if an admin takes a radical approach and
-	 * simply removes an app from the app folder. These unregular checks will
-	 * take care of such situations.
-	 *
-	 * @since 9.1.0
-	 */
-	public function checkForOrphanedClassNames();
+    /**
+     * The method should check all registered classes whether they are still
+     * instantiable and remove them, if not. This method is called by a
+     * background job once, after one or more apps were updated.
+     *
+     * An app`s info.xml can change during an update and make it unknown whether
+     * a registered class name was changed or not. An old one would just stay
+     * registered. Another case is if an admin takes a radical approach and
+     * simply removes an app from the app folder. These unregular checks will
+     * take care of such situations.
+     *
+     * @since 9.1.0
+     */
+    public function checkForOrphanedClassNames();
 
-	/**
-	 * returns a list of the admin sections
-	 *
-	 * @return array array of ISection[] where key is the priority
-	 * @since 9.1.0
-	 */
-	public function getAdminSections();
+    /**
+     * returns a list of the admin sections
+     *
+     * @return array array of ISection[] where key is the priority
+     * @since 9.1.0
+     */
+    public function getAdminSections();
 
-	/**
-	 * returns a list of the personal sections
-	 *
-	 * @return array array of ISection[] where key is the priority
-	 * @since 12.0.0
-	 */
-	public function getPersonalSections();
+    /**
+     * returns a list of the personal sections
+     *
+     * @return array array of ISection[] where key is the priority
+     * @since 12.0.0
+     */
+    public function getPersonalSections();
 
-	/**
-	 * returns a list of the admin settings
-	 *
-	 * @param string $section the section id for which to load the settings
-	 * @return array array of IAdmin[] where key is the priority
-	 * @since 9.1.0
-	 */
-	public function getAdminSettings($section);
+    /**
+     * returns a list of the admin settings
+     *
+     * @param string $section the section id for which to load the settings
+     * @return array array of IAdmin[] where key is the priority
+     * @since 9.1.0
+     */
+    public function getAdminSettings($section);
 
-	/**
-	 * returns a list of the personal  settings
-	 *
-	 * @param string $section the section id for which to load the settings
-	 * @return array array of IPersonal[] where key is the priority
-	 * @since 12.0.0
-	 */
-	public function getPersonalSettings($section);
+    /**
+     * returns a list of the personal  settings
+     *
+     * @param string $section the section id for which to load the settings
+     * @return array array of IPersonal[] where key is the priority
+     * @since 12.0.0
+     */
+    public function getPersonalSettings($section);
 }

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 12.0.0
@@ -45,7 +45,7 @@ 
 	/**
 	 * @since 12.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

settings/templates/settings/personal/app-passwords.php

Indentation +4 added lines, -4 removed lines

@@ -21,10 +21,10 @@
  *
  */
 script('settings', [
-	'authtoken',
-	'authtoken_collection',
-	'authtoken_view',
-	'settings/authtoken-init'
+    'authtoken',
+    'authtoken_collection',
+    'authtoken_view',
+    'settings/authtoken-init'
 ]);
 
 ?>

Spacing +4 added lines, -4 removed lines

@@ -30,13 +30,13 @@
 ?>
 
 <div id="apppasswords" class="section">
-	<h2><?php p($l->t('App passwords'));?></h2>
-	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
+	<h2><?php p($l->t('App passwords')); ?></h2>
+	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.')); ?></p>
 	<table class="icon-loading">
 		<thead class="hidden-when-empty">
 		<tr>
-			<th><?php p($l->t('Name'));?></th>
-			<th><?php p($l->t('Last activity'));?></th>
+			<th><?php p($l->t('Name')); ?></th>
+			<th><?php p($l->t('Last activity')); ?></th>
 			<th></th>
 		</tr>
 		</thead>

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

Indentation +41 added lines, -41 removed lines

@@ -25,10 +25,10 @@ 
 /** @var array $_ */
 
 script('settings', [
-	'usersettings',
-	'federationsettingsview',
-	'federationscopemenu',
-	'settings/personalInfo',
+    'usersettings',
+    'federationsettingsview',
+    'federationscopemenu',
+    'settings/personalInfo',
 ]);
 vendor_script('strengthify/jquery.strengthify');
 vendor_style('strengthify/strengthify');
@@ -46,10 +46,10 @@ 
 		<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>
@@ -118,17 +118,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"'); } ?>
@@ -185,17 +185,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">
@@ -222,17 +222,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">
@@ -265,8 +265,8 @@ 
 
 <?php
 if($_['passwordChangeSupported']) {
-	script('jquery-showpassword');
-	?>
+    script('jquery-showpassword');
+    ?>
 	<form id="passwordform" class="section">
 		<h2 class="inlineblock"><?php p($l->t('Password'));?></h2>
 		<div id="password-error-msg" class="msg success inlineblock" style="display: none;">Saved</div>

Spacing +42 added lines, -42 removed lines

@@ -41,15 +41,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>
@@ -83,7 +83,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>
@@ -97,14 +97,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>
@@ -115,10 +115,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;
@@ -131,23 +131,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>
@@ -182,10 +182,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;
@@ -196,13 +196,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>
@@ -219,10 +219,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;
@@ -233,13 +233,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>
@@ -264,19 +264,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"
@@ -292,26 +292,26 @@ 
 
 <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>

Braces +32 added lines, -11 removed lines

@@ -47,9 +47,12 @@ 
 			<?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']]));?>
-			<?php else: ?>
+			<?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>
@@ -71,8 +74,11 @@ 
 					<div class="hidden button icon-delete svg" id="removeavatar" title="<?php p($l->t('Remove image')); ?>"></div>
 					<input type="file" name="files[]" id="uploadavatar" class="hiddenuploadfield">
 					<p><em><?php p($l->t('png or jpg, max. 20 MB')); ?></em></p>
-				<?php else: ?>
-					<?php p($l->t('Picture provided by original account')); ?>
+				<?php else {
+    : ?>
+					<?php p($l->t('Picture provided by original account'));
+}
+?>
 				<?php endif; ?>
 			</div>
 
@@ -115,7 +121,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']) {
@@ -182,7 +191,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']) {
@@ -196,13 +208,16 @@ 
 								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>
@@ -219,7 +234,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']) {
@@ -233,13 +251,16 @@ 
 								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>

settings/templates/settings/personal/sessions.php

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
  */
 
 script('settings', [
-	'authtoken',
-	'authtoken_collection',
-	'authtoken_view',
-	'settings/authtoken-init'
+    'authtoken',
+    'authtoken_collection',
+    'authtoken_view',
+    'settings/authtoken-init'
 ]);
 
 ?>

Spacing +4 added lines, -4 removed lines

@@ -32,13 +32,13 @@
 
 
 <div id="sessions" class="section">
-	<h2><?php p($l->t('Sessions'));?></h2>
-<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
+	<h2><?php p($l->t('Sessions')); ?></h2>
+<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.')); ?></p>
 <table class="icon-loading">
 	<thead class="token-list-header">
 	<tr>
-		<th><?php p($l->t('Device'));?></th>
-		<th><?php p($l->t('Last activity'));?></th>
+		<th><?php p($l->t('Device')); ?></th>
+		<th><?php p($l->t('Last activity')); ?></th>
 		<th></th>
 	</tr>
 	</thead>

settings/templates/settings/personal/sync-clients.php

Indentation +9 added lines, -9 removed lines

@@ -42,15 +42,15 @@
 
 	<p>
 		<?php print_unescaped(str_replace(
-			[
-				'{contributeopen}',
-				'{linkclose}',
-			],
-			[
-				'<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
-				'</a>',
-			],
-			$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
+            [
+                '{contributeopen}',
+                '{linkclose}',
+            ],
+            [
+                '<a href="https://nextcloud.com/contribute" target="_blank" rel="noreferrer">',
+                '</a>',
+            ],
+            $l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 	</p>
 
 	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>

Spacing +6 added lines, -6 removed lines

@@ -26,18 +26,18 @@ 
 ?>
 
 <div id="clientsbox" class="section clientsbox">
-	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
+	<h2><?php p($l->t('Get the apps to sync your files')); ?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>"
-			 alt="<?php p($l->t('Desktop client'));?>" />
+			 alt="<?php p($l->t('Desktop client')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>"
-			 alt="<?php p($l->t('Android app'));?>" />
+			 alt="<?php p($l->t('Android app')); ?>" />
 	</a>
 	<a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank">
 		<img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>"
-			 alt="<?php p($l->t('iOS app'));?>" />
+			 alt="<?php p($l->t('iOS app')); ?>" />
 	</a>
 
 	<p>
@@ -53,7 +53,7 @@ 
 			$l->t('If you want to support the project {contributeopen}join development{linkclose} or {contributeopen}spread the word{linkclose}!'))); ?>
 	</p>
 
-	<?php if(OC_APP::isEnabled('firstrunwizard')) {?>
-		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again'));?></a></p>
+	<?php if (OC_APP::isEnabled('firstrunwizard')) {?>
+		<p><a class="button" href="#" id="showWizard"><?php p($l->t('Show First Run Wizard again')); ?></a></p>
 	<?php }?>
 </div>

lib/private/Settings/Personal/Additional.php

Indentation +25 added lines, -25 removed lines

@@ -29,31 +29,31 @@
 
 class Additional implements ISettings {
 
-	/**
-	 * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
-	 * @since 9.1
-	 */
-	public function getForm() {
-		return new TemplateResponse('settings', 'settings/empty');
-	}
+    /**
+     * @return TemplateResponse returns the instance with all parameters set, ready to be rendered
+     * @since 9.1
+     */
+    public function getForm() {
+        return new TemplateResponse('settings', 'settings/empty');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 * @since 9.1
-	 */
-	public function getSection() {
-		return 'additional';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     * @since 9.1
+     */
+    public function getSection() {
+        return 'additional';
+    }
 
-	/**
-	 * @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 '5';
-	}
+    /**
+     * @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 '5';
+    }
 }

settings/Controller/PersonalSettingsController.php

Indentation +65 added lines, -65 removed lines

@@ -31,78 +31,78 @@
 use OCP\Template;
 
 class PersonalSettingsController extends Controller {
-	use CommonSettingsTrait {
-		getSettings as private;
-	}
+    use CommonSettingsTrait {
+        getSettings as private;
+    }
 
-	/** @var INavigationManager */
-	private $navigationManager;
+    /** @var INavigationManager */
+    private $navigationManager;
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		INavigationManager $navigationManager,
-		ISettingsManager $settingsManager
-	) {
-		parent::__construct($appName, $request);
-		$this->navigationManager = $navigationManager;
-		$this->settingsManager = $settingsManager;
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        INavigationManager $navigationManager,
+        ISettingsManager $settingsManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->navigationManager = $navigationManager;
+        $this->settingsManager = $settingsManager;
+    }
 
-	/**
-	 * @param string $section
-	 * @return TemplateResponse
-	 *
-	 * @NoCSRFRequired
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 */
-	public function index($section) {
-		$this->navigationManager->setActiveEntry('personal');
-		return $this->getIndexResponse($section);
-	}
+    /**
+     * @param string $section
+     * @return TemplateResponse
+     *
+     * @NoCSRFRequired
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     */
+    public function index($section) {
+        $this->navigationManager->setActiveEntry('personal');
+        return $this->getIndexResponse($section);
+    }
 
-	/**
-	 * @param string $section
-	 * @return array
-	 */
-	private function getSettings($section) {
-		// PhpStorm shows this as unused, but is required by CommonSettingsTrait
-		$settings = $this->settingsManager->getPersonalSettings($section);
-		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
-			$formatted['content'] .= $this->getLegacyForms();
-		}
-		return $formatted;
-	}
+    /**
+     * @param string $section
+     * @return array
+     */
+    private function getSettings($section) {
+        // PhpStorm shows this as unused, but is required by CommonSettingsTrait
+        $settings = $this->settingsManager->getPersonalSettings($section);
+        $formatted = $this->formatSettings($settings);
+        if($section === 'additional') {
+            $formatted['content'] .= $this->getLegacyForms();
+        }
+        return $formatted;
+    }
 
-	/**
-	 * @return bool|string
-	 */
-	private function getLegacyForms() {
-		$forms = \OC_App::getForms('personal');
+    /**
+     * @return bool|string
+     */
+    private function getLegacyForms() {
+        $forms = \OC_App::getForms('personal');
 
-		$forms = array_map(function ($form) {
-			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
-				$sectionName = str_replace('</h2>', '', $sectionName);
-				$anchor = strtolower($sectionName);
-				$anchor = str_replace(' ', '-', $anchor);
+        $forms = array_map(function ($form) {
+            if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+                $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+                $sectionName = str_replace('</h2>', '', $sectionName);
+                $anchor = strtolower($sectionName);
+                $anchor = str_replace(' ', '-', $anchor);
 
-				return array(
-					'anchor' => $anchor,
-					'section-name' => $sectionName,
-					'form' => $form
-				);
-			}
-			return array(
-				'form' => $form
-			);
-		}, $forms);
+                return array(
+                    'anchor' => $anchor,
+                    'section-name' => $sectionName,
+                    'form' => $form
+                );
+            }
+            return array(
+                'form' => $form
+            );
+        }, $forms);
 
-		$out = new Template('settings', 'settings/additional');
-		$out->assign('forms', $forms);
+        $out = new Template('settings', 'settings/additional');
+        $out->assign('forms', $forms);
 
-		return $out->fetchPage();
-	}
+        return $out->fetchPage();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		// PhpStorm shows this as unused, but is required by CommonSettingsTrait
 		$settings = $this->settingsManager->getPersonalSettings($section);
 		$formatted = $this->formatSettings($settings);
-		if($section === 'additional') {
+		if ($section === 'additional') {
 			$formatted['content'] .= $this->getLegacyForms();
 		}
 		return $formatted;
@@ -82,9 +82,9 @@ 
 	private function getLegacyForms() {
 		$forms = \OC_App::getForms('personal');
 
-		$forms = array_map(function ($form) {
+		$forms = array_map(function($form) {
 			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
+				$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 				$sectionName = str_replace('</h2>', '', $sectionName);
 				$anchor = strtolower($sectionName);
 				$anchor = str_replace(' ', '-', $anchor);

lib/private/Settings/Mapper.php

Indentation +184 added lines, -184 removed lines

@@ -26,189 +26,189 @@
 use OCP\IDBConnection;
 
 class Mapper {
-	const TABLE_ADMIN_SETTINGS = 'admin_settings';
-	const TABLE_ADMIN_SECTIONS = 'admin_sections';
-	const TABLE_PERSONAL_SETTINGS = 'personal_settings';
-	const TABLE_PERSONAL_SECTIONS = 'personal_sections';
-
-	/** @var IDBConnection */
-	private $dbc;
-
-	/**
-	 * @param IDBConnection $dbc
-	 */
-	public function __construct(IDBConnection $dbc) {
-		$this->dbc = $dbc;
-	}
-
-	/**
-	 * Get the configured admin settings from the database for the provided section
-	 *
-	 * @param string $section
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getAdminSettingsFromDB($section) {
-		return $this->getSettingsFromDB(self::TABLE_ADMIN_SETTINGS, $section);
-	}
-
-	/**
-	 * Get the configured personal settings from the database for the provided section
-	 *
-	 * @param string $section
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getPersonalSettingsFromDB($section) {
-		return $this->getSettingsFromDB(self::TABLE_PERSONAL_SETTINGS, $section);
-	}
-
-	/**
-	 * Get the configured settings from the database for the provided table and section
-	 *
-	 * @param $table
-	 * @param $section
-	 * @return array
-	 */
-	private function getSettingsFromDB($table, $section) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select(['class', 'priority'])
-			->from($table)
-			->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section')))
-			->setParameter('section', $section);
-
-		$result = $query->execute();
-		return $result->fetchAll();
-	}
-
-	/**
-	 * Get the configured admin sections from the database
-	 *
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getAdminSectionsFromDB() {
-		return $this->getSectionsFromDB('admin');
-	}
-
-	/**
-	 * Get the configured admin sections from the database
-	 *
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getPersonalSectionsFromDB() {
-		return $this->getSectionsFromDB('personal');
-	}
-
-	/**
-	 * Get the configured sections from the database by table
-	 *
-	 * @param string $type either 'personal' or 'admin'
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getSectionsFromDB($type) {
-		if($type === 'personal') {
-			$sectionsTable = self::TABLE_ADMIN_SECTIONS;
-			$settingsTable = self::TABLE_ADMIN_SETTINGS;
-		} else if($type === 'admin') {
-			$sectionsTable = self::TABLE_PERSONAL_SECTIONS;
-			$settingsTable = self::TABLE_PERSONAL_SETTINGS;
-		} else {
-			throw new \InvalidArgumentException('"admin" or "personal" expected');
-		}
-		$query = $this->dbc->getQueryBuilder();
-		$query->selectDistinct('s.class')
-			->addSelect('s.priority')
-			->from($sectionsTable, 's')
-			->from($settingsTable, 'f')
-			->where($query->expr()->eq('s.id', 'f.section'));
-		$result = $query->execute();
-		return array_map(function ($row) {
-			$row['priority'] = (int)$row['priority'];
-			return $row;
-		}, $result->fetchAll());
-	}
-
-	/**
-	 * @param string $table one of the Mapper::TABLE_* constants
-	 * @param array $values
-	 */
-	public function add($table, array $values) {
-		$query = $this->dbc->getQueryBuilder();
-		$values = array_map(function ($value) use ($query) {
-			return $query->createNamedParameter($value);
-		}, $values);
-		$query->insert($table)->values($values);
-		$query->execute();
-	}
-
-	/**
-	 * returns the registered classes in the given table
-	 *
-	 * @param string $table one of the Mapper::TABLE_* constants
-	 * @return string[]
-	 */
-	public function getClasses($table) {
-		$q = $this->dbc->getQueryBuilder();
-		$resultStatement = $q->select('class')
-			->from($table)
-			->execute();
-		$data = $resultStatement->fetchAll();
-		$resultStatement->closeCursor();
-
-		return array_map(function ($row) {
-			return $row['class'];
-		}, $data);
-	}
-
-	/**
-	 * Check if a class is configured in the database
-	 *
-	 * @param string $table one of the Mapper::TABLE_* constants
-	 * @param string $className
-	 * @return bool
-	 */
-	public function has($table, $className) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select('class')
-			->from($table)
-			->where($query->expr()->eq('class', $query->createNamedParameter($className)))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool)$row;
-	}
-
-	/**
-	 * deletes an settings or admin entry from the given table
-	 *
-	 * @param string $table one of the Mapper::TABLE_* constants
-	 * @param string $className
-	 */
-	public function remove($table, $className) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq('class', $query->createNamedParameter($className)));
-
-		$query->execute();
-	}
-
-	/**
-	 * @param string $table one of the Mapper::TABLE_* constants
-	 * @param string $idCol
-	 * @param string $id
-	 * @param array $values
-	 */
-	public function update($table, $idCol, $id, $values) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->update($table);
-		foreach ($values as $key => $value) {
-			$query->set($key, $query->createNamedParameter($value));
-		}
-		$query
-			->where($query->expr()->eq($idCol, $query->createParameter($idCol)))
-			->setParameter($idCol, $id)
-			->execute();
-	}
+    const TABLE_ADMIN_SETTINGS = 'admin_settings';
+    const TABLE_ADMIN_SECTIONS = 'admin_sections';
+    const TABLE_PERSONAL_SETTINGS = 'personal_settings';
+    const TABLE_PERSONAL_SECTIONS = 'personal_sections';
+
+    /** @var IDBConnection */
+    private $dbc;
+
+    /**
+     * @param IDBConnection $dbc
+     */
+    public function __construct(IDBConnection $dbc) {
+        $this->dbc = $dbc;
+    }
+
+    /**
+     * Get the configured admin settings from the database for the provided section
+     *
+     * @param string $section
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getAdminSettingsFromDB($section) {
+        return $this->getSettingsFromDB(self::TABLE_ADMIN_SETTINGS, $section);
+    }
+
+    /**
+     * Get the configured personal settings from the database for the provided section
+     *
+     * @param string $section
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getPersonalSettingsFromDB($section) {
+        return $this->getSettingsFromDB(self::TABLE_PERSONAL_SETTINGS, $section);
+    }
+
+    /**
+     * Get the configured settings from the database for the provided table and section
+     *
+     * @param $table
+     * @param $section
+     * @return array
+     */
+    private function getSettingsFromDB($table, $section) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select(['class', 'priority'])
+            ->from($table)
+            ->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section')))
+            ->setParameter('section', $section);
+
+        $result = $query->execute();
+        return $result->fetchAll();
+    }
+
+    /**
+     * Get the configured admin sections from the database
+     *
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getAdminSectionsFromDB() {
+        return $this->getSectionsFromDB('admin');
+    }
+
+    /**
+     * Get the configured admin sections from the database
+     *
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getPersonalSectionsFromDB() {
+        return $this->getSectionsFromDB('personal');
+    }
+
+    /**
+     * Get the configured sections from the database by table
+     *
+     * @param string $type either 'personal' or 'admin'
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getSectionsFromDB($type) {
+        if($type === 'personal') {
+            $sectionsTable = self::TABLE_ADMIN_SECTIONS;
+            $settingsTable = self::TABLE_ADMIN_SETTINGS;
+        } else if($type === 'admin') {
+            $sectionsTable = self::TABLE_PERSONAL_SECTIONS;
+            $settingsTable = self::TABLE_PERSONAL_SETTINGS;
+        } else {
+            throw new \InvalidArgumentException('"admin" or "personal" expected');
+        }
+        $query = $this->dbc->getQueryBuilder();
+        $query->selectDistinct('s.class')
+            ->addSelect('s.priority')
+            ->from($sectionsTable, 's')
+            ->from($settingsTable, 'f')
+            ->where($query->expr()->eq('s.id', 'f.section'));
+        $result = $query->execute();
+        return array_map(function ($row) {
+            $row['priority'] = (int)$row['priority'];
+            return $row;
+        }, $result->fetchAll());
+    }
+
+    /**
+     * @param string $table one of the Mapper::TABLE_* constants
+     * @param array $values
+     */
+    public function add($table, array $values) {
+        $query = $this->dbc->getQueryBuilder();
+        $values = array_map(function ($value) use ($query) {
+            return $query->createNamedParameter($value);
+        }, $values);
+        $query->insert($table)->values($values);
+        $query->execute();
+    }
+
+    /**
+     * returns the registered classes in the given table
+     *
+     * @param string $table one of the Mapper::TABLE_* constants
+     * @return string[]
+     */
+    public function getClasses($table) {
+        $q = $this->dbc->getQueryBuilder();
+        $resultStatement = $q->select('class')
+            ->from($table)
+            ->execute();
+        $data = $resultStatement->fetchAll();
+        $resultStatement->closeCursor();
+
+        return array_map(function ($row) {
+            return $row['class'];
+        }, $data);
+    }
+
+    /**
+     * Check if a class is configured in the database
+     *
+     * @param string $table one of the Mapper::TABLE_* constants
+     * @param string $className
+     * @return bool
+     */
+    public function has($table, $className) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select('class')
+            ->from($table)
+            ->where($query->expr()->eq('class', $query->createNamedParameter($className)))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool)$row;
+    }
+
+    /**
+     * deletes an settings or admin entry from the given table
+     *
+     * @param string $table one of the Mapper::TABLE_* constants
+     * @param string $className
+     */
+    public function remove($table, $className) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq('class', $query->createNamedParameter($className)));
+
+        $query->execute();
+    }
+
+    /**
+     * @param string $table one of the Mapper::TABLE_* constants
+     * @param string $idCol
+     * @param string $id
+     * @param array $values
+     */
+    public function update($table, $idCol, $id, $values) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->update($table);
+        foreach ($values as $key => $value) {
+            $query->set($key, $query->createNamedParameter($value));
+        }
+        $query
+            ->where($query->expr()->eq($idCol, $query->createParameter($idCol)))
+            ->setParameter($idCol, $id)
+            ->execute();
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -104,10 +104,10 @@ 
 	 * @return array[] [['class' => string, 'priority' => int], ...]
 	 */
 	public function getSectionsFromDB($type) {
-		if($type === 'personal') {
+		if ($type === 'personal') {
 			$sectionsTable = self::TABLE_ADMIN_SECTIONS;
 			$settingsTable = self::TABLE_ADMIN_SETTINGS;
-		} else if($type === 'admin') {
+		} else if ($type === 'admin') {
 			$sectionsTable = self::TABLE_PERSONAL_SECTIONS;
 			$settingsTable = self::TABLE_PERSONAL_SETTINGS;
 		} else {
@@ -120,8 +120,8 @@ 
 			->from($settingsTable, 'f')
 			->where($query->expr()->eq('s.id', 'f.section'));
 		$result = $query->execute();
-		return array_map(function ($row) {
-			$row['priority'] = (int)$row['priority'];
+		return array_map(function($row) {
+			$row['priority'] = (int) $row['priority'];
 			return $row;
 		}, $result->fetchAll());
 	}
@@ -132,7 +132,7 @@ 
 	 */
 	public function add($table, array $values) {
 		$query = $this->dbc->getQueryBuilder();
-		$values = array_map(function ($value) use ($query) {
+		$values = array_map(function($value) use ($query) {
 			return $query->createNamedParameter($value);
 		}, $values);
 		$query->insert($table)->values($values);
@@ -153,7 +153,7 @@ 
 		$data = $resultStatement->fetchAll();
 		$resultStatement->closeCursor();
 
-		return array_map(function ($row) {
+		return array_map(function($row) {
 			return $row['class'];
 		}, $data);
 	}
@@ -176,7 +176,7 @@ 
 		$row = $result->fetch();
 		$result->closeCursor();
 
-		return (bool)$row;
+		return (bool) $row;
 	}
 
 	/**