X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Flogout.php;h=4e51271d43c95d0990b8e1b2f29a14b4019ee20f;hb=59043dca7fb6f974b11797c4d0f20e5b78b0611d;hp=cb20a26b54ecd20e561b769b9c273ac21ec9e77f;hpb=000e21be1917b190a2aaca2e864bbf79de4796bb;p=quix0rs-gnu-social.git diff --git a/actions/logout.php b/actions/logout.php index cb20a26b54..4e51271d43 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -5,14 +5,14 @@ * PHP version 5 * * @category Action - * @package Laconica - * @author Evan Prodromou - * @author Robin Millette + * @package StatusNet + * @author Evan Prodromou + * @author Robin Millette * @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,7 +28,7 @@ * along with this program. If not, see . */ -if (!defined('LACONICA')) { +if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } @@ -36,15 +36,14 @@ if (!defined('LACONICA')) { * Logout action class. * * @category Action - * @package Laconica - * @author Evan Prodromou - * @author Robin Millette + * @package StatusNet + * @author Evan Prodromou + * @author Robin Millette * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://laconi.ca/ + * @link http://status.net/ */ class LogoutAction extends Action { - /** * This is read only. * @@ -66,6 +65,7 @@ class LogoutAction extends Action { parent::handle($args); if (!common_logged_in()) { + // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); } else { if (Event::handle('StartLogout', array($this))) { @@ -73,7 +73,13 @@ class LogoutAction extends Action } Event::handle('EndLogout', array($this)); - common_redirect(common_local_url('public'), 303); + if (common_config('singleuser', 'enabled')) { + $user = User::singleUser(); + common_redirect(common_local_url('showstream', + array('nickname' => $user->nickname))); + } else { + common_redirect(common_local_url('public'), 303); + } } } @@ -83,5 +89,4 @@ class LogoutAction extends Action common_real_login(false); // not logged in common_forgetme(); // don't log back in! } - }