X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogout.php;h=5394a38c9fb573684ae8e28ff3ad95c0210f666a;hb=ef005987a1ed1ed0774ae7ae88772e3ca4654cbd;hp=cb20a26b54ecd20e561b769b9c273ac21ec9e77f;hpb=f1fda6c0503e32edfc99b297f4bf2cb07e629d9e;p=quix0rs-gnu-social.git

diff --git a/actions/logout.php b/actions/logout.php
index cb20a26b54..5394a38c9f 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -5,14 +5,14 @@
  * PHP version 5
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * 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
@@ -28,23 +28,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Logout action class.
  *
  * @category Action
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Robin Millette <millette@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
-class LogoutAction extends Action
+class LogoutAction extends ManagedAction
 {
-
     /**
      * This is read only.
      *
@@ -55,33 +52,25 @@ class LogoutAction extends Action
         return false;
     }
 
-    /**
-     * Class handler.
-     *
-     * @param array $args array of arguments
-     *
-     * @return nothing
-     */
-    function handle($args)
+    protected function doPreparation()
     {
-        parent::handle($args);
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
-        } else {
-            if (Event::handle('StartLogout', array($this))) {
-                $this->logout();
-            }
-            Event::handle('EndLogout', array($this));
-
-            common_redirect(common_local_url('public'), 303);
+            // TRANS: Error message displayed when trying to logout even though you are not logged in.
+            throw new AlreadyFulfilledException(_('Cannot log you out if you are not logged in.'));
+        }
+        if (Event::handle('StartLogout', array($this))) {
+            $this->logout();
         }
+        Event::handle('EndLogout', array($this));
+
+        common_redirect(common_local_url('top'));
     }
 
-    function logout()
+    // Accessed through the action on events
+    public function logout()
     {
         common_set_user(null);
         common_real_login(false); // not logged in
         common_forgetme(); // don't log back in!
     }
-
 }