Preview for Videos and images / Video resolution selection

[friendica.git] / src / Module / Security / Logout.php

diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php
index abe409ca1d3aa4c9f87a234e8c1852f794f9274a..1724ae297e497d8579dec7ce66b9dc350fd0fda6 100644 (file)
--- a/src/Module/Security/Logout.php
+++ b/src/Module/Security/Logout.php
@@ -1,45 +1,64 @@
 <?php
 /**
- * @file src/Module/Logout.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
-use Friendica\App\Authentication;
-use Friendica\Core\Cache;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Profile;
+use Friendica\Security\TwoFactor;
 
 /**
  * Logout module
- *
- * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class Logout extends BaseModule
 {
        /**
-        * @brief Process logout requests
+        * Process logout requests
         */
        public static function init(array $parameters = [])
        {
                $visitor_home = null;
                if (remote_user()) {
                        $visitor_home = Profile::getMyURL();
-                       Cache::delete('zrlInit:' . $visitor_home);
+                       DI::cache()->delete('zrlInit:' . $visitor_home);
                }
 
                Hook::callAll("logging_out");
-               Session::clear();
+
+               // Remove this trusted browser as it won't be able to be used ever again after the cookie is cleared
+               if (DI::cookie()->get('trusted')) {
+                       $trustedBrowserRepository = new TwoFactor\Repository\TrustedBrowser(DI::dba(), DI::logger());
+                       $trustedBrowserRepository->removeForUser(local_user(), DI::cookie()->get('trusted'));
+               }
+
+               DI::cookie()->clear();
+               DI::session()->clear();
 
                if ($visitor_home) {
                        System::externalRedirect($visitor_home);
                } else {
-                       info(L10n::t('Logged out.'));
+                       info(DI::l10n()->t('Logged out.'));
                        DI::baseUrl()->redirect();
                }
        }