X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FLogout.php;h=bf6a39e19f961a55a38a64b2e9d8ee5a4ecaa77c;hb=1c8dd457cc0676e9f1079f1b7c7fcbb740978930;hp=7c5391a6ba9bd7df9869a33abfb2b8a7e8c5ad06;hpb=15a857e4117a5e1e6e092709b3c07614934b09fb;p=friendica.git

diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index 7c5391a6ba..bf6a39e19f 100644
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -2,19 +2,21 @@
 /**
  * @file src/Module/Logout.php
  */
+
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
+use Friendica\Core\Authentication;
+use Friendica\Core\Cache;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-
-require_once 'boot.php';
-require_once 'include/security.php';
+use Friendica\Core\System;
+use Friendica\Model\Profile;
 
 /**
  * Logout module
  *
- * @author Hypolite Petovan mrpetovan@gmail.com
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Logout extends BaseModule
 {
@@ -23,9 +25,20 @@ class Logout extends BaseModule
 	 */
 	public static function init()
 	{
-		Addon::callHooks("logging_out");
-		nuke_session();
-		info(L10n::t('Logged out.') . EOL);
-		goaway(self::getApp()->get_baseurl());
+		$visitor_home = null;
+		if (remote_user()) {
+			$visitor_home = Profile::getMyURL();
+			Cache::delete('zrlInit:' . $visitor_home);
+		}
+
+		Hook::callAll("logging_out");
+		Authentication::deleteSession();
+
+		if ($visitor_home) {
+			System::externalRedirect($visitor_home);
+		} else {
+			info(L10n::t('Logged out.'));
+			self::getApp()->internalRedirect();
+		}
 	}
 }