Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / logout.php

diff --git a/actions/logout.php b/actions/logout.php
index 1e0adae57592a536bdaf7b6bbf3eb7ae60959f14..b9dfe3b8114b58106448706f5c5bf7d6b8c634c9 100644 (file)
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -28,9 +28,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Logout action class.
@@ -42,15 +40,14 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-class LogoutAction extends Action
+class LogoutAction extends ManagedAction
 {
-
     /**
      * This is read only.
      *
      * @return boolean true
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return false;
     }
@@ -58,30 +55,27 @@ class LogoutAction extends Action
     /**
      * 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!
     }
-
 }