diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-04-18 12:14:07 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-04-18 21:21:52 +0200 |
| commit | 8222ad515706d62cceb14428c959b83a69ccbc8b (patch) | |
| tree | 1fb2a2a86d2eaebca7e48366a7b3e50d3f3dbe7f /lib/private/user.php | |
| parent | 51975d360a93daba3b2681136a77b8d7078719e9 (diff) | |
| download | nextcloud-server-8222ad515706d62cceb14428c959b83a69ccbc8b.tar.gz nextcloud-server-8222ad515706d62cceb14428c959b83a69ccbc8b.zip | |
Move logout to controller
Testable code. Yay.
Diffstat (limited to 'lib/private/user.php')
| -rw-r--r-- | lib/private/user.php | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/private/user.php b/lib/private/user.php index 26062f503d2..8767a8d5b6d 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -268,15 +268,6 @@ class OC_User { } /** - * Logs the current user out and kills all the session data - * - * Logout, destroys session - */ - public static function logout() { - self::getUserSession()->logout(); - } - - /** * Tries to login the user with HTTP Basic Authentication */ public static function tryBasicAuthLogin() { @@ -342,7 +333,14 @@ class OC_User { return $backend->getLogoutAttribute(); } - return 'href="' . link_to('', 'index.php') . '?logout=true&requesttoken=' . urlencode(\OCP\Util::callRegister()) . '"'; + $logoutUrl = \OC::$server->getURLGenerator()->linkToRouteAbsolute( + 'core.login.logout', + [ + 'requesttoken' => \OCP\Util::callRegister(), + ] + ); + + return 'href="'.$logoutUrl.'"'; } /** |