nextcloud / server

lib/private/NavigationManager.php

Indentation +316 added lines, -316 removed lines

@@ -46,320 +46,320 @@
  */
 
 class NavigationManager implements INavigationManager {
-	protected $entries = [];
-	protected $closureEntries = [];
-	protected $activeEntry;
-	protected $unreadCounters = [];
-
-	/** @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;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function add($entry) {
-		if ($entry instanceof \Closure) {
-			$this->closureEntries[] = $entry;
-			return;
-		}
-
-		$entry['active'] = false;
-		if (!isset($entry['icon'])) {
-			$entry['icon'] = '';
-		}
-		if (!isset($entry['classes'])) {
-			$entry['classes'] = '';
-		}
-		if (!isset($entry['type'])) {
-			$entry['type'] = 'link';
-		}
-
-		$id = $entry['id'];
-		$entry['unread'] = isset($this->unreadCounters[$id]) ? $this->unreadCounters[$id] : 0;
-
-		$this->entries[$id] = $entry;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getAll(string $type = 'link'): array {
-		$this->init();
-		foreach ($this->closureEntries as $c) {
-			$this->add($c());
-		}
-		$this->closureEntries = [];
-
-		$result = $this->entries;
-		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
-				return $entry['type'] === $type;
-			});
-		}
-
-		return $this->proceedNavigation($result);
-	}
-
-	/**
-	 * Sort navigation entries by order, name and set active flag
-	 *
-	 * @param array $list
-	 * @return array
-	 */
-	private function proceedNavigation(array $list): array {
-		uasort($list, function ($a, $b) {
-			if (isset($a['order']) && isset($b['order'])) {
-				return ($a['order'] < $b['order']) ? -1 : 1;
-			} elseif (isset($a['order']) || isset($b['order'])) {
-				return isset($a['order']) ? -1 : 1;
-			} else {
-				return ($a['name'] < $b['name']) ? -1 : 1;
-			}
-		});
-
-		$activeApp = $this->getActiveEntry();
-		if ($activeApp !== null) {
-			foreach ($list as $index => &$navEntry) {
-				if ($navEntry['id'] == $activeApp) {
-					$navEntry['active'] = true;
-				} else {
-					$navEntry['active'] = false;
-				}
-			}
-			unset($navEntry);
-		}
-
-		return $list;
-	}
-
-
-	/**
-	 * removes all the entries
-	 */
-	public function clear($loadDefaultLinks = true) {
-		$this->entries = [];
-		$this->closureEntries = [];
-		$this->init = !$loadDefaultLinks;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function setActiveEntry($id) {
-		$this->activeEntry = $id;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getActiveEntry() {
-		return $this->activeEntry;
-	}
-
-	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' => 99998,
-				'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
-				'name' => $l->t('Help'),
-				'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
-			]);
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			// Accessibility settings
-			if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
-				$this->add([
-					'type' => 'settings',
-					'id' => 'accessibility_settings',
-					'order' => 2,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
-					'name' => $l->t('Appearance and accessibility'),
-					'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
-				]);
-			}
-			if ($this->isAdmin()) {
-				// App management
-				$this->add([
-					'type' => 'settings',
-					'id' => 'core_apps',
-					'order' => 5,
-					'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
-					'name' => $l->t('Apps'),
-				]);
-
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Personal settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
-				]);
-
-				// Admin settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'admin_settings',
-					'order' => 4,
-					'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
-					'name' => $l->t('Administration settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			} else {
-				// Personal settings
-				$this->add([
-					'type' => 'settings',
-					'id' => 'settings',
-					'order' => 3,
-					'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
-					'name' => $l->t('Settings'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
-				]);
-			}
-
-			$logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
-			if ($logoutUrl !== '') {
-				// Logout
-				$this->add([
-					'type' => 'settings',
-					'id' => 'logout',
-					'order' => 99999,
-					'href' => $logoutUrl,
-					'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' => 6,
-					'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
-					'name' => $l->t('Users'),
-					'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
-				]);
-			}
-		}
-
-		if ($this->appManager === 'null') {
-			return;
-		}
-
-		if ($this->userSession->isLoggedIn()) {
-			$apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
-		} else {
-			$apps = $this->appManager->getInstalledApps();
-		}
-
-		foreach ($apps as $app) {
-			if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
-				continue;
-			}
-
-			// load plugins and collections from info.xml
-			$info = $this->appManager->getAppInfo($app);
-			if (!isset($info['navigations']['navigation'])) {
-				continue;
-			}
-			foreach ($info['navigations']['navigation'] as $key => $nav) {
-				$nav['type'] = $nav['type'] ?? 'link';
-				if (!isset($nav['name'])) {
-					continue;
-				}
-				// Allow settings navigation items with no route entry, all other types require one
-				if (!isset($nav['route']) && $nav['type'] !== 'settings') {
-					continue;
-				}
-				$role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
-				if ($role === 'admin' && !$this->isAdmin()) {
-					continue;
-				}
-				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
-				$order = isset($nav['order']) ? $nav['order'] : 100;
-				$type = $nav['type'];
-				$route = !empty($nav['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']),
-				]);
-			}
-		}
-	}
-
-	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;
-	}
-
-	public function setUnreadCounter(string $id, int $unreadCounter): void {
-		$this->unreadCounters[$id] = $unreadCounter;
-	}
+    protected $entries = [];
+    protected $closureEntries = [];
+    protected $activeEntry;
+    protected $unreadCounters = [];
+
+    /** @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;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function add($entry) {
+        if ($entry instanceof \Closure) {
+            $this->closureEntries[] = $entry;
+            return;
+        }
+
+        $entry['active'] = false;
+        if (!isset($entry['icon'])) {
+            $entry['icon'] = '';
+        }
+        if (!isset($entry['classes'])) {
+            $entry['classes'] = '';
+        }
+        if (!isset($entry['type'])) {
+            $entry['type'] = 'link';
+        }
+
+        $id = $entry['id'];
+        $entry['unread'] = isset($this->unreadCounters[$id]) ? $this->unreadCounters[$id] : 0;
+
+        $this->entries[$id] = $entry;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAll(string $type = 'link'): array {
+        $this->init();
+        foreach ($this->closureEntries as $c) {
+            $this->add($c());
+        }
+        $this->closureEntries = [];
+
+        $result = $this->entries;
+        if ($type !== 'all') {
+            $result = array_filter($this->entries, function ($entry) use ($type) {
+                return $entry['type'] === $type;
+            });
+        }
+
+        return $this->proceedNavigation($result);
+    }
+
+    /**
+     * Sort navigation entries by order, name and set active flag
+     *
+     * @param array $list
+     * @return array
+     */
+    private function proceedNavigation(array $list): array {
+        uasort($list, function ($a, $b) {
+            if (isset($a['order']) && isset($b['order'])) {
+                return ($a['order'] < $b['order']) ? -1 : 1;
+            } elseif (isset($a['order']) || isset($b['order'])) {
+                return isset($a['order']) ? -1 : 1;
+            } else {
+                return ($a['name'] < $b['name']) ? -1 : 1;
+            }
+        });
+
+        $activeApp = $this->getActiveEntry();
+        if ($activeApp !== null) {
+            foreach ($list as $index => &$navEntry) {
+                if ($navEntry['id'] == $activeApp) {
+                    $navEntry['active'] = true;
+                } else {
+                    $navEntry['active'] = false;
+                }
+            }
+            unset($navEntry);
+        }
+
+        return $list;
+    }
+
+
+    /**
+     * removes all the entries
+     */
+    public function clear($loadDefaultLinks = true) {
+        $this->entries = [];
+        $this->closureEntries = [];
+        $this->init = !$loadDefaultLinks;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function setActiveEntry($id) {
+        $this->activeEntry = $id;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getActiveEntry() {
+        return $this->activeEntry;
+    }
+
+    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' => 99998,
+                'href' => $this->urlGenerator->linkToRoute('settings.Help.help'),
+                'name' => $l->t('Help'),
+                'icon' => $this->urlGenerator->imagePath('settings', 'help.svg'),
+            ]);
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            // Accessibility settings
+            if ($this->appManager->isEnabledForUser('theming', $this->userSession->getUser())) {
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'accessibility_settings',
+                    'order' => 2,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index', ['section' => 'theming']),
+                    'name' => $l->t('Appearance and accessibility'),
+                    'icon' => $this->urlGenerator->imagePath('theming', 'accessibility-dark.svg'),
+                ]);
+            }
+            if ($this->isAdmin()) {
+                // App management
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'core_apps',
+                    'order' => 5,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AppSettings.viewApps'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'apps.svg'),
+                    'name' => $l->t('Apps'),
+                ]);
+
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Personal settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'personal.svg'),
+                ]);
+
+                // Admin settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'admin_settings',
+                    'order' => 4,
+                    'href' => $this->urlGenerator->linkToRoute('settings.AdminSettings.index', ['section' => 'overview']),
+                    'name' => $l->t('Administration settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            } else {
+                // Personal settings
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'settings',
+                    'order' => 3,
+                    'href' => $this->urlGenerator->linkToRoute('settings.PersonalSettings.index'),
+                    'name' => $l->t('Settings'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'admin.svg'),
+                ]);
+            }
+
+            $logoutUrl = \OC_User::getLogoutUrl($this->urlGenerator);
+            if ($logoutUrl !== '') {
+                // Logout
+                $this->add([
+                    'type' => 'settings',
+                    'id' => 'logout',
+                    'order' => 99999,
+                    'href' => $logoutUrl,
+                    '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' => 6,
+                    'href' => $this->urlGenerator->linkToRoute('settings.Users.usersList'),
+                    'name' => $l->t('Users'),
+                    'icon' => $this->urlGenerator->imagePath('settings', 'users.svg'),
+                ]);
+            }
+        }
+
+        if ($this->appManager === 'null') {
+            return;
+        }
+
+        if ($this->userSession->isLoggedIn()) {
+            $apps = $this->appManager->getEnabledAppsForUser($this->userSession->getUser());
+        } else {
+            $apps = $this->appManager->getInstalledApps();
+        }
+
+        foreach ($apps as $app) {
+            if (!$this->userSession->isLoggedIn() && !$this->appManager->isEnabledForUser($app, $this->userSession->getUser())) {
+                continue;
+            }
+
+            // load plugins and collections from info.xml
+            $info = $this->appManager->getAppInfo($app);
+            if (!isset($info['navigations']['navigation'])) {
+                continue;
+            }
+            foreach ($info['navigations']['navigation'] as $key => $nav) {
+                $nav['type'] = $nav['type'] ?? 'link';
+                if (!isset($nav['name'])) {
+                    continue;
+                }
+                // Allow settings navigation items with no route entry, all other types require one
+                if (!isset($nav['route']) && $nav['type'] !== 'settings') {
+                    continue;
+                }
+                $role = isset($nav['@attributes']['role']) ? $nav['@attributes']['role'] : 'all';
+                if ($role === 'admin' && !$this->isAdmin()) {
+                    continue;
+                }
+                $l = $this->l10nFac->get($app);
+                $id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+                $order = isset($nav['order']) ? $nav['order'] : 100;
+                $type = $nav['type'];
+                $route = !empty($nav['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']),
+                ]);
+            }
+        }
+    }
+
+    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;
+    }
+
+    public function setUnreadCounter(string $id, int $unreadCounter): void {
+        $this->unreadCounters[$id] = $unreadCounter;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -118,7 +118,7 @@ 
 
 		$result = $this->entries;
 		if ($type !== 'all') {
-			$result = array_filter($this->entries, function ($entry) use ($type) {
+			$result = array_filter($this->entries, function($entry) use ($type) {
 				return $entry['type'] === $type;
 			});
 		}
@@ -133,7 +133,7 @@ 
 	 * @return array
 	 */
 	private function proceedNavigation(array $list): array {
-		uasort($list, function ($a, $b) {
+		uasort($list, function($a, $b) {
 			if (isset($a['order']) && isset($b['order'])) {
 				return ($a['order'] < $b['order']) ? -1 : 1;
 			} elseif (isset($a['order']) || isset($b['order'])) {
@@ -314,7 +314,7 @@ 
 					continue;
 				}
 				$l = $this->l10nFac->get($app);
-				$id = $nav['id'] ?? $app . ($key === 0 ? '' : $key);
+				$id = $nav['id'] ?? $app.($key === 0 ? '' : $key);
 				$order = isset($nav['order']) ? $nav['order'] : 100;
 				$type = $nav['type'];
 				$route = !empty($nav['route']) ? $this->urlGenerator->linkToRoute($nav['route']) : '';

lib/private/App/InfoParser.php

Indentation +234 added lines, -234 removed lines

@@ -34,254 +34,254 @@
 use function simplexml_load_file;
 
 class InfoParser {
-	/** @var \OCP\ICache|null */
-	private $cache;
+    /** @var \OCP\ICache|null */
+    private $cache;
 
-	/**
-	 * @param ICache|null $cache
-	 */
-	public function __construct(ICache $cache = null) {
-		$this->cache = $cache;
-	}
+    /**
+     * @param ICache|null $cache
+     */
+    public function __construct(ICache $cache = null) {
+        $this->cache = $cache;
+    }
 
-	/**
-	 * @param string $file the xml file to be loaded
-	 * @return null|array where null is an indicator for an error
-	 */
-	public function parse($file) {
-		if (!file_exists($file)) {
-			return null;
-		}
+    /**
+     * @param string $file the xml file to be loaded
+     * @return null|array where null is an indicator for an error
+     */
+    public function parse($file) {
+        if (!file_exists($file)) {
+            return null;
+        }
 
-		if ($this->cache !== null) {
-			$fileCacheKey = $file . filemtime($file);
-			if ($cachedValue = $this->cache->get($fileCacheKey)) {
-				return json_decode($cachedValue, true);
-			}
-		}
+        if ($this->cache !== null) {
+            $fileCacheKey = $file . filemtime($file);
+            if ($cachedValue = $this->cache->get($fileCacheKey)) {
+                return json_decode($cachedValue, true);
+            }
+        }
 
-		libxml_use_internal_errors(true);
-		if ((PHP_VERSION_ID < 80000)) {
-			$loadEntities = libxml_disable_entity_loader(false);
-			$xml = simplexml_load_file($file);
-			libxml_disable_entity_loader($loadEntities);
-		} else {
-			$xml = simplexml_load_file($file);
-		}
+        libxml_use_internal_errors(true);
+        if ((PHP_VERSION_ID < 80000)) {
+            $loadEntities = libxml_disable_entity_loader(false);
+            $xml = simplexml_load_file($file);
+            libxml_disable_entity_loader($loadEntities);
+        } else {
+            $xml = simplexml_load_file($file);
+        }
 
-		if ($xml === false) {
-			libxml_clear_errors();
-			return null;
-		}
-		$array = $this->xmlToArray($xml);
+        if ($xml === false) {
+            libxml_clear_errors();
+            return null;
+        }
+        $array = $this->xmlToArray($xml);
 
-		if (is_null($array)) {
-			return null;
-		}
+        if (is_null($array)) {
+            return null;
+        }
 
-		if (!array_key_exists('info', $array)) {
-			$array['info'] = [];
-		}
-		if (!array_key_exists('remote', $array)) {
-			$array['remote'] = [];
-		}
-		if (!array_key_exists('public', $array)) {
-			$array['public'] = [];
-		}
-		if (!array_key_exists('types', $array)) {
-			$array['types'] = [];
-		}
-		if (!array_key_exists('repair-steps', $array)) {
-			$array['repair-steps'] = [];
-		}
-		if (!array_key_exists('install', $array['repair-steps'])) {
-			$array['repair-steps']['install'] = [];
-		}
-		if (!array_key_exists('pre-migration', $array['repair-steps'])) {
-			$array['repair-steps']['pre-migration'] = [];
-		}
-		if (!array_key_exists('post-migration', $array['repair-steps'])) {
-			$array['repair-steps']['post-migration'] = [];
-		}
-		if (!array_key_exists('live-migration', $array['repair-steps'])) {
-			$array['repair-steps']['live-migration'] = [];
-		}
-		if (!array_key_exists('uninstall', $array['repair-steps'])) {
-			$array['repair-steps']['uninstall'] = [];
-		}
-		if (!array_key_exists('background-jobs', $array)) {
-			$array['background-jobs'] = [];
-		}
-		if (!array_key_exists('two-factor-providers', $array)) {
-			$array['two-factor-providers'] = [];
-		}
-		if (!array_key_exists('commands', $array)) {
-			$array['commands'] = [];
-		}
-		if (!array_key_exists('activity', $array)) {
-			$array['activity'] = [];
-		}
-		if (!array_key_exists('filters', $array['activity'])) {
-			$array['activity']['filters'] = [];
-		}
-		if (!array_key_exists('settings', $array['activity'])) {
-			$array['activity']['settings'] = [];
-		}
-		if (!array_key_exists('providers', $array['activity'])) {
-			$array['activity']['providers'] = [];
-		}
-		if (!array_key_exists('settings', $array)) {
-			$array['settings'] = [];
-		}
-		if (!array_key_exists('admin', $array['settings'])) {
-			$array['settings']['admin'] = [];
-		}
-		if (!array_key_exists('admin-section', $array['settings'])) {
-			$array['settings']['admin-section'] = [];
-		}
-		if (!array_key_exists('personal', $array['settings'])) {
-			$array['settings']['personal'] = [];
-		}
-		if (!array_key_exists('personal-section', $array['settings'])) {
-			$array['settings']['personal-section'] = [];
-		}
+        if (!array_key_exists('info', $array)) {
+            $array['info'] = [];
+        }
+        if (!array_key_exists('remote', $array)) {
+            $array['remote'] = [];
+        }
+        if (!array_key_exists('public', $array)) {
+            $array['public'] = [];
+        }
+        if (!array_key_exists('types', $array)) {
+            $array['types'] = [];
+        }
+        if (!array_key_exists('repair-steps', $array)) {
+            $array['repair-steps'] = [];
+        }
+        if (!array_key_exists('install', $array['repair-steps'])) {
+            $array['repair-steps']['install'] = [];
+        }
+        if (!array_key_exists('pre-migration', $array['repair-steps'])) {
+            $array['repair-steps']['pre-migration'] = [];
+        }
+        if (!array_key_exists('post-migration', $array['repair-steps'])) {
+            $array['repair-steps']['post-migration'] = [];
+        }
+        if (!array_key_exists('live-migration', $array['repair-steps'])) {
+            $array['repair-steps']['live-migration'] = [];
+        }
+        if (!array_key_exists('uninstall', $array['repair-steps'])) {
+            $array['repair-steps']['uninstall'] = [];
+        }
+        if (!array_key_exists('background-jobs', $array)) {
+            $array['background-jobs'] = [];
+        }
+        if (!array_key_exists('two-factor-providers', $array)) {
+            $array['two-factor-providers'] = [];
+        }
+        if (!array_key_exists('commands', $array)) {
+            $array['commands'] = [];
+        }
+        if (!array_key_exists('activity', $array)) {
+            $array['activity'] = [];
+        }
+        if (!array_key_exists('filters', $array['activity'])) {
+            $array['activity']['filters'] = [];
+        }
+        if (!array_key_exists('settings', $array['activity'])) {
+            $array['activity']['settings'] = [];
+        }
+        if (!array_key_exists('providers', $array['activity'])) {
+            $array['activity']['providers'] = [];
+        }
+        if (!array_key_exists('settings', $array)) {
+            $array['settings'] = [];
+        }
+        if (!array_key_exists('admin', $array['settings'])) {
+            $array['settings']['admin'] = [];
+        }
+        if (!array_key_exists('admin-section', $array['settings'])) {
+            $array['settings']['admin-section'] = [];
+        }
+        if (!array_key_exists('personal', $array['settings'])) {
+            $array['settings']['personal'] = [];
+        }
+        if (!array_key_exists('personal-section', $array['settings'])) {
+            $array['settings']['personal-section'] = [];
+        }
 
-		if (array_key_exists('types', $array)) {
-			if (is_array($array['types'])) {
-				foreach ($array['types'] as $type => $v) {
-					unset($array['types'][$type]);
-					if (is_string($type)) {
-						$array['types'][] = $type;
-					}
-				}
-			} else {
-				$array['types'] = [];
-			}
-		}
-		if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
-			$array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
-		}
-		if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
-			$array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
-		}
-		if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
-			$array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
-		}
-		if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
-			$array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
-		}
-		if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
-			$array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
-		}
-		if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
-			$array['background-jobs'] = $array['background-jobs']['job'];
-		}
-		if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
-			$array['commands'] = $array['commands']['command'];
-		}
-		if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
-			$array['two-factor-providers'] = $array['two-factor-providers']['provider'];
-		}
-		if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
-			$array['activity']['filters'] = $array['activity']['filters']['filter'];
-		}
-		if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
-			$array['activity']['settings'] = $array['activity']['settings']['setting'];
-		}
-		if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
-			$array['activity']['providers'] = $array['activity']['providers']['provider'];
-		}
-		if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
-			&& !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
-		) {
-			$array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
-		}
-		if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
-			$array['settings']['admin'] = [$array['settings']['admin']];
-		}
-		if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
-			$array['settings']['admin-section'] = [$array['settings']['admin-section']];
-		}
-		if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
-			$array['settings']['personal'] = [$array['settings']['personal']];
-		}
-		if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
-			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
-		}
+        if (array_key_exists('types', $array)) {
+            if (is_array($array['types'])) {
+                foreach ($array['types'] as $type => $v) {
+                    unset($array['types'][$type]);
+                    if (is_string($type)) {
+                        $array['types'][] = $type;
+                    }
+                }
+            } else {
+                $array['types'] = [];
+            }
+        }
+        if (isset($array['repair-steps']['install']['step']) && is_array($array['repair-steps']['install']['step'])) {
+            $array['repair-steps']['install'] = $array['repair-steps']['install']['step'];
+        }
+        if (isset($array['repair-steps']['pre-migration']['step']) && is_array($array['repair-steps']['pre-migration']['step'])) {
+            $array['repair-steps']['pre-migration'] = $array['repair-steps']['pre-migration']['step'];
+        }
+        if (isset($array['repair-steps']['post-migration']['step']) && is_array($array['repair-steps']['post-migration']['step'])) {
+            $array['repair-steps']['post-migration'] = $array['repair-steps']['post-migration']['step'];
+        }
+        if (isset($array['repair-steps']['live-migration']['step']) && is_array($array['repair-steps']['live-migration']['step'])) {
+            $array['repair-steps']['live-migration'] = $array['repair-steps']['live-migration']['step'];
+        }
+        if (isset($array['repair-steps']['uninstall']['step']) && is_array($array['repair-steps']['uninstall']['step'])) {
+            $array['repair-steps']['uninstall'] = $array['repair-steps']['uninstall']['step'];
+        }
+        if (isset($array['background-jobs']['job']) && is_array($array['background-jobs']['job'])) {
+            $array['background-jobs'] = $array['background-jobs']['job'];
+        }
+        if (isset($array['commands']['command']) && is_array($array['commands']['command'])) {
+            $array['commands'] = $array['commands']['command'];
+        }
+        if (isset($array['two-factor-providers']['provider']) && is_array($array['two-factor-providers']['provider'])) {
+            $array['two-factor-providers'] = $array['two-factor-providers']['provider'];
+        }
+        if (isset($array['activity']['filters']['filter']) && is_array($array['activity']['filters']['filter'])) {
+            $array['activity']['filters'] = $array['activity']['filters']['filter'];
+        }
+        if (isset($array['activity']['settings']['setting']) && is_array($array['activity']['settings']['setting'])) {
+            $array['activity']['settings'] = $array['activity']['settings']['setting'];
+        }
+        if (isset($array['activity']['providers']['provider']) && is_array($array['activity']['providers']['provider'])) {
+            $array['activity']['providers'] = $array['activity']['providers']['provider'];
+        }
+        if (isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && is_array($array['collaboration']['collaborators']['searchPlugins']['searchPlugin'])
+            && !isset($array['collaboration']['collaborators']['searchPlugins']['searchPlugin']['class'])
+        ) {
+            $array['collaboration']['collaborators']['searchPlugins'] = $array['collaboration']['collaborators']['searchPlugins']['searchPlugin'];
+        }
+        if (isset($array['settings']['admin']) && !is_array($array['settings']['admin'])) {
+            $array['settings']['admin'] = [$array['settings']['admin']];
+        }
+        if (isset($array['settings']['admin-section']) && !is_array($array['settings']['admin-section'])) {
+            $array['settings']['admin-section'] = [$array['settings']['admin-section']];
+        }
+        if (isset($array['settings']['personal']) && !is_array($array['settings']['personal'])) {
+            $array['settings']['personal'] = [$array['settings']['personal']];
+        }
+        if (isset($array['settings']['personal-section']) && !is_array($array['settings']['personal-section'])) {
+            $array['settings']['personal-section'] = [$array['settings']['personal-section']];
+        }
 
-		if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
-			$array['navigations']['navigation'] = [$array['navigations']['navigation']];
-		}
+        if (isset($array['navigations']['navigation']) && $this->isNavigationItem($array['navigations']['navigation'])) {
+            $array['navigations']['navigation'] = [$array['navigations']['navigation']];
+        }
 
-		if ($this->cache !== null) {
-			$this->cache->set($fileCacheKey, json_encode($array));
-		}
-		return $array;
-	}
+        if ($this->cache !== null) {
+            $this->cache->set($fileCacheKey, json_encode($array));
+        }
+        return $array;
+    }
 
-	/**
-	 * @param $data
-	 * @return bool
-	 */
-	private function isNavigationItem($data): bool {
-		// Allow settings navigation items with no route entry
-		$type = $data['type'] ?? 'link';
-		if ($type === 'settings') {
-			return isset($data['name']);
-		}
-		return isset($data['name'], $data['route']);
-	}
+    /**
+     * @param $data
+     * @return bool
+     */
+    private function isNavigationItem($data): bool {
+        // Allow settings navigation items with no route entry
+        $type = $data['type'] ?? 'link';
+        if ($type === 'settings') {
+            return isset($data['name']);
+        }
+        return isset($data['name'], $data['route']);
+    }
 
-	/**
-	 * @param \SimpleXMLElement $xml
-	 * @return array
-	 */
-	public function xmlToArray($xml) {
-		if (!$xml->children()) {
-			return (string)$xml;
-		}
+    /**
+     * @param \SimpleXMLElement $xml
+     * @return array
+     */
+    public function xmlToArray($xml) {
+        if (!$xml->children()) {
+            return (string)$xml;
+        }
 
-		$array = [];
-		foreach ($xml->children() as $element => $node) {
-			$totalElement = count($xml->{$element});
+        $array = [];
+        foreach ($xml->children() as $element => $node) {
+            $totalElement = count($xml->{$element});
 
-			if (!isset($array[$element])) {
-				$array[$element] = $totalElement > 1 ? [] : "";
-			}
-			/** @var \SimpleXMLElement $node */
-			// Has attributes
-			if ($attributes = $node->attributes()) {
-				$data = [
-					'@attributes' => [],
-				];
-				if (!count($node->children())) {
-					$value = (string)$node;
-					if (!empty($value)) {
-						$data['@value'] = $value;
-					}
-				} else {
-					$data = array_merge($data, $this->xmlToArray($node));
-				}
-				foreach ($attributes as $attr => $value) {
-					$data['@attributes'][$attr] = (string)$value;
-				}
+            if (!isset($array[$element])) {
+                $array[$element] = $totalElement > 1 ? [] : "";
+            }
+            /** @var \SimpleXMLElement $node */
+            // Has attributes
+            if ($attributes = $node->attributes()) {
+                $data = [
+                    '@attributes' => [],
+                ];
+                if (!count($node->children())) {
+                    $value = (string)$node;
+                    if (!empty($value)) {
+                        $data['@value'] = $value;
+                    }
+                } else {
+                    $data = array_merge($data, $this->xmlToArray($node));
+                }
+                foreach ($attributes as $attr => $value) {
+                    $data['@attributes'][$attr] = (string)$value;
+                }
 
-				if ($totalElement > 1) {
-					$array[$element][] = $data;
-				} else {
-					$array[$element] = $data;
-				}
-			// Just a value
-			} else {
-				if ($totalElement > 1) {
-					$array[$element][] = $this->xmlToArray($node);
-				} else {
-					$array[$element] = $this->xmlToArray($node);
-				}
-			}
-		}
+                if ($totalElement > 1) {
+                    $array[$element][] = $data;
+                } else {
+                    $array[$element] = $data;
+                }
+            // Just a value
+            } else {
+                if ($totalElement > 1) {
+                    $array[$element][] = $this->xmlToArray($node);
+                } else {
+                    $array[$element] = $this->xmlToArray($node);
+                }
+            }
+        }
 
-		return $array;
-	}
+        return $array;
+    }
 }