Completed
Pull Request — master (#4890)
by Blizzz
15:44
created
settings/Controller/AdminSettingsController.php 1 patch
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -35,83 +35,83 @@
 block discarded – undo
35 35
  * @package OC\Settings\Controller
36 36
  */
37 37
 class AdminSettingsController extends Controller {
38
-	use CommonSettingsTrait;
38
+    use CommonSettingsTrait;
39 39
 
40
-	/** @var INavigationManager */
41
-	private $navigationManager;
42
-	/** @var ISettingsManager */
43
-	private $settingsManager;
40
+    /** @var INavigationManager */
41
+    private $navigationManager;
42
+    /** @var ISettingsManager */
43
+    private $settingsManager;
44 44
 
45
-	/**
46
-	 * @param string $appName
47
-	 * @param IRequest $request
48
-	 * @param INavigationManager $navigationManager
49
-	 * @param ISettingsManager $settingsManager
50
-	 */
51
-	public function __construct(
52
-		$appName,
53
-		IRequest $request,
54
-		INavigationManager $navigationManager,
55
-		ISettingsManager $settingsManager
56
-	) {
57
-		parent::__construct($appName, $request);
58
-		$this->navigationManager = $navigationManager;
59
-		$this->settingsManager = $settingsManager;
60
-	}
45
+    /**
46
+     * @param string $appName
47
+     * @param IRequest $request
48
+     * @param INavigationManager $navigationManager
49
+     * @param ISettingsManager $settingsManager
50
+     */
51
+    public function __construct(
52
+        $appName,
53
+        IRequest $request,
54
+        INavigationManager $navigationManager,
55
+        ISettingsManager $settingsManager
56
+    ) {
57
+        parent::__construct($appName, $request);
58
+        $this->navigationManager = $navigationManager;
59
+        $this->settingsManager = $settingsManager;
60
+    }
61 61
 
62
-	/**
63
-	 * @param string $section
64
-	 * @return TemplateResponse
65
-	 *
66
-	 * @NoCSRFRequired
67
-	 */
68
-	public function index($section) {
69
-		$this->navigationManager->setActiveEntry('admin');
70
-		return $this->getIndexResponse($section);
71
-	}
62
+    /**
63
+     * @param string $section
64
+     * @return TemplateResponse
65
+     *
66
+     * @NoCSRFRequired
67
+     */
68
+    public function index($section) {
69
+        $this->navigationManager->setActiveEntry('admin');
70
+        return $this->getIndexResponse($section);
71
+    }
72 72
 
73
-	/**
74
-	 * @param string $section
75
-	 * @return array
76
-	 */
77
-	protected function getSettings($section) {
78
-		$settings = $this->settingsManager->getAdminSettings($section);
79
-		$formatted = $this->formatSettings($settings);
80
-		if($section === 'additional') {
81
-			$formatted['content'] .= $this->getLegacyForms();
82
-		}
83
-		return $formatted;
84
-	}
73
+    /**
74
+     * @param string $section
75
+     * @return array
76
+     */
77
+    protected function getSettings($section) {
78
+        $settings = $this->settingsManager->getAdminSettings($section);
79
+        $formatted = $this->formatSettings($settings);
80
+        if($section === 'additional') {
81
+            $formatted['content'] .= $this->getLegacyForms();
82
+        }
83
+        return $formatted;
84
+    }
85 85
 
86
-	/**
87
-	 * @return bool|string
88
-	 */
89
-	private function getLegacyForms() {
90
-		$forms = \OC_App::getForms('admin');
86
+    /**
87
+     * @return bool|string
88
+     */
89
+    private function getLegacyForms() {
90
+        $forms = \OC_App::getForms('admin');
91 91
 
92
-		$forms = array_map(function ($form) {
93
-			if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
94
-				$sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
95
-				$sectionName = str_replace('</h2>', '', $sectionName);
96
-				$anchor = strtolower($sectionName);
97
-				$anchor = str_replace(' ', '-', $anchor);
92
+        $forms = array_map(function ($form) {
93
+            if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
94
+                $sectionName = str_replace('<h2' . $regs['class'] . '>', '', $regs[0]);
95
+                $sectionName = str_replace('</h2>', '', $sectionName);
96
+                $anchor = strtolower($sectionName);
97
+                $anchor = str_replace(' ', '-', $anchor);
98 98
 
99
-				return array(
100
-					'anchor' => $anchor,
101
-					'section-name' => $sectionName,
102
-					'form' => $form
103
-				);
104
-			}
105
-			return array(
106
-				'form' => $form
107
-			);
108
-		}, $forms);
99
+                return array(
100
+                    'anchor' => $anchor,
101
+                    'section-name' => $sectionName,
102
+                    'form' => $form
103
+                );
104
+            }
105
+            return array(
106
+                'form' => $form
107
+            );
108
+        }, $forms);
109 109
 
110
-		$out = new Template('settings', 'settings/additional');
111
-		$out->assign('forms', $forms);
110
+        $out = new Template('settings', 'settings/additional');
111
+        $out->assign('forms', $forms);
112 112
 
113
-		return $out->fetchPage();
114
-	}
113
+        return $out->fetchPage();
114
+    }
115 115
 
116 116
 
117 117
 }
Please login to merge, or discard this patch.
settings/Controller/CommonSettingsTrait.php 1 patch
Indentation   +91 added lines, -91 removed lines patch added patch discarded remove patch
@@ -29,95 +29,95 @@
 block discarded – undo
29 29
 use OCP\Settings\ISettings;
30 30
 
31 31
 trait CommonSettingsTrait  {
32
-	/** @var ISettingsManager */
33
-	private $settingsManager;
34
-
35
-	/**
36
-	 * @param string $currentSection
37
-	 * @return array
38
-	 */
39
-	private function getNavigationParameters($currentSection) {
40
-		$templateParameters = [
41
-			'personal' => $this->formatPersonalSections($currentSection),
42
-			'admin' => []
43
-		];
44
-
45
-		if(\OC_User::isAdminUser(\OC_User::getUser())) {
46
-			$templateParameters['admin'] = $this->formatAdminSections($currentSection);
47
-		}
48
-
49
-		return [
50
-			'forms' => $templateParameters
51
-		];
52
-	}
53
-
54
-	protected function formatSections($sections, $currentSection, $type) {
55
-		$templateParameters = [];
56
-		/** @var \OCP\Settings\ISection[] $prioritizedSections */
57
-		foreach($sections as $prioritizedSections) {
58
-			foreach ($prioritizedSections as $section) {
59
-				if($type === 'admin') {
60
-					$settings = $this->settingsManager->getAdminSettings($section->getID());
61
-				} else if($type === 'personal') {
62
-					$settings = $this->settingsManager->getPersonalSettings($section->getID());
63
-				}
64
-				if (empty($settings)) {
65
-					continue;
66
-				}
67
-
68
-				$icon = '';
69
-				if ($section instanceof IIconSection) {
70
-					$icon = $section->getIcon();
71
-				}
72
-
73
-				$templateParameters[] = [
74
-					'anchor'       => $section->getID(),
75
-					'section-name' => $section->getName(),
76
-					'active'       => $section->getID() === $currentSection,
77
-					'icon'         => $icon,
78
-				];
79
-			}
80
-		}
81
-		return $templateParameters;
82
-	}
83
-
84
-	protected function formatPersonalSections($currentSections) {
85
-		$sections = $this->settingsManager->getPersonalSections();
86
-		$templateParameters = $this->formatSections($sections, $currentSections, 'personal');
87
-
88
-		return $templateParameters;
89
-	}
90
-
91
-	protected function formatAdminSections($currentSections) {
92
-		$sections = $this->settingsManager->getAdminSections();
93
-		$templateParameters = $this->formatSections($sections, $currentSections, 'admin');
94
-
95
-		return $templateParameters;
96
-	}
97
-
98
-	/**
99
-	 * @param ISettings[] $settings
100
-	 * @return array
101
-	 */
102
-	private function formatSettings($settings) {
103
-		$html = '';
104
-		foreach ($settings as $prioritizedSettings) {
105
-			foreach ($prioritizedSettings as $setting) {
106
-				/** @var \OCP\Settings\ISettings $setting */
107
-				$form = $setting->getForm();
108
-				$html .= $form->renderAs('')->render();
109
-			}
110
-		}
111
-		return ['content' => $html];
112
-	}
113
-
114
-	private function getIndexResponse($section) {
115
-		$templateParams = [];
116
-		$templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
117
-		$templateParams = array_merge($templateParams, $this->getSettings($section));
118
-
119
-		return new TemplateResponse('settings', 'settings/frame', $templateParams);
120
-	}
121
-
122
-	abstract protected function getSettings($section);
32
+    /** @var ISettingsManager */
33
+    private $settingsManager;
34
+
35
+    /**
36
+     * @param string $currentSection
37
+     * @return array
38
+     */
39
+    private function getNavigationParameters($currentSection) {
40
+        $templateParameters = [
41
+            'personal' => $this->formatPersonalSections($currentSection),
42
+            'admin' => []
43
+        ];
44
+
45
+        if(\OC_User::isAdminUser(\OC_User::getUser())) {
46
+            $templateParameters['admin'] = $this->formatAdminSections($currentSection);
47
+        }
48
+
49
+        return [
50
+            'forms' => $templateParameters
51
+        ];
52
+    }
53
+
54
+    protected function formatSections($sections, $currentSection, $type) {
55
+        $templateParameters = [];
56
+        /** @var \OCP\Settings\ISection[] $prioritizedSections */
57
+        foreach($sections as $prioritizedSections) {
58
+            foreach ($prioritizedSections as $section) {
59
+                if($type === 'admin') {
60
+                    $settings = $this->settingsManager->getAdminSettings($section->getID());
61
+                } else if($type === 'personal') {
62
+                    $settings = $this->settingsManager->getPersonalSettings($section->getID());
63
+                }
64
+                if (empty($settings)) {
65
+                    continue;
66
+                }
67
+
68
+                $icon = '';
69
+                if ($section instanceof IIconSection) {
70
+                    $icon = $section->getIcon();
71
+                }
72
+
73
+                $templateParameters[] = [
74
+                    'anchor'       => $section->getID(),
75
+                    'section-name' => $section->getName(),
76
+                    'active'       => $section->getID() === $currentSection,
77
+                    'icon'         => $icon,
78
+                ];
79
+            }
80
+        }
81
+        return $templateParameters;
82
+    }
83
+
84
+    protected function formatPersonalSections($currentSections) {
85
+        $sections = $this->settingsManager->getPersonalSections();
86
+        $templateParameters = $this->formatSections($sections, $currentSections, 'personal');
87
+
88
+        return $templateParameters;
89
+    }
90
+
91
+    protected function formatAdminSections($currentSections) {
92
+        $sections = $this->settingsManager->getAdminSections();
93
+        $templateParameters = $this->formatSections($sections, $currentSections, 'admin');
94
+
95
+        return $templateParameters;
96
+    }
97
+
98
+    /**
99
+     * @param ISettings[] $settings
100
+     * @return array
101
+     */
102
+    private function formatSettings($settings) {
103
+        $html = '';
104
+        foreach ($settings as $prioritizedSettings) {
105
+            foreach ($prioritizedSettings as $setting) {
106
+                /** @var \OCP\Settings\ISettings $setting */
107
+                $form = $setting->getForm();
108
+                $html .= $form->renderAs('')->render();
109
+            }
110
+        }
111
+        return ['content' => $html];
112
+    }
113
+
114
+    private function getIndexResponse($section) {
115
+        $templateParams = [];
116
+        $templateParams = array_merge($templateParams, $this->getNavigationParameters($section));
117
+        $templateParams = array_merge($templateParams, $this->getSettings($section));
118
+
119
+        return new TemplateResponse('settings', 'settings/frame', $templateParams);
120
+    }
121
+
122
+    abstract protected function getSettings($section);
123 123
 }
Please login to merge, or discard this patch.
apps/files_external/lib/AppInfo/Application.php 1 patch
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -41,89 +41,89 @@
 block discarded – undo
41 41
  */
42 42
 class Application extends App implements IBackendProvider, IAuthMechanismProvider {
43 43
 
44
-	public function __construct(array $urlParams = array()) {
45
-		parent::__construct('files_external', $urlParams);
46
-
47
-		$container = $this->getContainer();
48
-
49
-		$container->registerService('OCP\Files\Config\IUserMountCache', function (IAppContainer $c) {
50
-			return $c->getServer()->query('UserMountCache');
51
-		});
52
-
53
-		$backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
54
-		$backendService->registerBackendProvider($this);
55
-		$backendService->registerAuthMechanismProvider($this);
56
-
57
-		// force-load auth mechanisms since some will register hooks
58
-		// TODO: obsolete these and use the TokenProvider to get the user's password from the session
59
-		$this->getAuthMechanisms();
60
-
61
-		// app developers: do NOT depend on this! it will disappear with oC 9.0!
62
-		\OC::$server->getEventDispatcher()->dispatch(
63
-			'OCA\\Files_External::loadAdditionalBackends'
64
-		);
65
-	}
66
-
67
-	/**
68
-	 * @{inheritdoc}
69
-	 */
70
-	public function getBackends() {
71
-		$container = $this->getContainer();
72
-
73
-		$backends = [
74
-			$container->query('OCA\Files_External\Lib\Backend\Local'),
75
-			$container->query('OCA\Files_External\Lib\Backend\FTP'),
76
-			$container->query('OCA\Files_External\Lib\Backend\DAV'),
77
-			$container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
78
-			$container->query('OCA\Files_External\Lib\Backend\SFTP'),
79
-			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
80
-			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
81
-			$container->query('OCA\Files_External\Lib\Backend\Google'),
82
-			$container->query('OCA\Files_External\Lib\Backend\Swift'),
83
-			$container->query('OCA\Files_External\Lib\Backend\SFTP_Key'),
84
-			$container->query('OCA\Files_External\Lib\Backend\SMB'),
85
-			$container->query('OCA\Files_External\Lib\Backend\SMB_OC'),
86
-		];
87
-
88
-		return $backends;
89
-	}
90
-
91
-	/**
92
-	 * @{inheritdoc}
93
-	 */
94
-	public function getAuthMechanisms() {
95
-		$container = $this->getContainer();
96
-
97
-		return [
98
-			// AuthMechanism::SCHEME_NULL mechanism
99
-			$container->query('OCA\Files_External\Lib\Auth\NullMechanism'),
100
-
101
-			// AuthMechanism::SCHEME_BUILTIN mechanism
102
-			$container->query('OCA\Files_External\Lib\Auth\Builtin'),
103
-
104
-			// AuthMechanism::SCHEME_PASSWORD mechanisms
105
-			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
106
-			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
107
-			$container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'),
108
-			$container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'),
109
-			$container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'),
110
-
111
-			// AuthMechanism::SCHEME_OAUTH1 mechanisms
112
-			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
113
-
114
-			// AuthMechanism::SCHEME_OAUTH2 mechanisms
115
-			$container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
116
-
117
-			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
118
-			$container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'),
119
-
120
-			// AuthMechanism::SCHEME_OPENSTACK mechanisms
121
-			$container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
122
-			$container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
123
-
124
-			// Specialized mechanisms
125
-			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
126
-		];
127
-	}
44
+    public function __construct(array $urlParams = array()) {
45
+        parent::__construct('files_external', $urlParams);
46
+
47
+        $container = $this->getContainer();
48
+
49
+        $container->registerService('OCP\Files\Config\IUserMountCache', function (IAppContainer $c) {
50
+            return $c->getServer()->query('UserMountCache');
51
+        });
52
+
53
+        $backendService = $container->query('OCA\\Files_External\\Service\\BackendService');
54
+        $backendService->registerBackendProvider($this);
55
+        $backendService->registerAuthMechanismProvider($this);
56
+
57
+        // force-load auth mechanisms since some will register hooks
58
+        // TODO: obsolete these and use the TokenProvider to get the user's password from the session
59
+        $this->getAuthMechanisms();
60
+
61
+        // app developers: do NOT depend on this! it will disappear with oC 9.0!
62
+        \OC::$server->getEventDispatcher()->dispatch(
63
+            'OCA\\Files_External::loadAdditionalBackends'
64
+        );
65
+    }
66
+
67
+    /**
68
+     * @{inheritdoc}
69
+     */
70
+    public function getBackends() {
71
+        $container = $this->getContainer();
72
+
73
+        $backends = [
74
+            $container->query('OCA\Files_External\Lib\Backend\Local'),
75
+            $container->query('OCA\Files_External\Lib\Backend\FTP'),
76
+            $container->query('OCA\Files_External\Lib\Backend\DAV'),
77
+            $container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
78
+            $container->query('OCA\Files_External\Lib\Backend\SFTP'),
79
+            $container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
80
+            $container->query('OCA\Files_External\Lib\Backend\Dropbox'),
81
+            $container->query('OCA\Files_External\Lib\Backend\Google'),
82
+            $container->query('OCA\Files_External\Lib\Backend\Swift'),
83
+            $container->query('OCA\Files_External\Lib\Backend\SFTP_Key'),
84
+            $container->query('OCA\Files_External\Lib\Backend\SMB'),
85
+            $container->query('OCA\Files_External\Lib\Backend\SMB_OC'),
86
+        ];
87
+
88
+        return $backends;
89
+    }
90
+
91
+    /**
92
+     * @{inheritdoc}
93
+     */
94
+    public function getAuthMechanisms() {
95
+        $container = $this->getContainer();
96
+
97
+        return [
98
+            // AuthMechanism::SCHEME_NULL mechanism
99
+            $container->query('OCA\Files_External\Lib\Auth\NullMechanism'),
100
+
101
+            // AuthMechanism::SCHEME_BUILTIN mechanism
102
+            $container->query('OCA\Files_External\Lib\Auth\Builtin'),
103
+
104
+            // AuthMechanism::SCHEME_PASSWORD mechanisms
105
+            $container->query('OCA\Files_External\Lib\Auth\Password\Password'),
106
+            $container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
107
+            $container->query('OCA\Files_External\Lib\Auth\Password\LoginCredentials'),
108
+            $container->query('OCA\Files_External\Lib\Auth\Password\UserProvided'),
109
+            $container->query('OCA\Files_External\Lib\Auth\Password\GlobalAuth'),
110
+
111
+            // AuthMechanism::SCHEME_OAUTH1 mechanisms
112
+            $container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
113
+
114
+            // AuthMechanism::SCHEME_OAUTH2 mechanisms
115
+            $container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
116
+
117
+            // AuthMechanism::SCHEME_PUBLICKEY mechanisms
118
+            $container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'),
119
+
120
+            // AuthMechanism::SCHEME_OPENSTACK mechanisms
121
+            $container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
122
+            $container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
123
+
124
+            // Specialized mechanisms
125
+            $container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
126
+        ];
127
+    }
128 128
 
129 129
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Settings/Personal.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -32,72 +32,72 @@
 block discarded – undo
32 32
 
33 33
 class Personal implements ISettings {
34 34
 
35
-	/** @var IManager */
36
-	private $encryptionManager;
35
+    /** @var IManager */
36
+    private $encryptionManager;
37 37
 
38
-	/** @var UserGlobalStoragesService */
39
-	private $userGlobalStoragesService;
38
+    /** @var UserGlobalStoragesService */
39
+    private $userGlobalStoragesService;
40 40
 
41
-	/** @var BackendService */
42
-	private $backendService;
41
+    /** @var BackendService */
42
+    private $backendService;
43 43
 
44
-	/** @var GlobalAuth	 */
45
-	private $globalAuth;
44
+    /** @var GlobalAuth	 */
45
+    private $globalAuth;
46 46
 
47
-	/** @var IUserSession */
48
-	private $userSession;
47
+    /** @var IUserSession */
48
+    private $userSession;
49 49
 
50
-	public function __construct(
51
-		IManager $encryptionManager,
52
-		UserGlobalStoragesService $userGlobalStoragesService,
53
-		BackendService $backendService,
54
-		GlobalAuth $globalAuth,
55
-		IUserSession $userSession
56
-	) {
57
-		$this->encryptionManager = $encryptionManager;
58
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
59
-		$this->backendService = $backendService;
60
-		$this->globalAuth = $globalAuth;
61
-		$this->userSession = $userSession;
62
-	}
50
+    public function __construct(
51
+        IManager $encryptionManager,
52
+        UserGlobalStoragesService $userGlobalStoragesService,
53
+        BackendService $backendService,
54
+        GlobalAuth $globalAuth,
55
+        IUserSession $userSession
56
+    ) {
57
+        $this->encryptionManager = $encryptionManager;
58
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
59
+        $this->backendService = $backendService;
60
+        $this->globalAuth = $globalAuth;
61
+        $this->userSession = $userSession;
62
+    }
63 63
 
64
-	/**
65
-	 * @return TemplateResponse
66
-	 */
67
-	public function getForm() {
68
-		$uid = $this->userSession->getUser()->getUID();
64
+    /**
65
+     * @return TemplateResponse
66
+     */
67
+    public function getForm() {
68
+        $uid = $this->userSession->getUser()->getUID();
69 69
 
70
-		$parameters = [
71
-			'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
72
-			'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
73
-			'storages'             => $this->userGlobalStoragesService->getStorages(),
74
-			'backends'             => $this->backendService->getAvailableBackends(),
75
-			'authMechanisms'       => $this->backendService->getAuthMechanisms(),
76
-			'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
77
-			'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
78
-			'globalCredentials'    => $this->globalAuth->getAuth($uid),
79
-			'globalCredentialsUid' => $uid,
80
-		];
70
+        $parameters = [
71
+            'encryptionEnabled'    => $this->encryptionManager->isEnabled(),
72
+            'visibilityType'       => BackendService::VISIBILITY_PERSONAL,
73
+            'storages'             => $this->userGlobalStoragesService->getStorages(),
74
+            'backends'             => $this->backendService->getAvailableBackends(),
75
+            'authMechanisms'       => $this->backendService->getAuthMechanisms(),
76
+            'dependencies'         => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()),
77
+            'allowUserMounting'    => $this->backendService->isUserMountingAllowed(),
78
+            'globalCredentials'    => $this->globalAuth->getAuth($uid),
79
+            'globalCredentialsUid' => $uid,
80
+        ];
81 81
 
82
-		return new TemplateResponse('files_external', 'settings', $parameters, '');
83
-	}
82
+        return new TemplateResponse('files_external', 'settings', $parameters, '');
83
+    }
84 84
 
85
-	/**
86
-	 * @return string the section ID, e.g. 'sharing'
87
-	 */
88
-	public function getSection() {
89
-		return 'externalstorages';
90
-	}
85
+    /**
86
+     * @return string the section ID, e.g. 'sharing'
87
+     */
88
+    public function getSection() {
89
+        return 'externalstorages';
90
+    }
91 91
 
92
-	/**
93
-	 * @return int whether the form should be rather on the top or bottom of
94
-	 * the admin section. The forms are arranged in ascending order of the
95
-	 * priority values. It is required to return a value between 0 and 100.
96
-	 *
97
-	 * E.g.: 70
98
-	 */
99
-	public function getPriority() {
100
-		return 40;
101
-	}
92
+    /**
93
+     * @return int whether the form should be rather on the top or bottom of
94
+     * the admin section. The forms are arranged in ascending order of the
95
+     * priority values. It is required to return a value between 0 and 100.
96
+     *
97
+     * E.g.: 70
98
+     */
99
+    public function getPriority() {
100
+        return 40;
101
+    }
102 102
 
103 103
 }
Please login to merge, or discard this patch.
apps/files_external/lib/Settings/PersonalSection.php 1 patch
Indentation   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -29,39 +29,39 @@
 block discarded – undo
29 29
 use OCP\IUserSession;
30 30
 
31 31
 class PersonalSection extends Section {
32
-	/** @var IUserSession */
33
-	private $userSession;
32
+    /** @var IUserSession */
33
+    private $userSession;
34 34
 
35
-	/** @var UserGlobalStoragesService */
36
-	private $userGlobalStoragesService;
35
+    /** @var UserGlobalStoragesService */
36
+    private $userGlobalStoragesService;
37 37
 
38
-	/** @var BackendService */
39
-	private $backendService;
38
+    /** @var BackendService */
39
+    private $backendService;
40 40
 
41
-	public function __construct(
42
-		IURLGenerator $url,
43
-		IL10N $l,
44
-		IUserSession $userSession,
45
-		UserGlobalStoragesService $userGlobalStoragesService,
46
-		BackendService $backendService
47
-	) {
48
-		parent::__construct($url, $l);
49
-		$this->userSession = $userSession;
50
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
51
-		$this->backendService = $backendService;
52
-	}
41
+    public function __construct(
42
+        IURLGenerator $url,
43
+        IL10N $l,
44
+        IUserSession $userSession,
45
+        UserGlobalStoragesService $userGlobalStoragesService,
46
+        BackendService $backendService
47
+    ) {
48
+        parent::__construct($url, $l);
49
+        $this->userSession = $userSession;
50
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
51
+        $this->backendService = $backendService;
52
+    }
53 53
 
54
-	public function getID() {
55
-		if (!$this->userSession->isLoggedIn()) {
56
-			// we need to return the proper id while installing/upgrading the app
57
-			return parent::getID();
58
-		}
54
+    public function getID() {
55
+        if (!$this->userSession->isLoggedIn()) {
56
+            // we need to return the proper id while installing/upgrading the app
57
+            return parent::getID();
58
+        }
59 59
 
60
-		if (count($this->userGlobalStoragesService->getStorages()) > 0 || $this->backendService->isUserMountingAllowed()) {
61
-			return parent::getID();
62
-		} else {
63
-			// by returning a different id, no matching settings will be found and the item will be hidden
64
-			return null;
65
-		}
66
-	}
60
+        if (count($this->userGlobalStoragesService->getStorages()) > 0 || $this->backendService->isUserMountingAllowed()) {
61
+            return parent::getID();
62
+        } else {
63
+            // by returning a different id, no matching settings will be found and the item will be hidden
64
+            return null;
65
+        }
66
+    }
67 67
 }
68 68
\ No newline at end of file
Please login to merge, or discard this patch.
apps/files_external/appinfo/app.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@
 block discarded – undo
36 36
 $appContainer = \OC_Mount_Config::$app->getContainer();
37 37
 
38 38
 \OCA\Files\App::getNavigationManager()->add(function () {
39
-	$l = \OC::$server->getL10N('files_external');
40
-	return [
41
-		'id' => 'extstoragemounts',
42
-		'appname' => 'files_external',
43
-		'script' => 'list.php',
44
-		'order' => 30,
45
-		'name' => $l->t('External storages'),
46
-	];
39
+    $l = \OC::$server->getL10N('files_external');
40
+    return [
41
+        'id' => 'extstoragemounts',
42
+        'appname' => 'files_external',
43
+        'script' => 'list.php',
44
+        'order' => 30,
45
+        'name' => $l->t('External storages'),
46
+    ];
47 47
 });
48 48
 
49 49
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
Please login to merge, or discard this patch.
settings/templates/settings/personal/security.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@
 block discarded – undo
22 22
  */
23 23
 
24 24
 script('settings', [
25
-	'authtoken',
26
-	'authtoken_collection',
27
-	'authtoken_view',
28
-	'settings/authtoken-init'
25
+    'authtoken',
26
+    'authtoken_collection',
27
+    'authtoken_view',
28
+    'settings/authtoken-init'
29 29
 ]);
30 30
 
31 31
 ?>
Please login to merge, or discard this patch.
lib/private/Server.php 1 patch
Indentation   +1638 added lines, -1638 removed lines patch added patch discarded remove patch
@@ -127,1647 +127,1647 @@
 block discarded – undo
127 127
  * TODO: hookup all manager classes
128 128
  */
129 129
 class Server extends ServerContainer implements IServerContainer {
130
-	/** @var string */
131
-	private $webRoot;
132
-
133
-	/**
134
-	 * @param string $webRoot
135
-	 * @param \OC\Config $config
136
-	 */
137
-	public function __construct($webRoot, \OC\Config $config) {
138
-		parent::__construct();
139
-		$this->webRoot = $webRoot;
140
-
141
-		$this->registerService(\OCP\IServerContainer::class, function(IServerContainer $c) {
142
-			return $c;
143
-		});
144
-
145
-		$this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
146
-		$this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
147
-
148
-		$this->registerAlias(IActionFactory::class, ActionFactory::class);
149
-
150
-
151
-
152
-		$this->registerService(\OCP\IPreview::class, function (Server $c) {
153
-			return new PreviewManager(
154
-				$c->getConfig(),
155
-				$c->getRootFolder(),
156
-				$c->getAppDataDir('preview'),
157
-				$c->getEventDispatcher(),
158
-				$c->getSession()->get('user_id')
159
-			);
160
-		});
161
-		$this->registerAlias('PreviewManager', \OCP\IPreview::class);
162
-
163
-		$this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
164
-			return new \OC\Preview\Watcher(
165
-				$c->getAppDataDir('preview')
166
-			);
167
-		});
168
-
169
-		$this->registerService('EncryptionManager', function (Server $c) {
170
-			$view = new View();
171
-			$util = new Encryption\Util(
172
-				$view,
173
-				$c->getUserManager(),
174
-				$c->getGroupManager(),
175
-				$c->getConfig()
176
-			);
177
-			return new Encryption\Manager(
178
-				$c->getConfig(),
179
-				$c->getLogger(),
180
-				$c->getL10N('core'),
181
-				new View(),
182
-				$util,
183
-				new ArrayCache()
184
-			);
185
-		});
186
-
187
-		$this->registerService('EncryptionFileHelper', function (Server $c) {
188
-			$util = new Encryption\Util(
189
-				new View(),
190
-				$c->getUserManager(),
191
-				$c->getGroupManager(),
192
-				$c->getConfig()
193
-			);
194
-			return new Encryption\File(
195
-				$util,
196
-				$c->getRootFolder(),
197
-				$c->getShareManager()
198
-			);
199
-		});
200
-
201
-		$this->registerService('EncryptionKeyStorage', function (Server $c) {
202
-			$view = new View();
203
-			$util = new Encryption\Util(
204
-				$view,
205
-				$c->getUserManager(),
206
-				$c->getGroupManager(),
207
-				$c->getConfig()
208
-			);
209
-
210
-			return new Encryption\Keys\Storage($view, $util);
211
-		});
212
-		$this->registerService('TagMapper', function (Server $c) {
213
-			return new TagMapper($c->getDatabaseConnection());
214
-		});
215
-
216
-		$this->registerService(\OCP\ITagManager::class, function (Server $c) {
217
-			$tagMapper = $c->query('TagMapper');
218
-			return new TagManager($tagMapper, $c->getUserSession());
219
-		});
220
-		$this->registerAlias('TagManager', \OCP\ITagManager::class);
221
-
222
-		$this->registerService('SystemTagManagerFactory', function (Server $c) {
223
-			$config = $c->getConfig();
224
-			$factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
225
-			/** @var \OC\SystemTag\ManagerFactory $factory */
226
-			$factory = new $factoryClass($this);
227
-			return $factory;
228
-		});
229
-		$this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
230
-			return $c->query('SystemTagManagerFactory')->getManager();
231
-		});
232
-		$this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
233
-
234
-		$this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
235
-			return $c->query('SystemTagManagerFactory')->getObjectMapper();
236
-		});
237
-		$this->registerService('RootFolder', function (Server $c) {
238
-			$manager = \OC\Files\Filesystem::getMountManager(null);
239
-			$view = new View();
240
-			$root = new Root(
241
-				$manager,
242
-				$view,
243
-				null,
244
-				$c->getUserMountCache(),
245
-				$this->getLogger(),
246
-				$this->getUserManager()
247
-			);
248
-			$connector = new HookConnector($root, $view);
249
-			$connector->viewToNode();
250
-
251
-			$previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
252
-			$previewConnector->connectWatcher();
253
-
254
-			return $root;
255
-		});
256
-		$this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
257
-
258
-		$this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
259
-			return new LazyRoot(function() use ($c) {
260
-				return $c->query('RootFolder');
261
-			});
262
-		});
263
-		$this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
264
-
265
-		$this->registerService(\OCP\IUserManager::class, function (Server $c) {
266
-			$config = $c->getConfig();
267
-			return new \OC\User\Manager($config);
268
-		});
269
-		$this->registerAlias('UserManager', \OCP\IUserManager::class);
270
-
271
-		$this->registerService(\OCP\IGroupManager::class, function (Server $c) {
272
-			$groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
273
-			$groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
274
-				\OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
275
-			});
276
-			$groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
277
-				\OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
278
-			});
279
-			$groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
280
-				\OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
281
-			});
282
-			$groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
283
-				\OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
284
-			});
285
-			$groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
286
-				\OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
287
-			});
288
-			$groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
289
-				\OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
290
-				//Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
291
-				\OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
292
-			});
293
-			return $groupManager;
294
-		});
295
-		$this->registerAlias('GroupManager', \OCP\IGroupManager::class);
296
-
297
-		$this->registerService(Store::class, function(Server $c) {
298
-			$session = $c->getSession();
299
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
300
-				$tokenProvider = $c->query('OC\Authentication\Token\IProvider');
301
-			} else {
302
-				$tokenProvider = null;
303
-			}
304
-			$logger = $c->getLogger();
305
-			return new Store($session, $logger, $tokenProvider);
306
-		});
307
-		$this->registerAlias(IStore::class, Store::class);
308
-		$this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
309
-			$dbConnection = $c->getDatabaseConnection();
310
-			return new Authentication\Token\DefaultTokenMapper($dbConnection);
311
-		});
312
-		$this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
313
-			$mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
314
-			$crypto = $c->getCrypto();
315
-			$config = $c->getConfig();
316
-			$logger = $c->getLogger();
317
-			$timeFactory = new TimeFactory();
318
-			return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
319
-		});
320
-		$this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
321
-
322
-		$this->registerService(\OCP\IUserSession::class, function (Server $c) {
323
-			$manager = $c->getUserManager();
324
-			$session = new \OC\Session\Memory('');
325
-			$timeFactory = new TimeFactory();
326
-			// Token providers might require a working database. This code
327
-			// might however be called when ownCloud is not yet setup.
328
-			if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
329
-				$defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
330
-			} else {
331
-				$defaultTokenProvider = null;
332
-			}
333
-
334
-			$userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
335
-			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
336
-				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
337
-			});
338
-			$userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
339
-				/** @var $user \OC\User\User */
340
-				\OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
341
-			});
342
-			$userSession->listen('\OC\User', 'preDelete', function ($user) {
343
-				/** @var $user \OC\User\User */
344
-				\OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
345
-			});
346
-			$userSession->listen('\OC\User', 'postDelete', function ($user) {
347
-				/** @var $user \OC\User\User */
348
-				\OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
349
-			});
350
-			$userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
351
-				/** @var $user \OC\User\User */
352
-				\OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
353
-			});
354
-			$userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
355
-				/** @var $user \OC\User\User */
356
-				\OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
357
-			});
358
-			$userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
359
-				\OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
360
-			});
361
-			$userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
362
-				/** @var $user \OC\User\User */
363
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
364
-			});
365
-			$userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
366
-				/** @var $user \OC\User\User */
367
-				\OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
368
-			});
369
-			$userSession->listen('\OC\User', 'logout', function () {
370
-				\OC_Hook::emit('OC_User', 'logout', array());
371
-			});
372
-			$userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
373
-				/** @var $user \OC\User\User */
374
-				\OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
375
-			});
376
-			return $userSession;
377
-		});
378
-		$this->registerAlias('UserSession', \OCP\IUserSession::class);
379
-
380
-		$this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
381
-			return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
382
-		});
383
-
384
-		$this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
385
-		$this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
386
-
387
-		$this->registerService(\OC\AllConfig::class, function (Server $c) {
388
-			return new \OC\AllConfig(
389
-				$c->getSystemConfig()
390
-			);
391
-		});
392
-		$this->registerAlias('AllConfig', \OC\AllConfig::class);
393
-		$this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
394
-
395
-		$this->registerService('SystemConfig', function ($c) use ($config) {
396
-			return new \OC\SystemConfig($config);
397
-		});
398
-
399
-		$this->registerService(\OC\AppConfig::class, function (Server $c) {
400
-			return new \OC\AppConfig($c->getDatabaseConnection());
401
-		});
402
-		$this->registerAlias('AppConfig', \OC\AppConfig::class);
403
-		$this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
404
-
405
-		$this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
406
-			return new \OC\L10N\Factory(
407
-				$c->getConfig(),
408
-				$c->getRequest(),
409
-				$c->getUserSession(),
410
-				\OC::$SERVERROOT
411
-			);
412
-		});
413
-		$this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
414
-
415
-		$this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
416
-			$config = $c->getConfig();
417
-			$cacheFactory = $c->getMemCacheFactory();
418
-			return new \OC\URLGenerator(
419
-				$config,
420
-				$cacheFactory
421
-			);
422
-		});
423
-		$this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
424
-
425
-		$this->registerService('AppHelper', function ($c) {
426
-			return new \OC\AppHelper();
427
-		});
428
-		$this->registerAlias('AppFetcher', AppFetcher::class);
429
-		$this->registerAlias('CategoryFetcher', CategoryFetcher::class);
430
-
431
-		$this->registerService(\OCP\ICache::class, function ($c) {
432
-			return new Cache\File();
433
-		});
434
-		$this->registerAlias('UserCache', \OCP\ICache::class);
435
-
436
-		$this->registerService(Factory::class, function (Server $c) {
437
-			$config = $c->getConfig();
438
-
439
-			if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
440
-				$v = \OC_App::getAppVersions();
441
-				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
442
-				$version = implode(',', $v);
443
-				$instanceId = \OC_Util::getInstanceId();
444
-				$path = \OC::$SERVERROOT;
445
-				$prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
446
-				return new \OC\Memcache\Factory($prefix, $c->getLogger(),
447
-					$config->getSystemValue('memcache.local', null),
448
-					$config->getSystemValue('memcache.distributed', null),
449
-					$config->getSystemValue('memcache.locking', null)
450
-				);
451
-			}
452
-
453
-			return new \OC\Memcache\Factory('', $c->getLogger(),
454
-				'\\OC\\Memcache\\ArrayCache',
455
-				'\\OC\\Memcache\\ArrayCache',
456
-				'\\OC\\Memcache\\ArrayCache'
457
-			);
458
-		});
459
-		$this->registerAlias('MemCacheFactory', Factory::class);
460
-		$this->registerAlias(ICacheFactory::class, Factory::class);
461
-
462
-		$this->registerService('RedisFactory', function (Server $c) {
463
-			$systemConfig = $c->getSystemConfig();
464
-			return new RedisFactory($systemConfig);
465
-		});
466
-
467
-		$this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
468
-			return new \OC\Activity\Manager(
469
-				$c->getRequest(),
470
-				$c->getUserSession(),
471
-				$c->getConfig(),
472
-				$c->query(IValidator::class)
473
-			);
474
-		});
475
-		$this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
476
-
477
-		$this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
478
-			return new \OC\Activity\EventMerger(
479
-				$c->getL10N('lib')
480
-			);
481
-		});
482
-		$this->registerAlias(IValidator::class, Validator::class);
483
-
484
-		$this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
485
-			return new AvatarManager(
486
-				$c->getUserManager(),
487
-				$c->getAppDataDir('avatar'),
488
-				$c->getL10N('lib'),
489
-				$c->getLogger(),
490
-				$c->getConfig()
491
-			);
492
-		});
493
-		$this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
494
-
495
-		$this->registerService(\OCP\ILogger::class, function (Server $c) {
496
-			$logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
497
-			$logger = Log::getLogClass($logType);
498
-			call_user_func(array($logger, 'init'));
499
-
500
-			return new Log($logger);
501
-		});
502
-		$this->registerAlias('Logger', \OCP\ILogger::class);
503
-
504
-		$this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
505
-			$config = $c->getConfig();
506
-			return new \OC\BackgroundJob\JobList(
507
-				$c->getDatabaseConnection(),
508
-				$config,
509
-				new TimeFactory()
510
-			);
511
-		});
512
-		$this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
513
-
514
-		$this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
515
-			$cacheFactory = $c->getMemCacheFactory();
516
-			$logger = $c->getLogger();
517
-			if ($cacheFactory->isAvailable()) {
518
-				$router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
519
-			} else {
520
-				$router = new \OC\Route\Router($logger);
521
-			}
522
-			return $router;
523
-		});
524
-		$this->registerAlias('Router', \OCP\Route\IRouter::class);
525
-
526
-		$this->registerService(\OCP\ISearch::class, function ($c) {
527
-			return new Search();
528
-		});
529
-		$this->registerAlias('Search', \OCP\ISearch::class);
530
-
531
-		$this->registerService(\OC\Security\RateLimiting\Limiter::class, function($c) {
532
-			return new \OC\Security\RateLimiting\Limiter(
533
-				$this->getUserSession(),
534
-				$this->getRequest(),
535
-				new \OC\AppFramework\Utility\TimeFactory(),
536
-				$c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
537
-			);
538
-		});
539
-		$this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
540
-			return new \OC\Security\RateLimiting\Backend\MemoryCache(
541
-				$this->getMemCacheFactory(),
542
-				new \OC\AppFramework\Utility\TimeFactory()
543
-			);
544
-		});
545
-
546
-		$this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
547
-			return new SecureRandom();
548
-		});
549
-		$this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
550
-
551
-		$this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
552
-			return new Crypto($c->getConfig(), $c->getSecureRandom());
553
-		});
554
-		$this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
555
-
556
-		$this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
557
-			return new Hasher($c->getConfig());
558
-		});
559
-		$this->registerAlias('Hasher', \OCP\Security\IHasher::class);
560
-
561
-		$this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
562
-			return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
563
-		});
564
-		$this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
565
-
566
-		$this->registerService(IDBConnection::class, function (Server $c) {
567
-			$systemConfig = $c->getSystemConfig();
568
-			$factory = new \OC\DB\ConnectionFactory($systemConfig);
569
-			$type = $systemConfig->getValue('dbtype', 'sqlite');
570
-			if (!$factory->isValidType($type)) {
571
-				throw new \OC\DatabaseException('Invalid database type');
572
-			}
573
-			$connectionParams = $factory->createConnectionParams();
574
-			$connection = $factory->getConnection($type, $connectionParams);
575
-			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
576
-			return $connection;
577
-		});
578
-		$this->registerAlias('DatabaseConnection', IDBConnection::class);
579
-
580
-		$this->registerService('HTTPHelper', function (Server $c) {
581
-			$config = $c->getConfig();
582
-			return new HTTPHelper(
583
-				$config,
584
-				$c->getHTTPClientService()
585
-			);
586
-		});
587
-
588
-		$this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
589
-			$user = \OC_User::getUser();
590
-			$uid = $user ? $user : null;
591
-			return new ClientService(
592
-				$c->getConfig(),
593
-				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig(), $c->getLogger())
594
-			);
595
-		});
596
-		$this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
597
-		$this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
598
-			$eventLogger = new EventLogger();
599
-			if ($c->getSystemConfig()->getValue('debug', false)) {
600
-				// In debug mode, module is being activated by default
601
-				$eventLogger->activate();
602
-			}
603
-			return $eventLogger;
604
-		});
605
-		$this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
606
-
607
-		$this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
608
-			$queryLogger = new QueryLogger();
609
-			if ($c->getSystemConfig()->getValue('debug', false)) {
610
-				// In debug mode, module is being activated by default
611
-				$queryLogger->activate();
612
-			}
613
-			return $queryLogger;
614
-		});
615
-		$this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
616
-
617
-		$this->registerService(TempManager::class, function (Server $c) {
618
-			return new TempManager(
619
-				$c->getLogger(),
620
-				$c->getConfig()
621
-			);
622
-		});
623
-		$this->registerAlias('TempManager', TempManager::class);
624
-		$this->registerAlias(ITempManager::class, TempManager::class);
625
-
626
-		$this->registerService(AppManager::class, function (Server $c) {
627
-			return new \OC\App\AppManager(
628
-				$c->getUserSession(),
629
-				$c->getAppConfig(),
630
-				$c->getGroupManager(),
631
-				$c->getMemCacheFactory(),
632
-				$c->getEventDispatcher()
633
-			);
634
-		});
635
-		$this->registerAlias('AppManager', AppManager::class);
636
-		$this->registerAlias(IAppManager::class, AppManager::class);
637
-
638
-		$this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
639
-			return new DateTimeZone(
640
-				$c->getConfig(),
641
-				$c->getSession()
642
-			);
643
-		});
644
-		$this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
645
-
646
-		$this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
647
-			$language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
648
-
649
-			return new DateTimeFormatter(
650
-				$c->getDateTimeZone()->getTimeZone(),
651
-				$c->getL10N('lib', $language)
652
-			);
653
-		});
654
-		$this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
655
-
656
-		$this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
657
-			$mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
658
-			$listener = new UserMountCacheListener($mountCache);
659
-			$listener->listen($c->getUserManager());
660
-			return $mountCache;
661
-		});
662
-		$this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
663
-
664
-		$this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
665
-			$loader = \OC\Files\Filesystem::getLoader();
666
-			$mountCache = $c->query('UserMountCache');
667
-			$manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
668
-
669
-			// builtin providers
670
-
671
-			$config = $c->getConfig();
672
-			$manager->registerProvider(new CacheMountProvider($config));
673
-			$manager->registerHomeProvider(new LocalHomeMountProvider());
674
-			$manager->registerHomeProvider(new ObjectHomeMountProvider($config));
675
-
676
-			return $manager;
677
-		});
678
-		$this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
679
-
680
-		$this->registerService('IniWrapper', function ($c) {
681
-			return new IniGetWrapper();
682
-		});
683
-		$this->registerService('AsyncCommandBus', function (Server $c) {
684
-			$jobList = $c->getJobList();
685
-			return new AsyncBus($jobList);
686
-		});
687
-		$this->registerService('TrustedDomainHelper', function ($c) {
688
-			return new TrustedDomainHelper($this->getConfig());
689
-		});
690
-		$this->registerService('Throttler', function(Server $c) {
691
-			return new Throttler(
692
-				$c->getDatabaseConnection(),
693
-				new TimeFactory(),
694
-				$c->getLogger(),
695
-				$c->getConfig()
696
-			);
697
-		});
698
-		$this->registerService('IntegrityCodeChecker', function (Server $c) {
699
-			// IConfig and IAppManager requires a working database. This code
700
-			// might however be called when ownCloud is not yet setup.
701
-			if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
702
-				$config = $c->getConfig();
703
-				$appManager = $c->getAppManager();
704
-			} else {
705
-				$config = null;
706
-				$appManager = null;
707
-			}
708
-
709
-			return new Checker(
710
-					new EnvironmentHelper(),
711
-					new FileAccessHelper(),
712
-					new AppLocator(),
713
-					$config,
714
-					$c->getMemCacheFactory(),
715
-					$appManager,
716
-					$c->getTempManager()
717
-			);
718
-		});
719
-		$this->registerService(\OCP\IRequest::class, function ($c) {
720
-			if (isset($this['urlParams'])) {
721
-				$urlParams = $this['urlParams'];
722
-			} else {
723
-				$urlParams = [];
724
-			}
725
-
726
-			if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
727
-				&& in_array('fakeinput', stream_get_wrappers())
728
-			) {
729
-				$stream = 'fakeinput://data';
730
-			} else {
731
-				$stream = 'php://input';
732
-			}
733
-
734
-			return new Request(
735
-				[
736
-					'get' => $_GET,
737
-					'post' => $_POST,
738
-					'files' => $_FILES,
739
-					'server' => $_SERVER,
740
-					'env' => $_ENV,
741
-					'cookies' => $_COOKIE,
742
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
743
-						? $_SERVER['REQUEST_METHOD']
744
-						: null,
745
-					'urlParams' => $urlParams,
746
-				],
747
-				$this->getSecureRandom(),
748
-				$this->getConfig(),
749
-				$this->getCsrfTokenManager(),
750
-				$stream
751
-			);
752
-		});
753
-		$this->registerAlias('Request', \OCP\IRequest::class);
754
-
755
-		$this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
756
-			return new Mailer(
757
-				$c->getConfig(),
758
-				$c->getLogger(),
759
-				$c->query(Defaults::class),
760
-				$c->getURLGenerator(),
761
-				$c->getL10N('lib')
762
-			);
763
-		});
764
-		$this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
765
-
766
-		$this->registerService('LDAPProvider', function(Server $c) {
767
-			$config = $c->getConfig();
768
-			$factoryClass = $config->getSystemValue('ldapProviderFactory', null);
769
-			if(is_null($factoryClass)) {
770
-				throw new \Exception('ldapProviderFactory not set');
771
-			}
772
-			/** @var \OCP\LDAP\ILDAPProviderFactory $factory */
773
-			$factory = new $factoryClass($this);
774
-			return $factory->getLDAPProvider();
775
-		});
776
-		$this->registerService('LockingProvider', function (Server $c) {
777
-			$ini = $c->getIniWrapper();
778
-			$config = $c->getConfig();
779
-			$ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
780
-			if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
781
-				/** @var \OC\Memcache\Factory $memcacheFactory */
782
-				$memcacheFactory = $c->getMemCacheFactory();
783
-				$memcache = $memcacheFactory->createLocking('lock');
784
-				if (!($memcache instanceof \OC\Memcache\NullCache)) {
785
-					return new MemcacheLockingProvider($memcache, $ttl);
786
-				}
787
-				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
788
-			}
789
-			return new NoopLockingProvider();
790
-		});
791
-
792
-		$this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
793
-			return new \OC\Files\Mount\Manager();
794
-		});
795
-		$this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
796
-
797
-		$this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
798
-			return new \OC\Files\Type\Detection(
799
-				$c->getURLGenerator(),
800
-				\OC::$configDir,
801
-				\OC::$SERVERROOT . '/resources/config/'
802
-			);
803
-		});
804
-		$this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
805
-
806
-		$this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
807
-			return new \OC\Files\Type\Loader(
808
-				$c->getDatabaseConnection()
809
-			);
810
-		});
811
-		$this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
812
-		$this->registerService(BundleFetcher::class, function () {
813
-			return new BundleFetcher($this->getL10N('lib'));
814
-		});
815
-		$this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
816
-			return new Manager(
817
-				$c->query(IValidator::class)
818
-			);
819
-		});
820
-		$this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
821
-
822
-		$this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
823
-			$manager = new \OC\CapabilitiesManager($c->getLogger());
824
-			$manager->registerCapability(function () use ($c) {
825
-				return new \OC\OCS\CoreCapabilities($c->getConfig());
826
-			});
827
-			return $manager;
828
-		});
829
-		$this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
830
-
831
-		$this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
832
-			$config = $c->getConfig();
833
-			$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
834
-			/** @var \OCP\Comments\ICommentsManagerFactory $factory */
835
-			$factory = new $factoryClass($this);
836
-			return $factory->getManager();
837
-		});
838
-		$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
839
-
840
-		$this->registerService('ThemingDefaults', function(Server $c) {
841
-			/*
130
+    /** @var string */
131
+    private $webRoot;
132
+
133
+    /**
134
+     * @param string $webRoot
135
+     * @param \OC\Config $config
136
+     */
137
+    public function __construct($webRoot, \OC\Config $config) {
138
+        parent::__construct();
139
+        $this->webRoot = $webRoot;
140
+
141
+        $this->registerService(\OCP\IServerContainer::class, function(IServerContainer $c) {
142
+            return $c;
143
+        });
144
+
145
+        $this->registerAlias(\OCP\Contacts\IManager::class, \OC\ContactsManager::class);
146
+        $this->registerAlias('ContactsManager', \OCP\Contacts\IManager::class);
147
+
148
+        $this->registerAlias(IActionFactory::class, ActionFactory::class);
149
+
150
+
151
+
152
+        $this->registerService(\OCP\IPreview::class, function (Server $c) {
153
+            return new PreviewManager(
154
+                $c->getConfig(),
155
+                $c->getRootFolder(),
156
+                $c->getAppDataDir('preview'),
157
+                $c->getEventDispatcher(),
158
+                $c->getSession()->get('user_id')
159
+            );
160
+        });
161
+        $this->registerAlias('PreviewManager', \OCP\IPreview::class);
162
+
163
+        $this->registerService(\OC\Preview\Watcher::class, function (Server $c) {
164
+            return new \OC\Preview\Watcher(
165
+                $c->getAppDataDir('preview')
166
+            );
167
+        });
168
+
169
+        $this->registerService('EncryptionManager', function (Server $c) {
170
+            $view = new View();
171
+            $util = new Encryption\Util(
172
+                $view,
173
+                $c->getUserManager(),
174
+                $c->getGroupManager(),
175
+                $c->getConfig()
176
+            );
177
+            return new Encryption\Manager(
178
+                $c->getConfig(),
179
+                $c->getLogger(),
180
+                $c->getL10N('core'),
181
+                new View(),
182
+                $util,
183
+                new ArrayCache()
184
+            );
185
+        });
186
+
187
+        $this->registerService('EncryptionFileHelper', function (Server $c) {
188
+            $util = new Encryption\Util(
189
+                new View(),
190
+                $c->getUserManager(),
191
+                $c->getGroupManager(),
192
+                $c->getConfig()
193
+            );
194
+            return new Encryption\File(
195
+                $util,
196
+                $c->getRootFolder(),
197
+                $c->getShareManager()
198
+            );
199
+        });
200
+
201
+        $this->registerService('EncryptionKeyStorage', function (Server $c) {
202
+            $view = new View();
203
+            $util = new Encryption\Util(
204
+                $view,
205
+                $c->getUserManager(),
206
+                $c->getGroupManager(),
207
+                $c->getConfig()
208
+            );
209
+
210
+            return new Encryption\Keys\Storage($view, $util);
211
+        });
212
+        $this->registerService('TagMapper', function (Server $c) {
213
+            return new TagMapper($c->getDatabaseConnection());
214
+        });
215
+
216
+        $this->registerService(\OCP\ITagManager::class, function (Server $c) {
217
+            $tagMapper = $c->query('TagMapper');
218
+            return new TagManager($tagMapper, $c->getUserSession());
219
+        });
220
+        $this->registerAlias('TagManager', \OCP\ITagManager::class);
221
+
222
+        $this->registerService('SystemTagManagerFactory', function (Server $c) {
223
+            $config = $c->getConfig();
224
+            $factoryClass = $config->getSystemValue('systemtags.managerFactory', '\OC\SystemTag\ManagerFactory');
225
+            /** @var \OC\SystemTag\ManagerFactory $factory */
226
+            $factory = new $factoryClass($this);
227
+            return $factory;
228
+        });
229
+        $this->registerService(\OCP\SystemTag\ISystemTagManager::class, function (Server $c) {
230
+            return $c->query('SystemTagManagerFactory')->getManager();
231
+        });
232
+        $this->registerAlias('SystemTagManager', \OCP\SystemTag\ISystemTagManager::class);
233
+
234
+        $this->registerService(\OCP\SystemTag\ISystemTagObjectMapper::class, function (Server $c) {
235
+            return $c->query('SystemTagManagerFactory')->getObjectMapper();
236
+        });
237
+        $this->registerService('RootFolder', function (Server $c) {
238
+            $manager = \OC\Files\Filesystem::getMountManager(null);
239
+            $view = new View();
240
+            $root = new Root(
241
+                $manager,
242
+                $view,
243
+                null,
244
+                $c->getUserMountCache(),
245
+                $this->getLogger(),
246
+                $this->getUserManager()
247
+            );
248
+            $connector = new HookConnector($root, $view);
249
+            $connector->viewToNode();
250
+
251
+            $previewConnector = new \OC\Preview\WatcherConnector($root, $c->getSystemConfig());
252
+            $previewConnector->connectWatcher();
253
+
254
+            return $root;
255
+        });
256
+        $this->registerAlias('SystemTagObjectMapper', \OCP\SystemTag\ISystemTagObjectMapper::class);
257
+
258
+        $this->registerService(\OCP\Files\IRootFolder::class, function(Server $c) {
259
+            return new LazyRoot(function() use ($c) {
260
+                return $c->query('RootFolder');
261
+            });
262
+        });
263
+        $this->registerAlias('LazyRootFolder', \OCP\Files\IRootFolder::class);
264
+
265
+        $this->registerService(\OCP\IUserManager::class, function (Server $c) {
266
+            $config = $c->getConfig();
267
+            return new \OC\User\Manager($config);
268
+        });
269
+        $this->registerAlias('UserManager', \OCP\IUserManager::class);
270
+
271
+        $this->registerService(\OCP\IGroupManager::class, function (Server $c) {
272
+            $groupManager = new \OC\Group\Manager($this->getUserManager(), $this->getLogger());
273
+            $groupManager->listen('\OC\Group', 'preCreate', function ($gid) {
274
+                \OC_Hook::emit('OC_Group', 'pre_createGroup', array('run' => true, 'gid' => $gid));
275
+            });
276
+            $groupManager->listen('\OC\Group', 'postCreate', function (\OC\Group\Group $gid) {
277
+                \OC_Hook::emit('OC_User', 'post_createGroup', array('gid' => $gid->getGID()));
278
+            });
279
+            $groupManager->listen('\OC\Group', 'preDelete', function (\OC\Group\Group $group) {
280
+                \OC_Hook::emit('OC_Group', 'pre_deleteGroup', array('run' => true, 'gid' => $group->getGID()));
281
+            });
282
+            $groupManager->listen('\OC\Group', 'postDelete', function (\OC\Group\Group $group) {
283
+                \OC_Hook::emit('OC_User', 'post_deleteGroup', array('gid' => $group->getGID()));
284
+            });
285
+            $groupManager->listen('\OC\Group', 'preAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
286
+                \OC_Hook::emit('OC_Group', 'pre_addToGroup', array('run' => true, 'uid' => $user->getUID(), 'gid' => $group->getGID()));
287
+            });
288
+            $groupManager->listen('\OC\Group', 'postAddUser', function (\OC\Group\Group $group, \OC\User\User $user) {
289
+                \OC_Hook::emit('OC_Group', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
290
+                //Minimal fix to keep it backward compatible TODO: clean up all the GroupManager hooks
291
+                \OC_Hook::emit('OC_User', 'post_addToGroup', array('uid' => $user->getUID(), 'gid' => $group->getGID()));
292
+            });
293
+            return $groupManager;
294
+        });
295
+        $this->registerAlias('GroupManager', \OCP\IGroupManager::class);
296
+
297
+        $this->registerService(Store::class, function(Server $c) {
298
+            $session = $c->getSession();
299
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
300
+                $tokenProvider = $c->query('OC\Authentication\Token\IProvider');
301
+            } else {
302
+                $tokenProvider = null;
303
+            }
304
+            $logger = $c->getLogger();
305
+            return new Store($session, $logger, $tokenProvider);
306
+        });
307
+        $this->registerAlias(IStore::class, Store::class);
308
+        $this->registerService('OC\Authentication\Token\DefaultTokenMapper', function (Server $c) {
309
+            $dbConnection = $c->getDatabaseConnection();
310
+            return new Authentication\Token\DefaultTokenMapper($dbConnection);
311
+        });
312
+        $this->registerService('OC\Authentication\Token\DefaultTokenProvider', function (Server $c) {
313
+            $mapper = $c->query('OC\Authentication\Token\DefaultTokenMapper');
314
+            $crypto = $c->getCrypto();
315
+            $config = $c->getConfig();
316
+            $logger = $c->getLogger();
317
+            $timeFactory = new TimeFactory();
318
+            return new \OC\Authentication\Token\DefaultTokenProvider($mapper, $crypto, $config, $logger, $timeFactory);
319
+        });
320
+        $this->registerAlias('OC\Authentication\Token\IProvider', 'OC\Authentication\Token\DefaultTokenProvider');
321
+
322
+        $this->registerService(\OCP\IUserSession::class, function (Server $c) {
323
+            $manager = $c->getUserManager();
324
+            $session = new \OC\Session\Memory('');
325
+            $timeFactory = new TimeFactory();
326
+            // Token providers might require a working database. This code
327
+            // might however be called when ownCloud is not yet setup.
328
+            if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
329
+                $defaultTokenProvider = $c->query('OC\Authentication\Token\IProvider');
330
+            } else {
331
+                $defaultTokenProvider = null;
332
+            }
333
+
334
+            $userSession = new \OC\User\Session($manager, $session, $timeFactory, $defaultTokenProvider, $c->getConfig(), $c->getSecureRandom(), $c->getLockdownManager());
335
+            $userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
336
+                \OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
337
+            });
338
+            $userSession->listen('\OC\User', 'postCreateUser', function ($user, $password) {
339
+                /** @var $user \OC\User\User */
340
+                \OC_Hook::emit('OC_User', 'post_createUser', array('uid' => $user->getUID(), 'password' => $password));
341
+            });
342
+            $userSession->listen('\OC\User', 'preDelete', function ($user) {
343
+                /** @var $user \OC\User\User */
344
+                \OC_Hook::emit('OC_User', 'pre_deleteUser', array('run' => true, 'uid' => $user->getUID()));
345
+            });
346
+            $userSession->listen('\OC\User', 'postDelete', function ($user) {
347
+                /** @var $user \OC\User\User */
348
+                \OC_Hook::emit('OC_User', 'post_deleteUser', array('uid' => $user->getUID()));
349
+            });
350
+            $userSession->listen('\OC\User', 'preSetPassword', function ($user, $password, $recoveryPassword) {
351
+                /** @var $user \OC\User\User */
352
+                \OC_Hook::emit('OC_User', 'pre_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
353
+            });
354
+            $userSession->listen('\OC\User', 'postSetPassword', function ($user, $password, $recoveryPassword) {
355
+                /** @var $user \OC\User\User */
356
+                \OC_Hook::emit('OC_User', 'post_setPassword', array('run' => true, 'uid' => $user->getUID(), 'password' => $password, 'recoveryPassword' => $recoveryPassword));
357
+            });
358
+            $userSession->listen('\OC\User', 'preLogin', function ($uid, $password) {
359
+                \OC_Hook::emit('OC_User', 'pre_login', array('run' => true, 'uid' => $uid, 'password' => $password));
360
+            });
361
+            $userSession->listen('\OC\User', 'postLogin', function ($user, $password) {
362
+                /** @var $user \OC\User\User */
363
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
364
+            });
365
+            $userSession->listen('\OC\User', 'postRememberedLogin', function ($user, $password) {
366
+                /** @var $user \OC\User\User */
367
+                \OC_Hook::emit('OC_User', 'post_login', array('run' => true, 'uid' => $user->getUID(), 'password' => $password));
368
+            });
369
+            $userSession->listen('\OC\User', 'logout', function () {
370
+                \OC_Hook::emit('OC_User', 'logout', array());
371
+            });
372
+            $userSession->listen('\OC\User', 'changeUser', function ($user, $feature, $value, $oldValue) {
373
+                /** @var $user \OC\User\User */
374
+                \OC_Hook::emit('OC_User', 'changeUser', array('run' => true, 'user' => $user, 'feature' => $feature, 'value' => $value, 'old_value' => $oldValue));
375
+            });
376
+            return $userSession;
377
+        });
378
+        $this->registerAlias('UserSession', \OCP\IUserSession::class);
379
+
380
+        $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
381
+            return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
382
+        });
383
+
384
+        $this->registerAlias(\OCP\INavigationManager::class, \OC\NavigationManager::class);
385
+        $this->registerAlias('NavigationManager', \OCP\INavigationManager::class);
386
+
387
+        $this->registerService(\OC\AllConfig::class, function (Server $c) {
388
+            return new \OC\AllConfig(
389
+                $c->getSystemConfig()
390
+            );
391
+        });
392
+        $this->registerAlias('AllConfig', \OC\AllConfig::class);
393
+        $this->registerAlias(\OCP\IConfig::class, \OC\AllConfig::class);
394
+
395
+        $this->registerService('SystemConfig', function ($c) use ($config) {
396
+            return new \OC\SystemConfig($config);
397
+        });
398
+
399
+        $this->registerService(\OC\AppConfig::class, function (Server $c) {
400
+            return new \OC\AppConfig($c->getDatabaseConnection());
401
+        });
402
+        $this->registerAlias('AppConfig', \OC\AppConfig::class);
403
+        $this->registerAlias(\OCP\IAppConfig::class, \OC\AppConfig::class);
404
+
405
+        $this->registerService(\OCP\L10N\IFactory::class, function (Server $c) {
406
+            return new \OC\L10N\Factory(
407
+                $c->getConfig(),
408
+                $c->getRequest(),
409
+                $c->getUserSession(),
410
+                \OC::$SERVERROOT
411
+            );
412
+        });
413
+        $this->registerAlias('L10NFactory', \OCP\L10N\IFactory::class);
414
+
415
+        $this->registerService(\OCP\IURLGenerator::class, function (Server $c) {
416
+            $config = $c->getConfig();
417
+            $cacheFactory = $c->getMemCacheFactory();
418
+            return new \OC\URLGenerator(
419
+                $config,
420
+                $cacheFactory
421
+            );
422
+        });
423
+        $this->registerAlias('URLGenerator', \OCP\IURLGenerator::class);
424
+
425
+        $this->registerService('AppHelper', function ($c) {
426
+            return new \OC\AppHelper();
427
+        });
428
+        $this->registerAlias('AppFetcher', AppFetcher::class);
429
+        $this->registerAlias('CategoryFetcher', CategoryFetcher::class);
430
+
431
+        $this->registerService(\OCP\ICache::class, function ($c) {
432
+            return new Cache\File();
433
+        });
434
+        $this->registerAlias('UserCache', \OCP\ICache::class);
435
+
436
+        $this->registerService(Factory::class, function (Server $c) {
437
+            $config = $c->getConfig();
438
+
439
+            if ($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
440
+                $v = \OC_App::getAppVersions();
441
+                $v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
442
+                $version = implode(',', $v);
443
+                $instanceId = \OC_Util::getInstanceId();
444
+                $path = \OC::$SERVERROOT;
445
+                $prefix = md5($instanceId . '-' . $version . '-' . $path . '-' . \OC::$WEBROOT);
446
+                return new \OC\Memcache\Factory($prefix, $c->getLogger(),
447
+                    $config->getSystemValue('memcache.local', null),
448
+                    $config->getSystemValue('memcache.distributed', null),
449
+                    $config->getSystemValue('memcache.locking', null)
450
+                );
451
+            }
452
+
453
+            return new \OC\Memcache\Factory('', $c->getLogger(),
454
+                '\\OC\\Memcache\\ArrayCache',
455
+                '\\OC\\Memcache\\ArrayCache',
456
+                '\\OC\\Memcache\\ArrayCache'
457
+            );
458
+        });
459
+        $this->registerAlias('MemCacheFactory', Factory::class);
460
+        $this->registerAlias(ICacheFactory::class, Factory::class);
461
+
462
+        $this->registerService('RedisFactory', function (Server $c) {
463
+            $systemConfig = $c->getSystemConfig();
464
+            return new RedisFactory($systemConfig);
465
+        });
466
+
467
+        $this->registerService(\OCP\Activity\IManager::class, function (Server $c) {
468
+            return new \OC\Activity\Manager(
469
+                $c->getRequest(),
470
+                $c->getUserSession(),
471
+                $c->getConfig(),
472
+                $c->query(IValidator::class)
473
+            );
474
+        });
475
+        $this->registerAlias('ActivityManager', \OCP\Activity\IManager::class);
476
+
477
+        $this->registerService(\OCP\Activity\IEventMerger::class, function (Server $c) {
478
+            return new \OC\Activity\EventMerger(
479
+                $c->getL10N('lib')
480
+            );
481
+        });
482
+        $this->registerAlias(IValidator::class, Validator::class);
483
+
484
+        $this->registerService(\OCP\IAvatarManager::class, function (Server $c) {
485
+            return new AvatarManager(
486
+                $c->getUserManager(),
487
+                $c->getAppDataDir('avatar'),
488
+                $c->getL10N('lib'),
489
+                $c->getLogger(),
490
+                $c->getConfig()
491
+            );
492
+        });
493
+        $this->registerAlias('AvatarManager', \OCP\IAvatarManager::class);
494
+
495
+        $this->registerService(\OCP\ILogger::class, function (Server $c) {
496
+            $logType = $c->query('AllConfig')->getSystemValue('log_type', 'file');
497
+            $logger = Log::getLogClass($logType);
498
+            call_user_func(array($logger, 'init'));
499
+
500
+            return new Log($logger);
501
+        });
502
+        $this->registerAlias('Logger', \OCP\ILogger::class);
503
+
504
+        $this->registerService(\OCP\BackgroundJob\IJobList::class, function (Server $c) {
505
+            $config = $c->getConfig();
506
+            return new \OC\BackgroundJob\JobList(
507
+                $c->getDatabaseConnection(),
508
+                $config,
509
+                new TimeFactory()
510
+            );
511
+        });
512
+        $this->registerAlias('JobList', \OCP\BackgroundJob\IJobList::class);
513
+
514
+        $this->registerService(\OCP\Route\IRouter::class, function (Server $c) {
515
+            $cacheFactory = $c->getMemCacheFactory();
516
+            $logger = $c->getLogger();
517
+            if ($cacheFactory->isAvailable()) {
518
+                $router = new \OC\Route\CachingRouter($cacheFactory->create('route'), $logger);
519
+            } else {
520
+                $router = new \OC\Route\Router($logger);
521
+            }
522
+            return $router;
523
+        });
524
+        $this->registerAlias('Router', \OCP\Route\IRouter::class);
525
+
526
+        $this->registerService(\OCP\ISearch::class, function ($c) {
527
+            return new Search();
528
+        });
529
+        $this->registerAlias('Search', \OCP\ISearch::class);
530
+
531
+        $this->registerService(\OC\Security\RateLimiting\Limiter::class, function($c) {
532
+            return new \OC\Security\RateLimiting\Limiter(
533
+                $this->getUserSession(),
534
+                $this->getRequest(),
535
+                new \OC\AppFramework\Utility\TimeFactory(),
536
+                $c->query(\OC\Security\RateLimiting\Backend\IBackend::class)
537
+            );
538
+        });
539
+        $this->registerService(\OC\Security\RateLimiting\Backend\IBackend::class, function($c) {
540
+            return new \OC\Security\RateLimiting\Backend\MemoryCache(
541
+                $this->getMemCacheFactory(),
542
+                new \OC\AppFramework\Utility\TimeFactory()
543
+            );
544
+        });
545
+
546
+        $this->registerService(\OCP\Security\ISecureRandom::class, function ($c) {
547
+            return new SecureRandom();
548
+        });
549
+        $this->registerAlias('SecureRandom', \OCP\Security\ISecureRandom::class);
550
+
551
+        $this->registerService(\OCP\Security\ICrypto::class, function (Server $c) {
552
+            return new Crypto($c->getConfig(), $c->getSecureRandom());
553
+        });
554
+        $this->registerAlias('Crypto', \OCP\Security\ICrypto::class);
555
+
556
+        $this->registerService(\OCP\Security\IHasher::class, function (Server $c) {
557
+            return new Hasher($c->getConfig());
558
+        });
559
+        $this->registerAlias('Hasher', \OCP\Security\IHasher::class);
560
+
561
+        $this->registerService(\OCP\Security\ICredentialsManager::class, function (Server $c) {
562
+            return new CredentialsManager($c->getCrypto(), $c->getDatabaseConnection());
563
+        });
564
+        $this->registerAlias('CredentialsManager', \OCP\Security\ICredentialsManager::class);
565
+
566
+        $this->registerService(IDBConnection::class, function (Server $c) {
567
+            $systemConfig = $c->getSystemConfig();
568
+            $factory = new \OC\DB\ConnectionFactory($systemConfig);
569
+            $type = $systemConfig->getValue('dbtype', 'sqlite');
570
+            if (!$factory->isValidType($type)) {
571
+                throw new \OC\DatabaseException('Invalid database type');
572
+            }
573
+            $connectionParams = $factory->createConnectionParams();
574
+            $connection = $factory->getConnection($type, $connectionParams);
575
+            $connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
576
+            return $connection;
577
+        });
578
+        $this->registerAlias('DatabaseConnection', IDBConnection::class);
579
+
580
+        $this->registerService('HTTPHelper', function (Server $c) {
581
+            $config = $c->getConfig();
582
+            return new HTTPHelper(
583
+                $config,
584
+                $c->getHTTPClientService()
585
+            );
586
+        });
587
+
588
+        $this->registerService(\OCP\Http\Client\IClientService::class, function (Server $c) {
589
+            $user = \OC_User::getUser();
590
+            $uid = $user ? $user : null;
591
+            return new ClientService(
592
+                $c->getConfig(),
593
+                new \OC\Security\CertificateManager($uid, new View(), $c->getConfig(), $c->getLogger())
594
+            );
595
+        });
596
+        $this->registerAlias('HttpClientService', \OCP\Http\Client\IClientService::class);
597
+        $this->registerService(\OCP\Diagnostics\IEventLogger::class, function (Server $c) {
598
+            $eventLogger = new EventLogger();
599
+            if ($c->getSystemConfig()->getValue('debug', false)) {
600
+                // In debug mode, module is being activated by default
601
+                $eventLogger->activate();
602
+            }
603
+            return $eventLogger;
604
+        });
605
+        $this->registerAlias('EventLogger', \OCP\Diagnostics\IEventLogger::class);
606
+
607
+        $this->registerService(\OCP\Diagnostics\IQueryLogger::class, function (Server $c) {
608
+            $queryLogger = new QueryLogger();
609
+            if ($c->getSystemConfig()->getValue('debug', false)) {
610
+                // In debug mode, module is being activated by default
611
+                $queryLogger->activate();
612
+            }
613
+            return $queryLogger;
614
+        });
615
+        $this->registerAlias('QueryLogger', \OCP\Diagnostics\IQueryLogger::class);
616
+
617
+        $this->registerService(TempManager::class, function (Server $c) {
618
+            return new TempManager(
619
+                $c->getLogger(),
620
+                $c->getConfig()
621
+            );
622
+        });
623
+        $this->registerAlias('TempManager', TempManager::class);
624
+        $this->registerAlias(ITempManager::class, TempManager::class);
625
+
626
+        $this->registerService(AppManager::class, function (Server $c) {
627
+            return new \OC\App\AppManager(
628
+                $c->getUserSession(),
629
+                $c->getAppConfig(),
630
+                $c->getGroupManager(),
631
+                $c->getMemCacheFactory(),
632
+                $c->getEventDispatcher()
633
+            );
634
+        });
635
+        $this->registerAlias('AppManager', AppManager::class);
636
+        $this->registerAlias(IAppManager::class, AppManager::class);
637
+
638
+        $this->registerService(\OCP\IDateTimeZone::class, function (Server $c) {
639
+            return new DateTimeZone(
640
+                $c->getConfig(),
641
+                $c->getSession()
642
+            );
643
+        });
644
+        $this->registerAlias('DateTimeZone', \OCP\IDateTimeZone::class);
645
+
646
+        $this->registerService(\OCP\IDateTimeFormatter::class, function (Server $c) {
647
+            $language = $c->getConfig()->getUserValue($c->getSession()->get('user_id'), 'core', 'lang', null);
648
+
649
+            return new DateTimeFormatter(
650
+                $c->getDateTimeZone()->getTimeZone(),
651
+                $c->getL10N('lib', $language)
652
+            );
653
+        });
654
+        $this->registerAlias('DateTimeFormatter', \OCP\IDateTimeFormatter::class);
655
+
656
+        $this->registerService(\OCP\Files\Config\IUserMountCache::class, function (Server $c) {
657
+            $mountCache = new UserMountCache($c->getDatabaseConnection(), $c->getUserManager(), $c->getLogger());
658
+            $listener = new UserMountCacheListener($mountCache);
659
+            $listener->listen($c->getUserManager());
660
+            return $mountCache;
661
+        });
662
+        $this->registerAlias('UserMountCache', \OCP\Files\Config\IUserMountCache::class);
663
+
664
+        $this->registerService(\OCP\Files\Config\IMountProviderCollection::class, function (Server $c) {
665
+            $loader = \OC\Files\Filesystem::getLoader();
666
+            $mountCache = $c->query('UserMountCache');
667
+            $manager =  new \OC\Files\Config\MountProviderCollection($loader, $mountCache);
668
+
669
+            // builtin providers
670
+
671
+            $config = $c->getConfig();
672
+            $manager->registerProvider(new CacheMountProvider($config));
673
+            $manager->registerHomeProvider(new LocalHomeMountProvider());
674
+            $manager->registerHomeProvider(new ObjectHomeMountProvider($config));
675
+
676
+            return $manager;
677
+        });
678
+        $this->registerAlias('MountConfigManager', \OCP\Files\Config\IMountProviderCollection::class);
679
+
680
+        $this->registerService('IniWrapper', function ($c) {
681
+            return new IniGetWrapper();
682
+        });
683
+        $this->registerService('AsyncCommandBus', function (Server $c) {
684
+            $jobList = $c->getJobList();
685
+            return new AsyncBus($jobList);
686
+        });
687
+        $this->registerService('TrustedDomainHelper', function ($c) {
688
+            return new TrustedDomainHelper($this->getConfig());
689
+        });
690
+        $this->registerService('Throttler', function(Server $c) {
691
+            return new Throttler(
692
+                $c->getDatabaseConnection(),
693
+                new TimeFactory(),
694
+                $c->getLogger(),
695
+                $c->getConfig()
696
+            );
697
+        });
698
+        $this->registerService('IntegrityCodeChecker', function (Server $c) {
699
+            // IConfig and IAppManager requires a working database. This code
700
+            // might however be called when ownCloud is not yet setup.
701
+            if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
702
+                $config = $c->getConfig();
703
+                $appManager = $c->getAppManager();
704
+            } else {
705
+                $config = null;
706
+                $appManager = null;
707
+            }
708
+
709
+            return new Checker(
710
+                    new EnvironmentHelper(),
711
+                    new FileAccessHelper(),
712
+                    new AppLocator(),
713
+                    $config,
714
+                    $c->getMemCacheFactory(),
715
+                    $appManager,
716
+                    $c->getTempManager()
717
+            );
718
+        });
719
+        $this->registerService(\OCP\IRequest::class, function ($c) {
720
+            if (isset($this['urlParams'])) {
721
+                $urlParams = $this['urlParams'];
722
+            } else {
723
+                $urlParams = [];
724
+            }
725
+
726
+            if (defined('PHPUNIT_RUN') && PHPUNIT_RUN
727
+                && in_array('fakeinput', stream_get_wrappers())
728
+            ) {
729
+                $stream = 'fakeinput://data';
730
+            } else {
731
+                $stream = 'php://input';
732
+            }
733
+
734
+            return new Request(
735
+                [
736
+                    'get' => $_GET,
737
+                    'post' => $_POST,
738
+                    'files' => $_FILES,
739
+                    'server' => $_SERVER,
740
+                    'env' => $_ENV,
741
+                    'cookies' => $_COOKIE,
742
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
743
+                        ? $_SERVER['REQUEST_METHOD']
744
+                        : null,
745
+                    'urlParams' => $urlParams,
746
+                ],
747
+                $this->getSecureRandom(),
748
+                $this->getConfig(),
749
+                $this->getCsrfTokenManager(),
750
+                $stream
751
+            );
752
+        });
753
+        $this->registerAlias('Request', \OCP\IRequest::class);
754
+
755
+        $this->registerService(\OCP\Mail\IMailer::class, function (Server $c) {
756
+            return new Mailer(
757
+                $c->getConfig(),
758
+                $c->getLogger(),
759
+                $c->query(Defaults::class),
760
+                $c->getURLGenerator(),
761
+                $c->getL10N('lib')
762
+            );
763
+        });
764
+        $this->registerAlias('Mailer', \OCP\Mail\IMailer::class);
765
+
766
+        $this->registerService('LDAPProvider', function(Server $c) {
767
+            $config = $c->getConfig();
768
+            $factoryClass = $config->getSystemValue('ldapProviderFactory', null);
769
+            if(is_null($factoryClass)) {
770
+                throw new \Exception('ldapProviderFactory not set');
771
+            }
772
+            /** @var \OCP\LDAP\ILDAPProviderFactory $factory */
773
+            $factory = new $factoryClass($this);
774
+            return $factory->getLDAPProvider();
775
+        });
776
+        $this->registerService('LockingProvider', function (Server $c) {
777
+            $ini = $c->getIniWrapper();
778
+            $config = $c->getConfig();
779
+            $ttl = $config->getSystemValue('filelocking.ttl', max(3600, $ini->getNumeric('max_execution_time')));
780
+            if ($config->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
781
+                /** @var \OC\Memcache\Factory $memcacheFactory */
782
+                $memcacheFactory = $c->getMemCacheFactory();
783
+                $memcache = $memcacheFactory->createLocking('lock');
784
+                if (!($memcache instanceof \OC\Memcache\NullCache)) {
785
+                    return new MemcacheLockingProvider($memcache, $ttl);
786
+                }
787
+                return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger(), new TimeFactory(), $ttl);
788
+            }
789
+            return new NoopLockingProvider();
790
+        });
791
+
792
+        $this->registerService(\OCP\Files\Mount\IMountManager::class, function () {
793
+            return new \OC\Files\Mount\Manager();
794
+        });
795
+        $this->registerAlias('MountManager', \OCP\Files\Mount\IMountManager::class);
796
+
797
+        $this->registerService(\OCP\Files\IMimeTypeDetector::class, function (Server $c) {
798
+            return new \OC\Files\Type\Detection(
799
+                $c->getURLGenerator(),
800
+                \OC::$configDir,
801
+                \OC::$SERVERROOT . '/resources/config/'
802
+            );
803
+        });
804
+        $this->registerAlias('MimeTypeDetector', \OCP\Files\IMimeTypeDetector::class);
805
+
806
+        $this->registerService(\OCP\Files\IMimeTypeLoader::class, function (Server $c) {
807
+            return new \OC\Files\Type\Loader(
808
+                $c->getDatabaseConnection()
809
+            );
810
+        });
811
+        $this->registerAlias('MimeTypeLoader', \OCP\Files\IMimeTypeLoader::class);
812
+        $this->registerService(BundleFetcher::class, function () {
813
+            return new BundleFetcher($this->getL10N('lib'));
814
+        });
815
+        $this->registerService(\OCP\Notification\IManager::class, function (Server $c) {
816
+            return new Manager(
817
+                $c->query(IValidator::class)
818
+            );
819
+        });
820
+        $this->registerAlias('NotificationManager', \OCP\Notification\IManager::class);
821
+
822
+        $this->registerService(\OC\CapabilitiesManager::class, function (Server $c) {
823
+            $manager = new \OC\CapabilitiesManager($c->getLogger());
824
+            $manager->registerCapability(function () use ($c) {
825
+                return new \OC\OCS\CoreCapabilities($c->getConfig());
826
+            });
827
+            return $manager;
828
+        });
829
+        $this->registerAlias('CapabilitiesManager', \OC\CapabilitiesManager::class);
830
+
831
+        $this->registerService(\OCP\Comments\ICommentsManager::class, function(Server $c) {
832
+            $config = $c->getConfig();
833
+            $factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
834
+            /** @var \OCP\Comments\ICommentsManagerFactory $factory */
835
+            $factory = new $factoryClass($this);
836
+            return $factory->getManager();
837
+        });
838
+        $this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);
839
+
840
+        $this->registerService('ThemingDefaults', function(Server $c) {
841
+            /*
842 842
 			 * Dark magic for autoloader.
843 843
 			 * If we do a class_exists it will try to load the class which will
844 844
 			 * make composer cache the result. Resulting in errors when enabling
845 845
 			 * the theming app.
846 846
 			 */
847
-			$prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
848
-			if (isset($prefixes['OCA\\Theming\\'])) {
849
-				$classExists = true;
850
-			} else {
851
-				$classExists = false;
852
-			}
853
-
854
-			if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
855
-				return new ThemingDefaults(
856
-					$c->getConfig(),
857
-					$c->getL10N('theming'),
858
-					$c->getURLGenerator(),
859
-					$c->getAppDataDir('theming'),
860
-					$c->getMemCacheFactory(),
861
-					new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming'))
862
-				);
863
-			}
864
-			return new \OC_Defaults();
865
-		});
866
-		$this->registerService(SCSSCacher::class, function(Server $c) {
867
-			/** @var Factory $cacheFactory */
868
-			$cacheFactory = $c->query(Factory::class);
869
-			return new SCSSCacher(
870
-				$c->getLogger(),
871
-				$c->query(\OC\Files\AppData\Factory::class),
872
-				$c->getURLGenerator(),
873
-				$c->getConfig(),
874
-				$c->getThemingDefaults(),
875
-				\OC::$SERVERROOT,
876
-				$cacheFactory->create('SCSS')
877
-			);
878
-		});
879
-		$this->registerService(EventDispatcher::class, function () {
880
-			return new EventDispatcher();
881
-		});
882
-		$this->registerAlias('EventDispatcher', EventDispatcher::class);
883
-		$this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
884
-
885
-		$this->registerService('CryptoWrapper', function (Server $c) {
886
-			// FIXME: Instantiiated here due to cyclic dependency
887
-			$request = new Request(
888
-				[
889
-					'get' => $_GET,
890
-					'post' => $_POST,
891
-					'files' => $_FILES,
892
-					'server' => $_SERVER,
893
-					'env' => $_ENV,
894
-					'cookies' => $_COOKIE,
895
-					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
896
-						? $_SERVER['REQUEST_METHOD']
897
-						: null,
898
-				],
899
-				$c->getSecureRandom(),
900
-				$c->getConfig()
901
-			);
902
-
903
-			return new CryptoWrapper(
904
-				$c->getConfig(),
905
-				$c->getCrypto(),
906
-				$c->getSecureRandom(),
907
-				$request
908
-			);
909
-		});
910
-		$this->registerService('CsrfTokenManager', function (Server $c) {
911
-			$tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
912
-
913
-			return new CsrfTokenManager(
914
-				$tokenGenerator,
915
-				$c->query(SessionStorage::class)
916
-			);
917
-		});
918
-		$this->registerService(SessionStorage::class, function (Server $c) {
919
-			return new SessionStorage($c->getSession());
920
-		});
921
-		$this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
922
-			return new ContentSecurityPolicyManager();
923
-		});
924
-		$this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
925
-
926
-		$this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
927
-			return new ContentSecurityPolicyNonceManager(
928
-				$c->getCsrfTokenManager(),
929
-				$c->getRequest()
930
-			);
931
-		});
932
-
933
-		$this->registerService(\OCP\Share\IManager::class, function(Server $c) {
934
-			$config = $c->getConfig();
935
-			$factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
936
-			/** @var \OCP\Share\IProviderFactory $factory */
937
-			$factory = new $factoryClass($this);
938
-
939
-			$manager = new \OC\Share20\Manager(
940
-				$c->getLogger(),
941
-				$c->getConfig(),
942
-				$c->getSecureRandom(),
943
-				$c->getHasher(),
944
-				$c->getMountManager(),
945
-				$c->getGroupManager(),
946
-				$c->getL10N('core'),
947
-				$factory,
948
-				$c->getUserManager(),
949
-				$c->getLazyRootFolder(),
950
-				$c->getEventDispatcher()
951
-			);
952
-
953
-			return $manager;
954
-		});
955
-		$this->registerAlias('ShareManager', \OCP\Share\IManager::class);
956
-
957
-		$this->registerService('SettingsManager', function(Server $c) {
958
-			$manager = new \OC\Settings\Manager(
959
-				$c->getLogger(),
960
-				$c->getDatabaseConnection(),
961
-				$c->getL10N('lib'),
962
-				$c->getConfig(),
963
-				$c->getEncryptionManager(),
964
-				$c->getUserManager(),
965
-				$c->getLockingProvider(),
966
-				$c->getRequest(),
967
-				new \OC\Settings\Mapper($c->getDatabaseConnection()),
968
-				$c->getURLGenerator(),
969
-				$c->query(AccountManager::class),
970
-				$c->getGroupManager(),
971
-				$c->getL10NFactory(),
972
-				$c->getThemingDefaults(),
973
-				$c->getAppManager()
974
-			);
975
-			return $manager;
976
-		});
977
-		$this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
978
-			return new \OC\Files\AppData\Factory(
979
-				$c->getRootFolder(),
980
-				$c->getSystemConfig()
981
-			);
982
-		});
983
-
984
-		$this->registerService('LockdownManager', function (Server $c) {
985
-			return new LockdownManager(function() use ($c) {
986
-				return $c->getSession();
987
-			});
988
-		});
989
-
990
-		$this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
991
-			return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
992
-		});
993
-
994
-		$this->registerService(ICloudIdManager::class, function (Server $c) {
995
-			return new CloudIdManager();
996
-		});
997
-
998
-		/* To trick DI since we don't extend the DIContainer here */
999
-		$this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
1000
-			return new CleanPreviewsBackgroundJob(
1001
-				$c->getRootFolder(),
1002
-				$c->getLogger(),
1003
-				$c->getJobList(),
1004
-				new TimeFactory()
1005
-			);
1006
-		});
1007
-
1008
-		$this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
1009
-		$this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
1010
-
1011
-		$this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
1012
-		$this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
1013
-
1014
-		$this->registerService(Defaults::class, function (Server $c) {
1015
-			return new Defaults(
1016
-				$c->getThemingDefaults()
1017
-			);
1018
-		});
1019
-		$this->registerAlias('Defaults', \OCP\Defaults::class);
1020
-
1021
-		$this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
1022
-			return $c->query(\OCP\IUserSession::class)->getSession();
1023
-		});
1024
-
1025
-		$this->registerService(IShareHelper::class, function(Server $c) {
1026
-			return new ShareHelper(
1027
-				$c->query(\OCP\Share\IManager::class)
1028
-			);
1029
-		});
1030
-	}
1031
-
1032
-	/**
1033
-	 * @return \OCP\Contacts\IManager
1034
-	 */
1035
-	public function getContactsManager() {
1036
-		return $this->query('ContactsManager');
1037
-	}
1038
-
1039
-	/**
1040
-	 * @return \OC\Encryption\Manager
1041
-	 */
1042
-	public function getEncryptionManager() {
1043
-		return $this->query('EncryptionManager');
1044
-	}
1045
-
1046
-	/**
1047
-	 * @return \OC\Encryption\File
1048
-	 */
1049
-	public function getEncryptionFilesHelper() {
1050
-		return $this->query('EncryptionFileHelper');
1051
-	}
1052
-
1053
-	/**
1054
-	 * @return \OCP\Encryption\Keys\IStorage
1055
-	 */
1056
-	public function getEncryptionKeyStorage() {
1057
-		return $this->query('EncryptionKeyStorage');
1058
-	}
1059
-
1060
-	/**
1061
-	 * The current request object holding all information about the request
1062
-	 * currently being processed is returned from this method.
1063
-	 * In case the current execution was not initiated by a web request null is returned
1064
-	 *
1065
-	 * @return \OCP\IRequest
1066
-	 */
1067
-	public function getRequest() {
1068
-		return $this->query('Request');
1069
-	}
1070
-
1071
-	/**
1072
-	 * Returns the preview manager which can create preview images for a given file
1073
-	 *
1074
-	 * @return \OCP\IPreview
1075
-	 */
1076
-	public function getPreviewManager() {
1077
-		return $this->query('PreviewManager');
1078
-	}
1079
-
1080
-	/**
1081
-	 * Returns the tag manager which can get and set tags for different object types
1082
-	 *
1083
-	 * @see \OCP\ITagManager::load()
1084
-	 * @return \OCP\ITagManager
1085
-	 */
1086
-	public function getTagManager() {
1087
-		return $this->query('TagManager');
1088
-	}
1089
-
1090
-	/**
1091
-	 * Returns the system-tag manager
1092
-	 *
1093
-	 * @return \OCP\SystemTag\ISystemTagManager
1094
-	 *
1095
-	 * @since 9.0.0
1096
-	 */
1097
-	public function getSystemTagManager() {
1098
-		return $this->query('SystemTagManager');
1099
-	}
1100
-
1101
-	/**
1102
-	 * Returns the system-tag object mapper
1103
-	 *
1104
-	 * @return \OCP\SystemTag\ISystemTagObjectMapper
1105
-	 *
1106
-	 * @since 9.0.0
1107
-	 */
1108
-	public function getSystemTagObjectMapper() {
1109
-		return $this->query('SystemTagObjectMapper');
1110
-	}
1111
-
1112
-	/**
1113
-	 * Returns the avatar manager, used for avatar functionality
1114
-	 *
1115
-	 * @return \OCP\IAvatarManager
1116
-	 */
1117
-	public function getAvatarManager() {
1118
-		return $this->query('AvatarManager');
1119
-	}
1120
-
1121
-	/**
1122
-	 * Returns the root folder of ownCloud's data directory
1123
-	 *
1124
-	 * @return \OCP\Files\IRootFolder
1125
-	 */
1126
-	public function getRootFolder() {
1127
-		return $this->query('LazyRootFolder');
1128
-	}
1129
-
1130
-	/**
1131
-	 * Returns the root folder of ownCloud's data directory
1132
-	 * This is the lazy variant so this gets only initialized once it
1133
-	 * is actually used.
1134
-	 *
1135
-	 * @return \OCP\Files\IRootFolder
1136
-	 */
1137
-	public function getLazyRootFolder() {
1138
-		return $this->query('LazyRootFolder');
1139
-	}
1140
-
1141
-	/**
1142
-	 * Returns a view to ownCloud's files folder
1143
-	 *
1144
-	 * @param string $userId user ID
1145
-	 * @return \OCP\Files\Folder|null
1146
-	 */
1147
-	public function getUserFolder($userId = null) {
1148
-		if ($userId === null) {
1149
-			$user = $this->getUserSession()->getUser();
1150
-			if (!$user) {
1151
-				return null;
1152
-			}
1153
-			$userId = $user->getUID();
1154
-		}
1155
-		$root = $this->getRootFolder();
1156
-		return $root->getUserFolder($userId);
1157
-	}
1158
-
1159
-	/**
1160
-	 * Returns an app-specific view in ownClouds data directory
1161
-	 *
1162
-	 * @return \OCP\Files\Folder
1163
-	 * @deprecated since 9.2.0 use IAppData
1164
-	 */
1165
-	public function getAppFolder() {
1166
-		$dir = '/' . \OC_App::getCurrentApp();
1167
-		$root = $this->getRootFolder();
1168
-		if (!$root->nodeExists($dir)) {
1169
-			$folder = $root->newFolder($dir);
1170
-		} else {
1171
-			$folder = $root->get($dir);
1172
-		}
1173
-		return $folder;
1174
-	}
1175
-
1176
-	/**
1177
-	 * @return \OC\User\Manager
1178
-	 */
1179
-	public function getUserManager() {
1180
-		return $this->query('UserManager');
1181
-	}
1182
-
1183
-	/**
1184
-	 * @return \OC\Group\Manager
1185
-	 */
1186
-	public function getGroupManager() {
1187
-		return $this->query('GroupManager');
1188
-	}
1189
-
1190
-	/**
1191
-	 * @return \OC\User\Session
1192
-	 */
1193
-	public function getUserSession() {
1194
-		return $this->query('UserSession');
1195
-	}
1196
-
1197
-	/**
1198
-	 * @return \OCP\ISession
1199
-	 */
1200
-	public function getSession() {
1201
-		return $this->query('UserSession')->getSession();
1202
-	}
1203
-
1204
-	/**
1205
-	 * @param \OCP\ISession $session
1206
-	 */
1207
-	public function setSession(\OCP\ISession $session) {
1208
-		$this->query(SessionStorage::class)->setSession($session);
1209
-		$this->query('UserSession')->setSession($session);
1210
-		$this->query(Store::class)->setSession($session);
1211
-	}
1212
-
1213
-	/**
1214
-	 * @return \OC\Authentication\TwoFactorAuth\Manager
1215
-	 */
1216
-	public function getTwoFactorAuthManager() {
1217
-		return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
1218
-	}
1219
-
1220
-	/**
1221
-	 * @return \OC\NavigationManager
1222
-	 */
1223
-	public function getNavigationManager() {
1224
-		return $this->query('NavigationManager');
1225
-	}
1226
-
1227
-	/**
1228
-	 * @return \OCP\IConfig
1229
-	 */
1230
-	public function getConfig() {
1231
-		return $this->query('AllConfig');
1232
-	}
1233
-
1234
-	/**
1235
-	 * @internal For internal use only
1236
-	 * @return \OC\SystemConfig
1237
-	 */
1238
-	public function getSystemConfig() {
1239
-		return $this->query('SystemConfig');
1240
-	}
1241
-
1242
-	/**
1243
-	 * Returns the app config manager
1244
-	 *
1245
-	 * @return \OCP\IAppConfig
1246
-	 */
1247
-	public function getAppConfig() {
1248
-		return $this->query('AppConfig');
1249
-	}
1250
-
1251
-	/**
1252
-	 * @return \OCP\L10N\IFactory
1253
-	 */
1254
-	public function getL10NFactory() {
1255
-		return $this->query('L10NFactory');
1256
-	}
1257
-
1258
-	/**
1259
-	 * get an L10N instance
1260
-	 *
1261
-	 * @param string $app appid
1262
-	 * @param string $lang
1263
-	 * @return IL10N
1264
-	 */
1265
-	public function getL10N($app, $lang = null) {
1266
-		return $this->getL10NFactory()->get($app, $lang);
1267
-	}
1268
-
1269
-	/**
1270
-	 * @return \OCP\IURLGenerator
1271
-	 */
1272
-	public function getURLGenerator() {
1273
-		return $this->query('URLGenerator');
1274
-	}
1275
-
1276
-	/**
1277
-	 * @return \OCP\IHelper
1278
-	 */
1279
-	public function getHelper() {
1280
-		return $this->query('AppHelper');
1281
-	}
1282
-
1283
-	/**
1284
-	 * @return AppFetcher
1285
-	 */
1286
-	public function getAppFetcher() {
1287
-		return $this->query(AppFetcher::class);
1288
-	}
1289
-
1290
-	/**
1291
-	 * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
1292
-	 * getMemCacheFactory() instead.
1293
-	 *
1294
-	 * @return \OCP\ICache
1295
-	 * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
1296
-	 */
1297
-	public function getCache() {
1298
-		return $this->query('UserCache');
1299
-	}
1300
-
1301
-	/**
1302
-	 * Returns an \OCP\CacheFactory instance
1303
-	 *
1304
-	 * @return \OCP\ICacheFactory
1305
-	 */
1306
-	public function getMemCacheFactory() {
1307
-		return $this->query('MemCacheFactory');
1308
-	}
1309
-
1310
-	/**
1311
-	 * Returns an \OC\RedisFactory instance
1312
-	 *
1313
-	 * @return \OC\RedisFactory
1314
-	 */
1315
-	public function getGetRedisFactory() {
1316
-		return $this->query('RedisFactory');
1317
-	}
1318
-
1319
-
1320
-	/**
1321
-	 * Returns the current session
1322
-	 *
1323
-	 * @return \OCP\IDBConnection
1324
-	 */
1325
-	public function getDatabaseConnection() {
1326
-		return $this->query('DatabaseConnection');
1327
-	}
1328
-
1329
-	/**
1330
-	 * Returns the activity manager
1331
-	 *
1332
-	 * @return \OCP\Activity\IManager
1333
-	 */
1334
-	public function getActivityManager() {
1335
-		return $this->query('ActivityManager');
1336
-	}
1337
-
1338
-	/**
1339
-	 * Returns an job list for controlling background jobs
1340
-	 *
1341
-	 * @return \OCP\BackgroundJob\IJobList
1342
-	 */
1343
-	public function getJobList() {
1344
-		return $this->query('JobList');
1345
-	}
1346
-
1347
-	/**
1348
-	 * Returns a logger instance
1349
-	 *
1350
-	 * @return \OCP\ILogger
1351
-	 */
1352
-	public function getLogger() {
1353
-		return $this->query('Logger');
1354
-	}
1355
-
1356
-	/**
1357
-	 * Returns a router for generating and matching urls
1358
-	 *
1359
-	 * @return \OCP\Route\IRouter
1360
-	 */
1361
-	public function getRouter() {
1362
-		return $this->query('Router');
1363
-	}
1364
-
1365
-	/**
1366
-	 * Returns a search instance
1367
-	 *
1368
-	 * @return \OCP\ISearch
1369
-	 */
1370
-	public function getSearch() {
1371
-		return $this->query('Search');
1372
-	}
1373
-
1374
-	/**
1375
-	 * Returns a SecureRandom instance
1376
-	 *
1377
-	 * @return \OCP\Security\ISecureRandom
1378
-	 */
1379
-	public function getSecureRandom() {
1380
-		return $this->query('SecureRandom');
1381
-	}
1382
-
1383
-	/**
1384
-	 * Returns a Crypto instance
1385
-	 *
1386
-	 * @return \OCP\Security\ICrypto
1387
-	 */
1388
-	public function getCrypto() {
1389
-		return $this->query('Crypto');
1390
-	}
1391
-
1392
-	/**
1393
-	 * Returns a Hasher instance
1394
-	 *
1395
-	 * @return \OCP\Security\IHasher
1396
-	 */
1397
-	public function getHasher() {
1398
-		return $this->query('Hasher');
1399
-	}
1400
-
1401
-	/**
1402
-	 * Returns a CredentialsManager instance
1403
-	 *
1404
-	 * @return \OCP\Security\ICredentialsManager
1405
-	 */
1406
-	public function getCredentialsManager() {
1407
-		return $this->query('CredentialsManager');
1408
-	}
1409
-
1410
-	/**
1411
-	 * Returns an instance of the HTTP helper class
1412
-	 *
1413
-	 * @deprecated Use getHTTPClientService()
1414
-	 * @return \OC\HTTPHelper
1415
-	 */
1416
-	public function getHTTPHelper() {
1417
-		return $this->query('HTTPHelper');
1418
-	}
1419
-
1420
-	/**
1421
-	 * Get the certificate manager for the user
1422
-	 *
1423
-	 * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
1424
-	 * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
1425
-	 */
1426
-	public function getCertificateManager($userId = '') {
1427
-		if ($userId === '') {
1428
-			$userSession = $this->getUserSession();
1429
-			$user = $userSession->getUser();
1430
-			if (is_null($user)) {
1431
-				return null;
1432
-			}
1433
-			$userId = $user->getUID();
1434
-		}
1435
-		return new CertificateManager($userId, new View(), $this->getConfig(), $this->getLogger());
1436
-	}
1437
-
1438
-	/**
1439
-	 * Returns an instance of the HTTP client service
1440
-	 *
1441
-	 * @return \OCP\Http\Client\IClientService
1442
-	 */
1443
-	public function getHTTPClientService() {
1444
-		return $this->query('HttpClientService');
1445
-	}
1446
-
1447
-	/**
1448
-	 * Create a new event source
1449
-	 *
1450
-	 * @return \OCP\IEventSource
1451
-	 */
1452
-	public function createEventSource() {
1453
-		return new \OC_EventSource();
1454
-	}
1455
-
1456
-	/**
1457
-	 * Get the active event logger
1458
-	 *
1459
-	 * The returned logger only logs data when debug mode is enabled
1460
-	 *
1461
-	 * @return \OCP\Diagnostics\IEventLogger
1462
-	 */
1463
-	public function getEventLogger() {
1464
-		return $this->query('EventLogger');
1465
-	}
1466
-
1467
-	/**
1468
-	 * Get the active query logger
1469
-	 *
1470
-	 * The returned logger only logs data when debug mode is enabled
1471
-	 *
1472
-	 * @return \OCP\Diagnostics\IQueryLogger
1473
-	 */
1474
-	public function getQueryLogger() {
1475
-		return $this->query('QueryLogger');
1476
-	}
1477
-
1478
-	/**
1479
-	 * Get the manager for temporary files and folders
1480
-	 *
1481
-	 * @return \OCP\ITempManager
1482
-	 */
1483
-	public function getTempManager() {
1484
-		return $this->query('TempManager');
1485
-	}
1486
-
1487
-	/**
1488
-	 * Get the app manager
1489
-	 *
1490
-	 * @return \OCP\App\IAppManager
1491
-	 */
1492
-	public function getAppManager() {
1493
-		return $this->query('AppManager');
1494
-	}
1495
-
1496
-	/**
1497
-	 * Creates a new mailer
1498
-	 *
1499
-	 * @return \OCP\Mail\IMailer
1500
-	 */
1501
-	public function getMailer() {
1502
-		return $this->query('Mailer');
1503
-	}
1504
-
1505
-	/**
1506
-	 * Get the webroot
1507
-	 *
1508
-	 * @return string
1509
-	 */
1510
-	public function getWebRoot() {
1511
-		return $this->webRoot;
1512
-	}
1513
-
1514
-	/**
1515
-	 * @return \OC\OCSClient
1516
-	 */
1517
-	public function getOcsClient() {
1518
-		return $this->query('OcsClient');
1519
-	}
1520
-
1521
-	/**
1522
-	 * @return \OCP\IDateTimeZone
1523
-	 */
1524
-	public function getDateTimeZone() {
1525
-		return $this->query('DateTimeZone');
1526
-	}
1527
-
1528
-	/**
1529
-	 * @return \OCP\IDateTimeFormatter
1530
-	 */
1531
-	public function getDateTimeFormatter() {
1532
-		return $this->query('DateTimeFormatter');
1533
-	}
1534
-
1535
-	/**
1536
-	 * @return \OCP\Files\Config\IMountProviderCollection
1537
-	 */
1538
-	public function getMountProviderCollection() {
1539
-		return $this->query('MountConfigManager');
1540
-	}
1541
-
1542
-	/**
1543
-	 * Get the IniWrapper
1544
-	 *
1545
-	 * @return IniGetWrapper
1546
-	 */
1547
-	public function getIniWrapper() {
1548
-		return $this->query('IniWrapper');
1549
-	}
1550
-
1551
-	/**
1552
-	 * @return \OCP\Command\IBus
1553
-	 */
1554
-	public function getCommandBus() {
1555
-		return $this->query('AsyncCommandBus');
1556
-	}
1557
-
1558
-	/**
1559
-	 * Get the trusted domain helper
1560
-	 *
1561
-	 * @return TrustedDomainHelper
1562
-	 */
1563
-	public function getTrustedDomainHelper() {
1564
-		return $this->query('TrustedDomainHelper');
1565
-	}
1566
-
1567
-	/**
1568
-	 * Get the locking provider
1569
-	 *
1570
-	 * @return \OCP\Lock\ILockingProvider
1571
-	 * @since 8.1.0
1572
-	 */
1573
-	public function getLockingProvider() {
1574
-		return $this->query('LockingProvider');
1575
-	}
1576
-
1577
-	/**
1578
-	 * @return \OCP\Files\Mount\IMountManager
1579
-	 **/
1580
-	function getMountManager() {
1581
-		return $this->query('MountManager');
1582
-	}
1583
-
1584
-	/** @return \OCP\Files\Config\IUserMountCache */
1585
-	function getUserMountCache() {
1586
-		return $this->query('UserMountCache');
1587
-	}
1588
-
1589
-	/**
1590
-	 * Get the MimeTypeDetector
1591
-	 *
1592
-	 * @return \OCP\Files\IMimeTypeDetector
1593
-	 */
1594
-	public function getMimeTypeDetector() {
1595
-		return $this->query('MimeTypeDetector');
1596
-	}
1597
-
1598
-	/**
1599
-	 * Get the MimeTypeLoader
1600
-	 *
1601
-	 * @return \OCP\Files\IMimeTypeLoader
1602
-	 */
1603
-	public function getMimeTypeLoader() {
1604
-		return $this->query('MimeTypeLoader');
1605
-	}
1606
-
1607
-	/**
1608
-	 * Get the manager of all the capabilities
1609
-	 *
1610
-	 * @return \OC\CapabilitiesManager
1611
-	 */
1612
-	public function getCapabilitiesManager() {
1613
-		return $this->query('CapabilitiesManager');
1614
-	}
1615
-
1616
-	/**
1617
-	 * Get the EventDispatcher
1618
-	 *
1619
-	 * @return EventDispatcherInterface
1620
-	 * @since 8.2.0
1621
-	 */
1622
-	public function getEventDispatcher() {
1623
-		return $this->query('EventDispatcher');
1624
-	}
1625
-
1626
-	/**
1627
-	 * Get the Notification Manager
1628
-	 *
1629
-	 * @return \OCP\Notification\IManager
1630
-	 * @since 8.2.0
1631
-	 */
1632
-	public function getNotificationManager() {
1633
-		return $this->query('NotificationManager');
1634
-	}
1635
-
1636
-	/**
1637
-	 * @return \OCP\Comments\ICommentsManager
1638
-	 */
1639
-	public function getCommentsManager() {
1640
-		return $this->query('CommentsManager');
1641
-	}
1642
-
1643
-	/**
1644
-	 * @return \OCA\Theming\ThemingDefaults
1645
-	 */
1646
-	public function getThemingDefaults() {
1647
-		return $this->query('ThemingDefaults');
1648
-	}
1649
-
1650
-	/**
1651
-	 * @return \OC\IntegrityCheck\Checker
1652
-	 */
1653
-	public function getIntegrityCodeChecker() {
1654
-		return $this->query('IntegrityCodeChecker');
1655
-	}
1656
-
1657
-	/**
1658
-	 * @return \OC\Session\CryptoWrapper
1659
-	 */
1660
-	public function getSessionCryptoWrapper() {
1661
-		return $this->query('CryptoWrapper');
1662
-	}
1663
-
1664
-	/**
1665
-	 * @return CsrfTokenManager
1666
-	 */
1667
-	public function getCsrfTokenManager() {
1668
-		return $this->query('CsrfTokenManager');
1669
-	}
1670
-
1671
-	/**
1672
-	 * @return Throttler
1673
-	 */
1674
-	public function getBruteForceThrottler() {
1675
-		return $this->query('Throttler');
1676
-	}
1677
-
1678
-	/**
1679
-	 * @return IContentSecurityPolicyManager
1680
-	 */
1681
-	public function getContentSecurityPolicyManager() {
1682
-		return $this->query('ContentSecurityPolicyManager');
1683
-	}
1684
-
1685
-	/**
1686
-	 * @return ContentSecurityPolicyNonceManager
1687
-	 */
1688
-	public function getContentSecurityPolicyNonceManager() {
1689
-		return $this->query('ContentSecurityPolicyNonceManager');
1690
-	}
1691
-
1692
-	/**
1693
-	 * Not a public API as of 8.2, wait for 9.0
1694
-	 *
1695
-	 * @return \OCA\Files_External\Service\BackendService
1696
-	 */
1697
-	public function getStoragesBackendService() {
1698
-		return $this->query('OCA\\Files_External\\Service\\BackendService');
1699
-	}
1700
-
1701
-	/**
1702
-	 * Not a public API as of 8.2, wait for 9.0
1703
-	 *
1704
-	 * @return \OCA\Files_External\Service\GlobalStoragesService
1705
-	 */
1706
-	public function getGlobalStoragesService() {
1707
-		return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
1708
-	}
1709
-
1710
-	/**
1711
-	 * Not a public API as of 8.2, wait for 9.0
1712
-	 *
1713
-	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
1714
-	 */
1715
-	public function getUserGlobalStoragesService() {
1716
-		return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
1717
-	}
1718
-
1719
-	/**
1720
-	 * Not a public API as of 8.2, wait for 9.0
1721
-	 *
1722
-	 * @return \OCA\Files_External\Service\UserStoragesService
1723
-	 */
1724
-	public function getUserStoragesService() {
1725
-		return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
1726
-	}
1727
-
1728
-	/**
1729
-	 * @return \OCP\Share\IManager
1730
-	 */
1731
-	public function getShareManager() {
1732
-		return $this->query('ShareManager');
1733
-	}
1734
-
1735
-	/**
1736
-	 * Returns the LDAP Provider
1737
-	 *
1738
-	 * @return \OCP\LDAP\ILDAPProvider
1739
-	 */
1740
-	public function getLDAPProvider() {
1741
-		return $this->query('LDAPProvider');
1742
-	}
1743
-
1744
-	/**
1745
-	 * @return \OCP\Settings\IManager
1746
-	 */
1747
-	public function getSettingsManager() {
1748
-		return $this->query('SettingsManager');
1749
-	}
1750
-
1751
-	/**
1752
-	 * @return \OCP\Files\IAppData
1753
-	 */
1754
-	public function getAppDataDir($app) {
1755
-		/** @var \OC\Files\AppData\Factory $factory */
1756
-		$factory = $this->query(\OC\Files\AppData\Factory::class);
1757
-		return $factory->get($app);
1758
-	}
1759
-
1760
-	/**
1761
-	 * @return \OCP\Lockdown\ILockdownManager
1762
-	 */
1763
-	public function getLockdownManager() {
1764
-		return $this->query('LockdownManager');
1765
-	}
1766
-
1767
-	/**
1768
-	 * @return \OCP\Federation\ICloudIdManager
1769
-	 */
1770
-	public function getCloudIdManager() {
1771
-		return $this->query(ICloudIdManager::class);
1772
-	}
847
+            $prefixes = \OC::$composerAutoloader->getPrefixesPsr4();
848
+            if (isset($prefixes['OCA\\Theming\\'])) {
849
+                $classExists = true;
850
+            } else {
851
+                $classExists = false;
852
+            }
853
+
854
+            if ($classExists && $c->getConfig()->getSystemValue('installed', false) && $c->getAppManager()->isInstalled('theming')) {
855
+                return new ThemingDefaults(
856
+                    $c->getConfig(),
857
+                    $c->getL10N('theming'),
858
+                    $c->getURLGenerator(),
859
+                    $c->getAppDataDir('theming'),
860
+                    $c->getMemCacheFactory(),
861
+                    new Util($c->getConfig(), $this->getAppManager(), $this->getAppDataDir('theming'))
862
+                );
863
+            }
864
+            return new \OC_Defaults();
865
+        });
866
+        $this->registerService(SCSSCacher::class, function(Server $c) {
867
+            /** @var Factory $cacheFactory */
868
+            $cacheFactory = $c->query(Factory::class);
869
+            return new SCSSCacher(
870
+                $c->getLogger(),
871
+                $c->query(\OC\Files\AppData\Factory::class),
872
+                $c->getURLGenerator(),
873
+                $c->getConfig(),
874
+                $c->getThemingDefaults(),
875
+                \OC::$SERVERROOT,
876
+                $cacheFactory->create('SCSS')
877
+            );
878
+        });
879
+        $this->registerService(EventDispatcher::class, function () {
880
+            return new EventDispatcher();
881
+        });
882
+        $this->registerAlias('EventDispatcher', EventDispatcher::class);
883
+        $this->registerAlias(EventDispatcherInterface::class, EventDispatcher::class);
884
+
885
+        $this->registerService('CryptoWrapper', function (Server $c) {
886
+            // FIXME: Instantiiated here due to cyclic dependency
887
+            $request = new Request(
888
+                [
889
+                    'get' => $_GET,
890
+                    'post' => $_POST,
891
+                    'files' => $_FILES,
892
+                    'server' => $_SERVER,
893
+                    'env' => $_ENV,
894
+                    'cookies' => $_COOKIE,
895
+                    'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
896
+                        ? $_SERVER['REQUEST_METHOD']
897
+                        : null,
898
+                ],
899
+                $c->getSecureRandom(),
900
+                $c->getConfig()
901
+            );
902
+
903
+            return new CryptoWrapper(
904
+                $c->getConfig(),
905
+                $c->getCrypto(),
906
+                $c->getSecureRandom(),
907
+                $request
908
+            );
909
+        });
910
+        $this->registerService('CsrfTokenManager', function (Server $c) {
911
+            $tokenGenerator = new CsrfTokenGenerator($c->getSecureRandom());
912
+
913
+            return new CsrfTokenManager(
914
+                $tokenGenerator,
915
+                $c->query(SessionStorage::class)
916
+            );
917
+        });
918
+        $this->registerService(SessionStorage::class, function (Server $c) {
919
+            return new SessionStorage($c->getSession());
920
+        });
921
+        $this->registerService(\OCP\Security\IContentSecurityPolicyManager::class, function (Server $c) {
922
+            return new ContentSecurityPolicyManager();
923
+        });
924
+        $this->registerAlias('ContentSecurityPolicyManager', \OCP\Security\IContentSecurityPolicyManager::class);
925
+
926
+        $this->registerService('ContentSecurityPolicyNonceManager', function(Server $c) {
927
+            return new ContentSecurityPolicyNonceManager(
928
+                $c->getCsrfTokenManager(),
929
+                $c->getRequest()
930
+            );
931
+        });
932
+
933
+        $this->registerService(\OCP\Share\IManager::class, function(Server $c) {
934
+            $config = $c->getConfig();
935
+            $factoryClass = $config->getSystemValue('sharing.managerFactory', '\OC\Share20\ProviderFactory');
936
+            /** @var \OCP\Share\IProviderFactory $factory */
937
+            $factory = new $factoryClass($this);
938
+
939
+            $manager = new \OC\Share20\Manager(
940
+                $c->getLogger(),
941
+                $c->getConfig(),
942
+                $c->getSecureRandom(),
943
+                $c->getHasher(),
944
+                $c->getMountManager(),
945
+                $c->getGroupManager(),
946
+                $c->getL10N('core'),
947
+                $factory,
948
+                $c->getUserManager(),
949
+                $c->getLazyRootFolder(),
950
+                $c->getEventDispatcher()
951
+            );
952
+
953
+            return $manager;
954
+        });
955
+        $this->registerAlias('ShareManager', \OCP\Share\IManager::class);
956
+
957
+        $this->registerService('SettingsManager', function(Server $c) {
958
+            $manager = new \OC\Settings\Manager(
959
+                $c->getLogger(),
960
+                $c->getDatabaseConnection(),
961
+                $c->getL10N('lib'),
962
+                $c->getConfig(),
963
+                $c->getEncryptionManager(),
964
+                $c->getUserManager(),
965
+                $c->getLockingProvider(),
966
+                $c->getRequest(),
967
+                new \OC\Settings\Mapper($c->getDatabaseConnection()),
968
+                $c->getURLGenerator(),
969
+                $c->query(AccountManager::class),
970
+                $c->getGroupManager(),
971
+                $c->getL10NFactory(),
972
+                $c->getThemingDefaults(),
973
+                $c->getAppManager()
974
+            );
975
+            return $manager;
976
+        });
977
+        $this->registerService(\OC\Files\AppData\Factory::class, function (Server $c) {
978
+            return new \OC\Files\AppData\Factory(
979
+                $c->getRootFolder(),
980
+                $c->getSystemConfig()
981
+            );
982
+        });
983
+
984
+        $this->registerService('LockdownManager', function (Server $c) {
985
+            return new LockdownManager(function() use ($c) {
986
+                return $c->getSession();
987
+            });
988
+        });
989
+
990
+        $this->registerService(\OCP\OCS\IDiscoveryService::class, function (Server $c) {
991
+            return new DiscoveryService($c->getMemCacheFactory(), $c->getHTTPClientService());
992
+        });
993
+
994
+        $this->registerService(ICloudIdManager::class, function (Server $c) {
995
+            return new CloudIdManager();
996
+        });
997
+
998
+        /* To trick DI since we don't extend the DIContainer here */
999
+        $this->registerService(CleanPreviewsBackgroundJob::class, function (Server $c) {
1000
+            return new CleanPreviewsBackgroundJob(
1001
+                $c->getRootFolder(),
1002
+                $c->getLogger(),
1003
+                $c->getJobList(),
1004
+                new TimeFactory()
1005
+            );
1006
+        });
1007
+
1008
+        $this->registerAlias(\OCP\AppFramework\Utility\IControllerMethodReflector::class, \OC\AppFramework\Utility\ControllerMethodReflector::class);
1009
+        $this->registerAlias('ControllerMethodReflector', \OCP\AppFramework\Utility\IControllerMethodReflector::class);
1010
+
1011
+        $this->registerAlias(\OCP\AppFramework\Utility\ITimeFactory::class, \OC\AppFramework\Utility\TimeFactory::class);
1012
+        $this->registerAlias('TimeFactory', \OCP\AppFramework\Utility\ITimeFactory::class);
1013
+
1014
+        $this->registerService(Defaults::class, function (Server $c) {
1015
+            return new Defaults(
1016
+                $c->getThemingDefaults()
1017
+            );
1018
+        });
1019
+        $this->registerAlias('Defaults', \OCP\Defaults::class);
1020
+
1021
+        $this->registerService(\OCP\ISession::class, function(SimpleContainer $c) {
1022
+            return $c->query(\OCP\IUserSession::class)->getSession();
1023
+        });
1024
+
1025
+        $this->registerService(IShareHelper::class, function(Server $c) {
1026
+            return new ShareHelper(
1027
+                $c->query(\OCP\Share\IManager::class)
1028
+            );
1029
+        });
1030
+    }
1031
+
1032
+    /**
1033
+     * @return \OCP\Contacts\IManager
1034
+     */
1035
+    public function getContactsManager() {
1036
+        return $this->query('ContactsManager');
1037
+    }
1038
+
1039
+    /**
1040
+     * @return \OC\Encryption\Manager
1041
+     */
1042
+    public function getEncryptionManager() {
1043
+        return $this->query('EncryptionManager');
1044
+    }
1045
+
1046
+    /**
1047
+     * @return \OC\Encryption\File
1048
+     */
1049
+    public function getEncryptionFilesHelper() {
1050
+        return $this->query('EncryptionFileHelper');
1051
+    }
1052
+
1053
+    /**
1054
+     * @return \OCP\Encryption\Keys\IStorage
1055
+     */
1056
+    public function getEncryptionKeyStorage() {
1057
+        return $this->query('EncryptionKeyStorage');
1058
+    }
1059
+
1060
+    /**
1061
+     * The current request object holding all information about the request
1062
+     * currently being processed is returned from this method.
1063
+     * In case the current execution was not initiated by a web request null is returned
1064
+     *
1065
+     * @return \OCP\IRequest
1066
+     */
1067
+    public function getRequest() {
1068
+        return $this->query('Request');
1069
+    }
1070
+
1071
+    /**
1072
+     * Returns the preview manager which can create preview images for a given file
1073
+     *
1074
+     * @return \OCP\IPreview
1075
+     */
1076
+    public function getPreviewManager() {
1077
+        return $this->query('PreviewManager');
1078
+    }
1079
+
1080
+    /**
1081
+     * Returns the tag manager which can get and set tags for different object types
1082
+     *
1083
+     * @see \OCP\ITagManager::load()
1084
+     * @return \OCP\ITagManager
1085
+     */
1086
+    public function getTagManager() {
1087
+        return $this->query('TagManager');
1088
+    }
1089
+
1090
+    /**
1091
+     * Returns the system-tag manager
1092
+     *
1093
+     * @return \OCP\SystemTag\ISystemTagManager
1094
+     *
1095
+     * @since 9.0.0
1096
+     */
1097
+    public function getSystemTagManager() {
1098
+        return $this->query('SystemTagManager');
1099
+    }
1100
+
1101
+    /**
1102
+     * Returns the system-tag object mapper
1103
+     *
1104
+     * @return \OCP\SystemTag\ISystemTagObjectMapper
1105
+     *
1106
+     * @since 9.0.0
1107
+     */
1108
+    public function getSystemTagObjectMapper() {
1109
+        return $this->query('SystemTagObjectMapper');
1110
+    }
1111
+
1112
+    /**
1113
+     * Returns the avatar manager, used for avatar functionality
1114
+     *
1115
+     * @return \OCP\IAvatarManager
1116
+     */
1117
+    public function getAvatarManager() {
1118
+        return $this->query('AvatarManager');
1119
+    }
1120
+
1121
+    /**
1122
+     * Returns the root folder of ownCloud's data directory
1123
+     *
1124
+     * @return \OCP\Files\IRootFolder
1125
+     */
1126
+    public function getRootFolder() {
1127
+        return $this->query('LazyRootFolder');
1128
+    }
1129
+
1130
+    /**
1131
+     * Returns the root folder of ownCloud's data directory
1132
+     * This is the lazy variant so this gets only initialized once it
1133
+     * is actually used.
1134
+     *
1135
+     * @return \OCP\Files\IRootFolder
1136
+     */
1137
+    public function getLazyRootFolder() {
1138
+        return $this->query('LazyRootFolder');
1139
+    }
1140
+
1141
+    /**
1142
+     * Returns a view to ownCloud's files folder
1143
+     *
1144
+     * @param string $userId user ID
1145
+     * @return \OCP\Files\Folder|null
1146
+     */
1147
+    public function getUserFolder($userId = null) {
1148
+        if ($userId === null) {
1149
+            $user = $this->getUserSession()->getUser();
1150
+            if (!$user) {
1151
+                return null;
1152
+            }
1153
+            $userId = $user->getUID();
1154
+        }
1155
+        $root = $this->getRootFolder();
1156
+        return $root->getUserFolder($userId);
1157
+    }
1158
+
1159
+    /**
1160
+     * Returns an app-specific view in ownClouds data directory
1161
+     *
1162
+     * @return \OCP\Files\Folder
1163
+     * @deprecated since 9.2.0 use IAppData
1164
+     */
1165
+    public function getAppFolder() {
1166
+        $dir = '/' . \OC_App::getCurrentApp();
1167
+        $root = $this->getRootFolder();
1168
+        if (!$root->nodeExists($dir)) {
1169
+            $folder = $root->newFolder($dir);
1170
+        } else {
1171
+            $folder = $root->get($dir);
1172
+        }
1173
+        return $folder;
1174
+    }
1175
+
1176
+    /**
1177
+     * @return \OC\User\Manager
1178
+     */
1179
+    public function getUserManager() {
1180
+        return $this->query('UserManager');
1181
+    }
1182
+
1183
+    /**
1184
+     * @return \OC\Group\Manager
1185
+     */
1186
+    public function getGroupManager() {
1187
+        return $this->query('GroupManager');
1188
+    }
1189
+
1190
+    /**
1191
+     * @return \OC\User\Session
1192
+     */
1193
+    public function getUserSession() {
1194
+        return $this->query('UserSession');
1195
+    }
1196
+
1197
+    /**
1198
+     * @return \OCP\ISession
1199
+     */
1200
+    public function getSession() {
1201
+        return $this->query('UserSession')->getSession();
1202
+    }
1203
+
1204
+    /**
1205
+     * @param \OCP\ISession $session
1206
+     */
1207
+    public function setSession(\OCP\ISession $session) {
1208
+        $this->query(SessionStorage::class)->setSession($session);
1209
+        $this->query('UserSession')->setSession($session);
1210
+        $this->query(Store::class)->setSession($session);
1211
+    }
1212
+
1213
+    /**
1214
+     * @return \OC\Authentication\TwoFactorAuth\Manager
1215
+     */
1216
+    public function getTwoFactorAuthManager() {
1217
+        return $this->query('\OC\Authentication\TwoFactorAuth\Manager');
1218
+    }
1219
+
1220
+    /**
1221
+     * @return \OC\NavigationManager
1222
+     */
1223
+    public function getNavigationManager() {
1224
+        return $this->query('NavigationManager');
1225
+    }
1226
+
1227
+    /**
1228
+     * @return \OCP\IConfig
1229
+     */
1230
+    public function getConfig() {
1231
+        return $this->query('AllConfig');
1232
+    }
1233
+
1234
+    /**
1235
+     * @internal For internal use only
1236
+     * @return \OC\SystemConfig
1237
+     */
1238
+    public function getSystemConfig() {
1239
+        return $this->query('SystemConfig');
1240
+    }
1241
+
1242
+    /**
1243
+     * Returns the app config manager
1244
+     *
1245
+     * @return \OCP\IAppConfig
1246
+     */
1247
+    public function getAppConfig() {
1248
+        return $this->query('AppConfig');
1249
+    }
1250
+
1251
+    /**
1252
+     * @return \OCP\L10N\IFactory
1253
+     */
1254
+    public function getL10NFactory() {
1255
+        return $this->query('L10NFactory');
1256
+    }
1257
+
1258
+    /**
1259
+     * get an L10N instance
1260
+     *
1261
+     * @param string $app appid
1262
+     * @param string $lang
1263
+     * @return IL10N
1264
+     */
1265
+    public function getL10N($app, $lang = null) {
1266
+        return $this->getL10NFactory()->get($app, $lang);
1267
+    }
1268
+
1269
+    /**
1270
+     * @return \OCP\IURLGenerator
1271
+     */
1272
+    public function getURLGenerator() {
1273
+        return $this->query('URLGenerator');
1274
+    }
1275
+
1276
+    /**
1277
+     * @return \OCP\IHelper
1278
+     */
1279
+    public function getHelper() {
1280
+        return $this->query('AppHelper');
1281
+    }
1282
+
1283
+    /**
1284
+     * @return AppFetcher
1285
+     */
1286
+    public function getAppFetcher() {
1287
+        return $this->query(AppFetcher::class);
1288
+    }
1289
+
1290
+    /**
1291
+     * Returns an ICache instance. Since 8.1.0 it returns a fake cache. Use
1292
+     * getMemCacheFactory() instead.
1293
+     *
1294
+     * @return \OCP\ICache
1295
+     * @deprecated 8.1.0 use getMemCacheFactory to obtain a proper cache
1296
+     */
1297
+    public function getCache() {
1298
+        return $this->query('UserCache');
1299
+    }
1300
+
1301
+    /**
1302
+     * Returns an \OCP\CacheFactory instance
1303
+     *
1304
+     * @return \OCP\ICacheFactory
1305
+     */
1306
+    public function getMemCacheFactory() {
1307
+        return $this->query('MemCacheFactory');
1308
+    }
1309
+
1310
+    /**
1311
+     * Returns an \OC\RedisFactory instance
1312
+     *
1313
+     * @return \OC\RedisFactory
1314
+     */
1315
+    public function getGetRedisFactory() {
1316
+        return $this->query('RedisFactory');
1317
+    }
1318
+
1319
+
1320
+    /**
1321
+     * Returns the current session
1322
+     *
1323
+     * @return \OCP\IDBConnection
1324
+     */
1325
+    public function getDatabaseConnection() {
1326
+        return $this->query('DatabaseConnection');
1327
+    }
1328
+
1329
+    /**
1330
+     * Returns the activity manager
1331
+     *
1332
+     * @return \OCP\Activity\IManager
1333
+     */
1334
+    public function getActivityManager() {
1335
+        return $this->query('ActivityManager');
1336
+    }
1337
+
1338
+    /**
1339
+     * Returns an job list for controlling background jobs
1340
+     *
1341
+     * @return \OCP\BackgroundJob\IJobList
1342
+     */
1343
+    public function getJobList() {
1344
+        return $this->query('JobList');
1345
+    }
1346
+
1347
+    /**
1348
+     * Returns a logger instance
1349
+     *
1350
+     * @return \OCP\ILogger
1351
+     */
1352
+    public function getLogger() {
1353
+        return $this->query('Logger');
1354
+    }
1355
+
1356
+    /**
1357
+     * Returns a router for generating and matching urls
1358
+     *
1359
+     * @return \OCP\Route\IRouter
1360
+     */
1361
+    public function getRouter() {
1362
+        return $this->query('Router');
1363
+    }
1364
+
1365
+    /**
1366
+     * Returns a search instance
1367
+     *
1368
+     * @return \OCP\ISearch
1369
+     */
1370
+    public function getSearch() {
1371
+        return $this->query('Search');
1372
+    }
1373
+
1374
+    /**
1375
+     * Returns a SecureRandom instance
1376
+     *
1377
+     * @return \OCP\Security\ISecureRandom
1378
+     */
1379
+    public function getSecureRandom() {
1380
+        return $this->query('SecureRandom');
1381
+    }
1382
+
1383
+    /**
1384
+     * Returns a Crypto instance
1385
+     *
1386
+     * @return \OCP\Security\ICrypto
1387
+     */
1388
+    public function getCrypto() {
1389
+        return $this->query('Crypto');
1390
+    }
1391
+
1392
+    /**
1393
+     * Returns a Hasher instance
1394
+     *
1395
+     * @return \OCP\Security\IHasher
1396
+     */
1397
+    public function getHasher() {
1398
+        return $this->query('Hasher');
1399
+    }
1400
+
1401
+    /**
1402
+     * Returns a CredentialsManager instance
1403
+     *
1404
+     * @return \OCP\Security\ICredentialsManager
1405
+     */
1406
+    public function getCredentialsManager() {
1407
+        return $this->query('CredentialsManager');
1408
+    }
1409
+
1410
+    /**
1411
+     * Returns an instance of the HTTP helper class
1412
+     *
1413
+     * @deprecated Use getHTTPClientService()
1414
+     * @return \OC\HTTPHelper
1415
+     */
1416
+    public function getHTTPHelper() {
1417
+        return $this->query('HTTPHelper');
1418
+    }
1419
+
1420
+    /**
1421
+     * Get the certificate manager for the user
1422
+     *
1423
+     * @param string $userId (optional) if not specified the current loggedin user is used, use null to get the system certificate manager
1424
+     * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
1425
+     */
1426
+    public function getCertificateManager($userId = '') {
1427
+        if ($userId === '') {
1428
+            $userSession = $this->getUserSession();
1429
+            $user = $userSession->getUser();
1430
+            if (is_null($user)) {
1431
+                return null;
1432
+            }
1433
+            $userId = $user->getUID();
1434
+        }
1435
+        return new CertificateManager($userId, new View(), $this->getConfig(), $this->getLogger());
1436
+    }
1437
+
1438
+    /**
1439
+     * Returns an instance of the HTTP client service
1440
+     *
1441
+     * @return \OCP\Http\Client\IClientService
1442
+     */
1443
+    public function getHTTPClientService() {
1444
+        return $this->query('HttpClientService');
1445
+    }
1446
+
1447
+    /**
1448
+     * Create a new event source
1449
+     *
1450
+     * @return \OCP\IEventSource
1451
+     */
1452
+    public function createEventSource() {
1453
+        return new \OC_EventSource();
1454
+    }
1455
+
1456
+    /**
1457
+     * Get the active event logger
1458
+     *
1459
+     * The returned logger only logs data when debug mode is enabled
1460
+     *
1461
+     * @return \OCP\Diagnostics\IEventLogger
1462
+     */
1463
+    public function getEventLogger() {
1464
+        return $this->query('EventLogger');
1465
+    }
1466
+
1467
+    /**
1468
+     * Get the active query logger
1469
+     *
1470
+     * The returned logger only logs data when debug mode is enabled
1471
+     *
1472
+     * @return \OCP\Diagnostics\IQueryLogger
1473
+     */
1474
+    public function getQueryLogger() {
1475
+        return $this->query('QueryLogger');
1476
+    }
1477
+
1478
+    /**
1479
+     * Get the manager for temporary files and folders
1480
+     *
1481
+     * @return \OCP\ITempManager
1482
+     */
1483
+    public function getTempManager() {
1484
+        return $this->query('TempManager');
1485
+    }
1486
+
1487
+    /**
1488
+     * Get the app manager
1489
+     *
1490
+     * @return \OCP\App\IAppManager
1491
+     */
1492
+    public function getAppManager() {
1493
+        return $this->query('AppManager');
1494
+    }
1495
+
1496
+    /**
1497
+     * Creates a new mailer
1498
+     *
1499
+     * @return \OCP\Mail\IMailer
1500
+     */
1501
+    public function getMailer() {
1502
+        return $this->query('Mailer');
1503
+    }
1504
+
1505
+    /**
1506
+     * Get the webroot
1507
+     *
1508
+     * @return string
1509
+     */
1510
+    public function getWebRoot() {
1511
+        return $this->webRoot;
1512
+    }
1513
+
1514
+    /**
1515
+     * @return \OC\OCSClient
1516
+     */
1517
+    public function getOcsClient() {
1518
+        return $this->query('OcsClient');
1519
+    }
1520
+
1521
+    /**
1522
+     * @return \OCP\IDateTimeZone
1523
+     */
1524
+    public function getDateTimeZone() {
1525
+        return $this->query('DateTimeZone');
1526
+    }
1527
+
1528
+    /**
1529
+     * @return \OCP\IDateTimeFormatter
1530
+     */
1531
+    public function getDateTimeFormatter() {
1532
+        return $this->query('DateTimeFormatter');
1533
+    }
1534
+
1535
+    /**
1536
+     * @return \OCP\Files\Config\IMountProviderCollection
1537
+     */
1538
+    public function getMountProviderCollection() {
1539
+        return $this->query('MountConfigManager');
1540
+    }
1541
+
1542
+    /**
1543
+     * Get the IniWrapper
1544
+     *
1545
+     * @return IniGetWrapper
1546
+     */
1547
+    public function getIniWrapper() {
1548
+        return $this->query('IniWrapper');
1549
+    }
1550
+
1551
+    /**
1552
+     * @return \OCP\Command\IBus
1553
+     */
1554
+    public function getCommandBus() {
1555
+        return $this->query('AsyncCommandBus');
1556
+    }
1557
+
1558
+    /**
1559
+     * Get the trusted domain helper
1560
+     *
1561
+     * @return TrustedDomainHelper
1562
+     */
1563
+    public function getTrustedDomainHelper() {
1564
+        return $this->query('TrustedDomainHelper');
1565
+    }
1566
+
1567
+    /**
1568
+     * Get the locking provider
1569
+     *
1570
+     * @return \OCP\Lock\ILockingProvider
1571
+     * @since 8.1.0
1572
+     */
1573
+    public function getLockingProvider() {
1574
+        return $this->query('LockingProvider');
1575
+    }
1576
+
1577
+    /**
1578
+     * @return \OCP\Files\Mount\IMountManager
1579
+     **/
1580
+    function getMountManager() {
1581
+        return $this->query('MountManager');
1582
+    }
1583
+
1584
+    /** @return \OCP\Files\Config\IUserMountCache */
1585
+    function getUserMountCache() {
1586
+        return $this->query('UserMountCache');
1587
+    }
1588
+
1589
+    /**
1590
+     * Get the MimeTypeDetector
1591
+     *
1592
+     * @return \OCP\Files\IMimeTypeDetector
1593
+     */
1594
+    public function getMimeTypeDetector() {
1595
+        return $this->query('MimeTypeDetector');
1596
+    }
1597
+
1598
+    /**
1599
+     * Get the MimeTypeLoader
1600
+     *
1601
+     * @return \OCP\Files\IMimeTypeLoader
1602
+     */
1603
+    public function getMimeTypeLoader() {
1604
+        return $this->query('MimeTypeLoader');
1605
+    }
1606
+
1607
+    /**
1608
+     * Get the manager of all the capabilities
1609
+     *
1610
+     * @return \OC\CapabilitiesManager
1611
+     */
1612
+    public function getCapabilitiesManager() {
1613
+        return $this->query('CapabilitiesManager');
1614
+    }
1615
+
1616
+    /**
1617
+     * Get the EventDispatcher
1618
+     *
1619
+     * @return EventDispatcherInterface
1620
+     * @since 8.2.0
1621
+     */
1622
+    public function getEventDispatcher() {
1623
+        return $this->query('EventDispatcher');
1624
+    }
1625
+
1626
+    /**
1627
+     * Get the Notification Manager
1628
+     *
1629
+     * @return \OCP\Notification\IManager
1630
+     * @since 8.2.0
1631
+     */
1632
+    public function getNotificationManager() {
1633
+        return $this->query('NotificationManager');
1634
+    }
1635
+
1636
+    /**
1637
+     * @return \OCP\Comments\ICommentsManager
1638
+     */
1639
+    public function getCommentsManager() {
1640
+        return $this->query('CommentsManager');
1641
+    }
1642
+
1643
+    /**
1644
+     * @return \OCA\Theming\ThemingDefaults
1645
+     */
1646
+    public function getThemingDefaults() {
1647
+        return $this->query('ThemingDefaults');
1648
+    }
1649
+
1650
+    /**
1651
+     * @return \OC\IntegrityCheck\Checker
1652
+     */
1653
+    public function getIntegrityCodeChecker() {
1654
+        return $this->query('IntegrityCodeChecker');
1655
+    }
1656
+
1657
+    /**
1658
+     * @return \OC\Session\CryptoWrapper
1659
+     */
1660
+    public function getSessionCryptoWrapper() {
1661
+        return $this->query('CryptoWrapper');
1662
+    }
1663
+
1664
+    /**
1665
+     * @return CsrfTokenManager
1666
+     */
1667
+    public function getCsrfTokenManager() {
1668
+        return $this->query('CsrfTokenManager');
1669
+    }
1670
+
1671
+    /**
1672
+     * @return Throttler
1673
+     */
1674
+    public function getBruteForceThrottler() {
1675
+        return $this->query('Throttler');
1676
+    }
1677
+
1678
+    /**
1679
+     * @return IContentSecurityPolicyManager
1680
+     */
1681
+    public function getContentSecurityPolicyManager() {
1682
+        return $this->query('ContentSecurityPolicyManager');
1683
+    }
1684
+
1685
+    /**
1686
+     * @return ContentSecurityPolicyNonceManager
1687
+     */
1688
+    public function getContentSecurityPolicyNonceManager() {
1689
+        return $this->query('ContentSecurityPolicyNonceManager');
1690
+    }
1691
+
1692
+    /**
1693
+     * Not a public API as of 8.2, wait for 9.0
1694
+     *
1695
+     * @return \OCA\Files_External\Service\BackendService
1696
+     */
1697
+    public function getStoragesBackendService() {
1698
+        return $this->query('OCA\\Files_External\\Service\\BackendService');
1699
+    }
1700
+
1701
+    /**
1702
+     * Not a public API as of 8.2, wait for 9.0
1703
+     *
1704
+     * @return \OCA\Files_External\Service\GlobalStoragesService
1705
+     */
1706
+    public function getGlobalStoragesService() {
1707
+        return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService');
1708
+    }
1709
+
1710
+    /**
1711
+     * Not a public API as of 8.2, wait for 9.0
1712
+     *
1713
+     * @return \OCA\Files_External\Service\UserGlobalStoragesService
1714
+     */
1715
+    public function getUserGlobalStoragesService() {
1716
+        return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
1717
+    }
1718
+
1719
+    /**
1720
+     * Not a public API as of 8.2, wait for 9.0
1721
+     *
1722
+     * @return \OCA\Files_External\Service\UserStoragesService
1723
+     */
1724
+    public function getUserStoragesService() {
1725
+        return $this->query('OCA\\Files_External\\Service\\UserStoragesService');
1726
+    }
1727
+
1728
+    /**
1729
+     * @return \OCP\Share\IManager
1730
+     */
1731
+    public function getShareManager() {
1732
+        return $this->query('ShareManager');
1733
+    }
1734
+
1735
+    /**
1736
+     * Returns the LDAP Provider
1737
+     *
1738
+     * @return \OCP\LDAP\ILDAPProvider
1739
+     */
1740
+    public function getLDAPProvider() {
1741
+        return $this->query('LDAPProvider');
1742
+    }
1743
+
1744
+    /**
1745
+     * @return \OCP\Settings\IManager
1746
+     */
1747
+    public function getSettingsManager() {
1748
+        return $this->query('SettingsManager');
1749
+    }
1750
+
1751
+    /**
1752
+     * @return \OCP\Files\IAppData
1753
+     */
1754
+    public function getAppDataDir($app) {
1755
+        /** @var \OC\Files\AppData\Factory $factory */
1756
+        $factory = $this->query(\OC\Files\AppData\Factory::class);
1757
+        return $factory->get($app);
1758
+    }
1759
+
1760
+    /**
1761
+     * @return \OCP\Lockdown\ILockdownManager
1762
+     */
1763
+    public function getLockdownManager() {
1764
+        return $this->query('LockdownManager');
1765
+    }
1766
+
1767
+    /**
1768
+     * @return \OCP\Federation\ICloudIdManager
1769
+     */
1770
+    public function getCloudIdManager() {
1771
+        return $this->query(ICloudIdManager::class);
1772
+    }
1773 1773
 }
Please login to merge, or discard this patch.
lib/private/Settings/Manager.php 1 patch
Indentation   +469 added lines, -469 removed lines patch added patch discarded remove patch
@@ -42,473 +42,473 @@
 block discarded – undo
42 42
 use OCP\Settings\ISection;
43 43
 
44 44
 class Manager implements IManager {
45
-	/** @var ILogger */
46
-	private $log;
47
-	/** @var IDBConnection */
48
-	private $dbc;
49
-	/** @var Mapper */
50
-	private $mapper;
51
-	/** @var IL10N */
52
-	private $l;
53
-	/** @var IConfig */
54
-	private $config;
55
-	/** @var EncryptionManager */
56
-	private $encryptionManager;
57
-	/** @var IUserManager */
58
-	private $userManager;
59
-	/** @var ILockingProvider */
60
-	private $lockingProvider;
61
-	/** @var IRequest */
62
-	private $request;
63
-	/** @var IURLGenerator */
64
-	private $url;
65
-	/** @var AccountManager */
66
-	private $accountManager;
67
-	/** @var IGroupManager */
68
-	private $groupManager;
69
-	/** @var IFactory */
70
-	private $l10nFactory;
71
-	/** @var \OC_Defaults */
72
-	private $defaults;
73
-	/** @var IAppManager */
74
-	private $appManager;
75
-
76
-	/**
77
-	 * @param ILogger $log
78
-	 * @param IDBConnection $dbc
79
-	 * @param IL10N $l
80
-	 * @param IConfig $config
81
-	 * @param EncryptionManager $encryptionManager
82
-	 * @param IUserManager $userManager
83
-	 * @param ILockingProvider $lockingProvider
84
-	 * @param IRequest $request
85
-	 * @param Mapper $mapper
86
-	 * @param IURLGenerator $url
87
-	 * @param AccountManager $accountManager
88
-	 * @param IGroupManager $groupManager
89
-	 * @param IFactory $l10nFactory
90
-	 * @param \OC_Defaults $defaults
91
-	 */
92
-	public function __construct(
93
-		ILogger $log,
94
-		IDBConnection $dbc,
95
-		IL10N $l,
96
-		IConfig $config,
97
-		EncryptionManager $encryptionManager,
98
-		IUserManager $userManager,
99
-		ILockingProvider $lockingProvider,
100
-		IRequest $request,
101
-		Mapper $mapper,
102
-		IURLGenerator $url,
103
-		AccountManager $accountManager,
104
-		IGroupManager $groupManager,
105
-		IFactory $l10nFactory,
106
-		\OC_Defaults $defaults,
107
-		IAppManager $appManager
108
-	) {
109
-		$this->log = $log;
110
-		$this->dbc = $dbc;
111
-		$this->mapper = $mapper;
112
-		$this->l = $l;
113
-		$this->config = $config;
114
-		$this->encryptionManager = $encryptionManager;
115
-		$this->userManager = $userManager;
116
-		$this->lockingProvider = $lockingProvider;
117
-		$this->request = $request;
118
-		$this->url = $url;
119
-		$this->accountManager = $accountManager;
120
-		$this->groupManager = $groupManager;
121
-		$this->l10nFactory = $l10nFactory;
122
-		$this->defaults = $defaults;
123
-		$this->appManager = $appManager;
124
-	}
125
-
126
-	/**
127
-	 * @inheritdoc
128
-	 */
129
-	public function setupSettings(array $settings) {
130
-		if (isset($settings[IManager::KEY_ADMIN_SECTION])) {
131
-			$this->setupSectionEntry($settings[IManager::KEY_ADMIN_SECTION], 'admin');
132
-		}
133
-		if (isset($settings[IManager::KEY_ADMIN_SETTINGS])) {
134
-			$this->setupSettingsEntry($settings[IManager::KEY_ADMIN_SETTINGS], 'admin');
135
-		}
136
-
137
-		if (isset($settings[IManager::KEY_PERSONAL_SECTION])) {
138
-			$this->setupSectionEntry($settings[IManager::KEY_PERSONAL_SECTION], 'personal');
139
-		}
140
-		if (isset($settings[IManager::KEY_PERSONAL_SETTINGS])) {
141
-			$this->setupSettingsEntry($settings[IManager::KEY_PERSONAL_SETTINGS], 'personal');
142
-		}
143
-	}
144
-
145
-	/**
146
-	 * attempts to remove an apps section and/or settings entry. A listener is
147
-	 * added centrally making sure that this method is called ones an app was
148
-	 * disabled.
149
-	 *
150
-	 * @param string $appId
151
-	 * @since 9.1.0
152
-	 */
153
-	public function onAppDisabled($appId) {
154
-		$appInfo = \OC_App::getAppInfo($appId); // hello static legacy
155
-
156
-		if (isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
157
-			$this->mapper->remove(Mapper::TABLE_ADMIN_SECTIONS, trim($appInfo['settings'][IManager::KEY_ADMIN_SECTION], '\\'));
158
-		}
159
-		if (isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) {
160
-			$this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, trim($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS], '\\'));
161
-		}
162
-
163
-		if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SECTION])) {
164
-			$this->mapper->remove(Mapper::TABLE_PERSONAL_SECTIONS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SECTION], '\\'));
165
-		}
166
-		if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS])) {
167
-			$this->mapper->remove(Mapper::TABLE_PERSONAL_SETTINGS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS], '\\'));
168
-		}
169
-	}
170
-
171
-	public function checkForOrphanedClassNames() {
172
-		$tables = [Mapper::TABLE_ADMIN_SECTIONS, Mapper::TABLE_ADMIN_SETTINGS, Mapper::TABLE_PERSONAL_SECTIONS, Mapper::TABLE_PERSONAL_SETTINGS];
173
-		foreach ($tables as $table) {
174
-			$classes = $this->mapper->getClasses($table);
175
-			foreach ($classes as $className) {
176
-				try {
177
-					\OC::$server->query($className);
178
-				} catch (QueryException $e) {
179
-					$this->mapper->remove($table, $className);
180
-				}
181
-			}
182
-		}
183
-	}
184
-
185
-	/**
186
-	 * @param string $sectionClassName
187
-	 * @param string $type either 'admin' or 'personal'
188
-	 */
189
-	private function setupSectionEntry($sectionClassName, $type) {
190
-		if (!class_exists($sectionClassName)) {
191
-			$this->log->debug('Could not find ' . ucfirst($type) . ' section class ' . $sectionClassName);
192
-			return;
193
-		}
194
-		try {
195
-			$section = $this->query($sectionClassName);
196
-		} catch (QueryException $e) {
197
-			// cancel
198
-			return;
199
-		}
200
-
201
-		if (!$section instanceof ISection) {
202
-			$this->log->error(
203
-				ucfirst($type) .' section instance must implement \OCP\ISection. Invalid class: {class}',
204
-				['class' => $sectionClassName]
205
-			);
206
-			return;
207
-		}
208
-		$table = $this->getSectionTableForType($type);
209
-		if(!$this->hasSection(get_class($section), $table)) {
210
-			$this->addSection($section, $table);
211
-		} else {
212
-			$this->updateSection($section, $table);
213
-		}
214
-	}
215
-
216
-	private function addSection(ISection $section, $table) {
217
-		$this->mapper->add($table, [
218
-			'id' => $section->getID(),
219
-			'class' => get_class($section),
220
-			'priority' => $section->getPriority(),
221
-		]);
222
-	}
223
-
224
-	private function addSettings(ISettings $settings, $table) {
225
-		$this->mapper->add($table, [
226
-			'class' => get_class($settings),
227
-			'section' => $settings->getSection(),
228
-			'priority' => $settings->getPriority(),
229
-		]);
230
-	}
231
-
232
-	private function updateSettings(ISettings $settings, $table) {
233
-		$this->mapper->update(
234
-			$table,
235
-			'class',
236
-			get_class($settings),
237
-			[
238
-				'section' => $settings->getSection(),
239
-				'priority' => $settings->getPriority(),
240
-			]
241
-		);
242
-	}
243
-
244
-	private function updateSection(ISection $section, $table) {
245
-		$this->mapper->update(
246
-			$table,
247
-			'class',
248
-			get_class($section),
249
-			[
250
-				'id' => $section->getID(),
251
-				'priority' => $section->getPriority(),
252
-			]
253
-		);
254
-	}
255
-
256
-	/**
257
-	 * @param string $className
258
-	 * @param string $table
259
-	 * @return bool
260
-	 */
261
-	private function hasSection($className, $table) {
262
-		return $this->mapper->has($table, $className);
263
-	}
264
-
265
-	/**
266
-	 * @param string $className
267
-	 * @return bool
268
-	 */
269
-	private function hasSettings($className, $table) {
270
-		return $this->mapper->has($table, $className);
271
-	}
272
-
273
-	private function setupSettingsEntry($settingsClassName, $type) {
274
-		if (!class_exists($settingsClassName)) {
275
-			$this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
276
-			return;
277
-		}
278
-
279
-		try {
280
-			/** @var ISettings $settings */
281
-			$settings = $this->query($settingsClassName);
282
-		} catch (QueryException $e) {
283
-			// cancel
284
-			return;
285
-		}
286
-
287
-		if (!$settings instanceof ISettings) {
288
-			$this->log->error(
289
-				ucfirst($type) . ' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
290
-				['class' => $settingsClassName]
291
-			);
292
-			return;
293
-		}
294
-		$table = $this->getSettingsTableForType($type);
295
-		if (!$this->hasSettings(get_class($settings), $table)) {
296
-			$this->addSettings($settings, $table);
297
-		} else {
298
-			$this->updateSettings($settings, $table);
299
-		}
300
-	}
301
-
302
-	private function getSectionTableForType($type) {
303
-		if($type === 'admin') {
304
-			return Mapper::TABLE_ADMIN_SECTIONS;
305
-		} else if($type === 'personal') {
306
-			return Mapper::TABLE_PERSONAL_SECTIONS;
307
-		}
308
-		throw new \InvalidArgumentException('"admin" or "personal" expected');
309
-	}
310
-
311
-	private function getSettingsTableForType($type) {
312
-		if($type === 'admin') {
313
-			return Mapper::TABLE_ADMIN_SETTINGS;
314
-		} else if($type === 'personal') {
315
-			return Mapper::TABLE_PERSONAL_SETTINGS;
316
-		}
317
-		throw new \InvalidArgumentException('"admin" or "personal" expected');
318
-	}
319
-
320
-	private function query($className) {
321
-		try {
322
-			return \OC::$server->query($className);
323
-		} catch (QueryException $e) {
324
-			$this->log->logException($e);
325
-			throw $e;
326
-		}
327
-	}
328
-
329
-	/**
330
-	 * @inheritdoc
331
-	 */
332
-	public function getAdminSections() {
333
-		// built-in sections
334
-		$sections = [
335
-			0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
336
-			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
337
-			10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
338
-			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
339
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
340
-			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
341
-		];
342
-
343
-		$rows = $this->mapper->getAdminSectionsFromDB();
344
-
345
-		foreach ($rows as $row) {
346
-			if (!isset($sections[$row['priority']])) {
347
-				$sections[$row['priority']] = [];
348
-			}
349
-			try {
350
-				$sections[$row['priority']][] = $this->query($row['class']);
351
-			} catch (QueryException $e) {
352
-				// skip
353
-			}
354
-		}
355
-
356
-		ksort($sections);
357
-
358
-		return $sections;
359
-	}
360
-
361
-	/**
362
-	 * @param string $section
363
-	 * @return ISection[]
364
-	 */
365
-	private function getBuiltInAdminSettings($section) {
366
-		$forms = [];
367
-		try {
368
-			if ($section === 'server') {
369
-				/** @var ISettings $form */
370
-				$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
371
-				$forms[$form->getPriority()] = [$form];
372
-				$form = new Admin\ServerDevNotice();
373
-				$forms[$form->getPriority()] = [$form];
374
-			}
375
-			if ($section === 'encryption') {
376
-				/** @var ISettings $form */
377
-				$form = new Admin\Encryption($this->encryptionManager, $this->userManager);
378
-				$forms[$form->getPriority()] = [$form];
379
-			}
380
-			if ($section === 'sharing') {
381
-				/** @var ISettings $form */
382
-				$form = new Admin\Sharing($this->config);
383
-				$forms[$form->getPriority()] = [$form];
384
-			}
385
-			if ($section === 'additional') {
386
-				/** @var ISettings $form */
387
-				$form = new Admin\Additional($this->config);
388
-				$forms[$form->getPriority()] = [$form];
389
-			}
390
-			if ($section === 'tips-tricks') {
391
-				/** @var ISettings $form */
392
-				$form = new Admin\TipsTricks($this->config);
393
-				$forms[$form->getPriority()] = [$form];
394
-			}
395
-		} catch (QueryException $e) {
396
-			// skip
397
-		}
398
-		return $forms;
399
-	}
400
-
401
-	/**
402
-	 * @param string $section
403
-	 * @return ISection[]
404
-	 */
405
-	private function getBuiltInPersonalSettings($section) {
406
-		$forms = [];
407
-		try {
408
-			if ($section === 'personal-info') {
409
-				/** @var ISettings $form */
410
-				$form = new Personal\PersonalInfo(
411
-					$this->config,
412
-					$this->userManager,
413
-					$this->groupManager,
414
-					$this->accountManager,
415
-					$this->appManager,
416
-					$this->l10nFactory,
417
-					$this->l
418
-				);
419
-				$forms[$form->getPriority()] = [$form];
420
-			}
421
-			if($section === 'security') {
422
-				/** @var ISettings $form */
423
-				$form = new Personal\Security();
424
-				$forms[$form->getPriority()] = [$form];
425
-			}
426
-			if($section === 'sync-clients') {
427
-				/** @var ISettings $form */
428
-				$form = new Personal\SyncClients($this->config, $this->defaults);
429
-				$forms[$form->getPriority()] = [$form];
430
-			}
431
-			if ($section === 'additional') {
432
-				/** @var ISettings $form */
433
-				$form = new Personal\Additional($this->config);
434
-				$forms[$form->getPriority()] = [$form];
435
-			}
436
-		} catch (QueryException $e) {
437
-			// skip
438
-		}
439
-		return $forms;
440
-	}
441
-
442
-	/**
443
-	 * @inheritdoc
444
-	 */
445
-	public function getAdminSettings($section) {
446
-		$settings = $this->getBuiltInAdminSettings($section);
447
-		$dbRows = $this->mapper->getAdminSettingsFromDB($section);
448
-
449
-		foreach ($dbRows as $row) {
450
-			if (!isset($settings[$row['priority']])) {
451
-				$settings[$row['priority']] = [];
452
-			}
453
-			try {
454
-				$settings[$row['priority']][] = $this->query($row['class']);
455
-			} catch (QueryException $e) {
456
-				// skip
457
-			}
458
-		}
459
-
460
-		ksort($settings);
461
-		return $settings;
462
-	}
463
-
464
-	/**
465
-	 * @inheritdoc
466
-	 */
467
-	public function getPersonalSections() {
468
-		$sections = [
469
-			0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
470
-			5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
471
-			15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
472
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
473
-		];
474
-
475
-		$rows = $this->mapper->getPersonalSectionsFromDB();
476
-
477
-		foreach ($rows as $row) {
478
-			if (!isset($sections[$row['priority']])) {
479
-				$sections[$row['priority']] = [];
480
-			}
481
-			try {
482
-				$sections[$row['priority']][] = $this->query($row['class']);
483
-			} catch (QueryException $e) {
484
-				// skip
485
-			}
486
-		}
487
-
488
-		ksort($sections);
489
-
490
-		return $sections;
491
-	}
492
-
493
-	/**
494
-	 * @inheritdoc
495
-	 */
496
-	public function getPersonalSettings($section) {
497
-		$settings = $this->getBuiltInPersonalSettings($section);
498
-		$dbRows = $this->mapper->getPersonalSettingsFromDB($section);
499
-
500
-		foreach ($dbRows as $row) {
501
-			if (!isset($settings[$row['priority']])) {
502
-				$settings[$row['priority']] = [];
503
-			}
504
-			try {
505
-				$settings[$row['priority']][] = $this->query($row['class']);
506
-			} catch (QueryException $e) {
507
-				// skip
508
-			}
509
-		}
510
-
511
-		ksort($settings);
512
-		return $settings;
513
-	}
45
+    /** @var ILogger */
46
+    private $log;
47
+    /** @var IDBConnection */
48
+    private $dbc;
49
+    /** @var Mapper */
50
+    private $mapper;
51
+    /** @var IL10N */
52
+    private $l;
53
+    /** @var IConfig */
54
+    private $config;
55
+    /** @var EncryptionManager */
56
+    private $encryptionManager;
57
+    /** @var IUserManager */
58
+    private $userManager;
59
+    /** @var ILockingProvider */
60
+    private $lockingProvider;
61
+    /** @var IRequest */
62
+    private $request;
63
+    /** @var IURLGenerator */
64
+    private $url;
65
+    /** @var AccountManager */
66
+    private $accountManager;
67
+    /** @var IGroupManager */
68
+    private $groupManager;
69
+    /** @var IFactory */
70
+    private $l10nFactory;
71
+    /** @var \OC_Defaults */
72
+    private $defaults;
73
+    /** @var IAppManager */
74
+    private $appManager;
75
+
76
+    /**
77
+     * @param ILogger $log
78
+     * @param IDBConnection $dbc
79
+     * @param IL10N $l
80
+     * @param IConfig $config
81
+     * @param EncryptionManager $encryptionManager
82
+     * @param IUserManager $userManager
83
+     * @param ILockingProvider $lockingProvider
84
+     * @param IRequest $request
85
+     * @param Mapper $mapper
86
+     * @param IURLGenerator $url
87
+     * @param AccountManager $accountManager
88
+     * @param IGroupManager $groupManager
89
+     * @param IFactory $l10nFactory
90
+     * @param \OC_Defaults $defaults
91
+     */
92
+    public function __construct(
93
+        ILogger $log,
94
+        IDBConnection $dbc,
95
+        IL10N $l,
96
+        IConfig $config,
97
+        EncryptionManager $encryptionManager,
98
+        IUserManager $userManager,
99
+        ILockingProvider $lockingProvider,
100
+        IRequest $request,
101
+        Mapper $mapper,
102
+        IURLGenerator $url,
103
+        AccountManager $accountManager,
104
+        IGroupManager $groupManager,
105
+        IFactory $l10nFactory,
106
+        \OC_Defaults $defaults,
107
+        IAppManager $appManager
108
+    ) {
109
+        $this->log = $log;
110
+        $this->dbc = $dbc;
111
+        $this->mapper = $mapper;
112
+        $this->l = $l;
113
+        $this->config = $config;
114
+        $this->encryptionManager = $encryptionManager;
115
+        $this->userManager = $userManager;
116
+        $this->lockingProvider = $lockingProvider;
117
+        $this->request = $request;
118
+        $this->url = $url;
119
+        $this->accountManager = $accountManager;
120
+        $this->groupManager = $groupManager;
121
+        $this->l10nFactory = $l10nFactory;
122
+        $this->defaults = $defaults;
123
+        $this->appManager = $appManager;
124
+    }
125
+
126
+    /**
127
+     * @inheritdoc
128
+     */
129
+    public function setupSettings(array $settings) {
130
+        if (isset($settings[IManager::KEY_ADMIN_SECTION])) {
131
+            $this->setupSectionEntry($settings[IManager::KEY_ADMIN_SECTION], 'admin');
132
+        }
133
+        if (isset($settings[IManager::KEY_ADMIN_SETTINGS])) {
134
+            $this->setupSettingsEntry($settings[IManager::KEY_ADMIN_SETTINGS], 'admin');
135
+        }
136
+
137
+        if (isset($settings[IManager::KEY_PERSONAL_SECTION])) {
138
+            $this->setupSectionEntry($settings[IManager::KEY_PERSONAL_SECTION], 'personal');
139
+        }
140
+        if (isset($settings[IManager::KEY_PERSONAL_SETTINGS])) {
141
+            $this->setupSettingsEntry($settings[IManager::KEY_PERSONAL_SETTINGS], 'personal');
142
+        }
143
+    }
144
+
145
+    /**
146
+     * attempts to remove an apps section and/or settings entry. A listener is
147
+     * added centrally making sure that this method is called ones an app was
148
+     * disabled.
149
+     *
150
+     * @param string $appId
151
+     * @since 9.1.0
152
+     */
153
+    public function onAppDisabled($appId) {
154
+        $appInfo = \OC_App::getAppInfo($appId); // hello static legacy
155
+
156
+        if (isset($appInfo['settings'][IManager::KEY_ADMIN_SECTION])) {
157
+            $this->mapper->remove(Mapper::TABLE_ADMIN_SECTIONS, trim($appInfo['settings'][IManager::KEY_ADMIN_SECTION], '\\'));
158
+        }
159
+        if (isset($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS])) {
160
+            $this->mapper->remove(Mapper::TABLE_ADMIN_SETTINGS, trim($appInfo['settings'][IManager::KEY_ADMIN_SETTINGS], '\\'));
161
+        }
162
+
163
+        if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SECTION])) {
164
+            $this->mapper->remove(Mapper::TABLE_PERSONAL_SECTIONS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SECTION], '\\'));
165
+        }
166
+        if (isset($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS])) {
167
+            $this->mapper->remove(Mapper::TABLE_PERSONAL_SETTINGS, trim($appInfo['settings'][IManager::KEY_PERSONAL_SETTINGS], '\\'));
168
+        }
169
+    }
170
+
171
+    public function checkForOrphanedClassNames() {
172
+        $tables = [Mapper::TABLE_ADMIN_SECTIONS, Mapper::TABLE_ADMIN_SETTINGS, Mapper::TABLE_PERSONAL_SECTIONS, Mapper::TABLE_PERSONAL_SETTINGS];
173
+        foreach ($tables as $table) {
174
+            $classes = $this->mapper->getClasses($table);
175
+            foreach ($classes as $className) {
176
+                try {
177
+                    \OC::$server->query($className);
178
+                } catch (QueryException $e) {
179
+                    $this->mapper->remove($table, $className);
180
+                }
181
+            }
182
+        }
183
+    }
184
+
185
+    /**
186
+     * @param string $sectionClassName
187
+     * @param string $type either 'admin' or 'personal'
188
+     */
189
+    private function setupSectionEntry($sectionClassName, $type) {
190
+        if (!class_exists($sectionClassName)) {
191
+            $this->log->debug('Could not find ' . ucfirst($type) . ' section class ' . $sectionClassName);
192
+            return;
193
+        }
194
+        try {
195
+            $section = $this->query($sectionClassName);
196
+        } catch (QueryException $e) {
197
+            // cancel
198
+            return;
199
+        }
200
+
201
+        if (!$section instanceof ISection) {
202
+            $this->log->error(
203
+                ucfirst($type) .' section instance must implement \OCP\ISection. Invalid class: {class}',
204
+                ['class' => $sectionClassName]
205
+            );
206
+            return;
207
+        }
208
+        $table = $this->getSectionTableForType($type);
209
+        if(!$this->hasSection(get_class($section), $table)) {
210
+            $this->addSection($section, $table);
211
+        } else {
212
+            $this->updateSection($section, $table);
213
+        }
214
+    }
215
+
216
+    private function addSection(ISection $section, $table) {
217
+        $this->mapper->add($table, [
218
+            'id' => $section->getID(),
219
+            'class' => get_class($section),
220
+            'priority' => $section->getPriority(),
221
+        ]);
222
+    }
223
+
224
+    private function addSettings(ISettings $settings, $table) {
225
+        $this->mapper->add($table, [
226
+            'class' => get_class($settings),
227
+            'section' => $settings->getSection(),
228
+            'priority' => $settings->getPriority(),
229
+        ]);
230
+    }
231
+
232
+    private function updateSettings(ISettings $settings, $table) {
233
+        $this->mapper->update(
234
+            $table,
235
+            'class',
236
+            get_class($settings),
237
+            [
238
+                'section' => $settings->getSection(),
239
+                'priority' => $settings->getPriority(),
240
+            ]
241
+        );
242
+    }
243
+
244
+    private function updateSection(ISection $section, $table) {
245
+        $this->mapper->update(
246
+            $table,
247
+            'class',
248
+            get_class($section),
249
+            [
250
+                'id' => $section->getID(),
251
+                'priority' => $section->getPriority(),
252
+            ]
253
+        );
254
+    }
255
+
256
+    /**
257
+     * @param string $className
258
+     * @param string $table
259
+     * @return bool
260
+     */
261
+    private function hasSection($className, $table) {
262
+        return $this->mapper->has($table, $className);
263
+    }
264
+
265
+    /**
266
+     * @param string $className
267
+     * @return bool
268
+     */
269
+    private function hasSettings($className, $table) {
270
+        return $this->mapper->has($table, $className);
271
+    }
272
+
273
+    private function setupSettingsEntry($settingsClassName, $type) {
274
+        if (!class_exists($settingsClassName)) {
275
+            $this->log->debug('Could not find ' . $type . ' section class ' . $settingsClassName);
276
+            return;
277
+        }
278
+
279
+        try {
280
+            /** @var ISettings $settings */
281
+            $settings = $this->query($settingsClassName);
282
+        } catch (QueryException $e) {
283
+            // cancel
284
+            return;
285
+        }
286
+
287
+        if (!$settings instanceof ISettings) {
288
+            $this->log->error(
289
+                ucfirst($type) . ' section instance must implement \OCP\Settings\ISettings. Invalid class: {class}',
290
+                ['class' => $settingsClassName]
291
+            );
292
+            return;
293
+        }
294
+        $table = $this->getSettingsTableForType($type);
295
+        if (!$this->hasSettings(get_class($settings), $table)) {
296
+            $this->addSettings($settings, $table);
297
+        } else {
298
+            $this->updateSettings($settings, $table);
299
+        }
300
+    }
301
+
302
+    private function getSectionTableForType($type) {
303
+        if($type === 'admin') {
304
+            return Mapper::TABLE_ADMIN_SECTIONS;
305
+        } else if($type === 'personal') {
306
+            return Mapper::TABLE_PERSONAL_SECTIONS;
307
+        }
308
+        throw new \InvalidArgumentException('"admin" or "personal" expected');
309
+    }
310
+
311
+    private function getSettingsTableForType($type) {
312
+        if($type === 'admin') {
313
+            return Mapper::TABLE_ADMIN_SETTINGS;
314
+        } else if($type === 'personal') {
315
+            return Mapper::TABLE_PERSONAL_SETTINGS;
316
+        }
317
+        throw new \InvalidArgumentException('"admin" or "personal" expected');
318
+    }
319
+
320
+    private function query($className) {
321
+        try {
322
+            return \OC::$server->query($className);
323
+        } catch (QueryException $e) {
324
+            $this->log->logException($e);
325
+            throw $e;
326
+        }
327
+    }
328
+
329
+    /**
330
+     * @inheritdoc
331
+     */
332
+    public function getAdminSections() {
333
+        // built-in sections
334
+        $sections = [
335
+            0 => [new Section('server', $this->l->t('Basic settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
336
+            5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
337
+            10 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
338
+            45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
339
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
340
+            99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
341
+        ];
342
+
343
+        $rows = $this->mapper->getAdminSectionsFromDB();
344
+
345
+        foreach ($rows as $row) {
346
+            if (!isset($sections[$row['priority']])) {
347
+                $sections[$row['priority']] = [];
348
+            }
349
+            try {
350
+                $sections[$row['priority']][] = $this->query($row['class']);
351
+            } catch (QueryException $e) {
352
+                // skip
353
+            }
354
+        }
355
+
356
+        ksort($sections);
357
+
358
+        return $sections;
359
+    }
360
+
361
+    /**
362
+     * @param string $section
363
+     * @return ISection[]
364
+     */
365
+    private function getBuiltInAdminSettings($section) {
366
+        $forms = [];
367
+        try {
368
+            if ($section === 'server') {
369
+                /** @var ISettings $form */
370
+                $form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
371
+                $forms[$form->getPriority()] = [$form];
372
+                $form = new Admin\ServerDevNotice();
373
+                $forms[$form->getPriority()] = [$form];
374
+            }
375
+            if ($section === 'encryption') {
376
+                /** @var ISettings $form */
377
+                $form = new Admin\Encryption($this->encryptionManager, $this->userManager);
378
+                $forms[$form->getPriority()] = [$form];
379
+            }
380
+            if ($section === 'sharing') {
381
+                /** @var ISettings $form */
382
+                $form = new Admin\Sharing($this->config);
383
+                $forms[$form->getPriority()] = [$form];
384
+            }
385
+            if ($section === 'additional') {
386
+                /** @var ISettings $form */
387
+                $form = new Admin\Additional($this->config);
388
+                $forms[$form->getPriority()] = [$form];
389
+            }
390
+            if ($section === 'tips-tricks') {
391
+                /** @var ISettings $form */
392
+                $form = new Admin\TipsTricks($this->config);
393
+                $forms[$form->getPriority()] = [$form];
394
+            }
395
+        } catch (QueryException $e) {
396
+            // skip
397
+        }
398
+        return $forms;
399
+    }
400
+
401
+    /**
402
+     * @param string $section
403
+     * @return ISection[]
404
+     */
405
+    private function getBuiltInPersonalSettings($section) {
406
+        $forms = [];
407
+        try {
408
+            if ($section === 'personal-info') {
409
+                /** @var ISettings $form */
410
+                $form = new Personal\PersonalInfo(
411
+                    $this->config,
412
+                    $this->userManager,
413
+                    $this->groupManager,
414
+                    $this->accountManager,
415
+                    $this->appManager,
416
+                    $this->l10nFactory,
417
+                    $this->l
418
+                );
419
+                $forms[$form->getPriority()] = [$form];
420
+            }
421
+            if($section === 'security') {
422
+                /** @var ISettings $form */
423
+                $form = new Personal\Security();
424
+                $forms[$form->getPriority()] = [$form];
425
+            }
426
+            if($section === 'sync-clients') {
427
+                /** @var ISettings $form */
428
+                $form = new Personal\SyncClients($this->config, $this->defaults);
429
+                $forms[$form->getPriority()] = [$form];
430
+            }
431
+            if ($section === 'additional') {
432
+                /** @var ISettings $form */
433
+                $form = new Personal\Additional($this->config);
434
+                $forms[$form->getPriority()] = [$form];
435
+            }
436
+        } catch (QueryException $e) {
437
+            // skip
438
+        }
439
+        return $forms;
440
+    }
441
+
442
+    /**
443
+     * @inheritdoc
444
+     */
445
+    public function getAdminSettings($section) {
446
+        $settings = $this->getBuiltInAdminSettings($section);
447
+        $dbRows = $this->mapper->getAdminSettingsFromDB($section);
448
+
449
+        foreach ($dbRows as $row) {
450
+            if (!isset($settings[$row['priority']])) {
451
+                $settings[$row['priority']] = [];
452
+            }
453
+            try {
454
+                $settings[$row['priority']][] = $this->query($row['class']);
455
+            } catch (QueryException $e) {
456
+                // skip
457
+            }
458
+        }
459
+
460
+        ksort($settings);
461
+        return $settings;
462
+    }
463
+
464
+    /**
465
+     * @inheritdoc
466
+     */
467
+    public function getPersonalSections() {
468
+        $sections = [
469
+            0 => [new Section('personal-info', $this->l->t('Personal info'), 0, $this->url->imagePath('core', 'actions/info.svg'))],
470
+            5 => [new Section('security', $this->l->t('Security'), 0, $this->url->imagePath('settings', 'password.svg'))],
471
+            15 => [new Section('sync-clients', $this->l->t('Sync clients'), 0, $this->url->imagePath('settings', 'change.svg'))],
472
+            98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
473
+        ];
474
+
475
+        $rows = $this->mapper->getPersonalSectionsFromDB();
476
+
477
+        foreach ($rows as $row) {
478
+            if (!isset($sections[$row['priority']])) {
479
+                $sections[$row['priority']] = [];
480
+            }
481
+            try {
482
+                $sections[$row['priority']][] = $this->query($row['class']);
483
+            } catch (QueryException $e) {
484
+                // skip
485
+            }
486
+        }
487
+
488
+        ksort($sections);
489
+
490
+        return $sections;
491
+    }
492
+
493
+    /**
494
+     * @inheritdoc
495
+     */
496
+    public function getPersonalSettings($section) {
497
+        $settings = $this->getBuiltInPersonalSettings($section);
498
+        $dbRows = $this->mapper->getPersonalSettingsFromDB($section);
499
+
500
+        foreach ($dbRows as $row) {
501
+            if (!isset($settings[$row['priority']])) {
502
+                $settings[$row['priority']] = [];
503
+            }
504
+            try {
505
+                $settings[$row['priority']][] = $this->query($row['class']);
506
+            } catch (QueryException $e) {
507
+                // skip
508
+            }
509
+        }
510
+
511
+        ksort($settings);
512
+        return $settings;
513
+    }
514 514
 }
Please login to merge, or discard this patch.