GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use 'StartpageAction' to determine what to show on /

This commit is contained in:
Mikael Nordfeldth 2015-01-29 20:48:49 +01:00
parent a5d27d9ce7
commit 4daa2e4644
3 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
actions/logout.php
View File

@ -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,7 +40,7 @@ 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.
@ -54,36 +52,22 @@ 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()) {
// 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))) {
$this->logout();
}
Event::handle('EndLogout', array($this));
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);
}
// 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('startpage'));
}
function logout()
// Accessed through the action on events
public function logout()
{
common_set_user(null);
common_real_login(false); // not logged in

26
actions/startpage.php Normal file
View File

@ -0,0 +1,26 @@
<?php
/**
* Startpage action. Decides what to show on the first page.
*/
if (!defined('GNUSOCIAL')) { exit(1); }
class StartpageAction extends ManagedAction
{
function isReadOnly($args)
{
return true;
}
function showPage()
{
if (common_config('singleuser', 'enabled')) {
$user = User::singleUser();
common_redirect(common_local_url('showstream', array('nickname' => $user->nickname)), 303);
} elseif (common_config('public', 'localonly')) {
common_redirect(common_local_url('public'), 303);
} else {
common_redirect(common_local_url('networkpublic'), 303);
}
}
}

9
lib/router.php
View File

@ -894,8 +894,7 @@ class Router
'nickname' => $nickname));
$m->connect('',
array('action' => 'showstream',
'nickname' => $nickname));
array('action' => 'startpage'));
// peopletags
@ -948,13 +947,9 @@ class Router
array('tag' => self::REGEX_TAG));
}
} else {
$m->connect('', array('action' => 'startpage'));
$m->connect('main/public', array('action' => 'public'));
$m->connect('main/all', array('action' => 'networkpublic'));
if (common_config('site', 'localonly')) {
$m->connect('', array('action' => 'public'));
} else {
$m->connect('', array('action' => 'networkpublic'));
}
$m->connect('rss', array('action' => 'publicrss'));
$m->connect('featuredrss', array('action' => 'featuredrss'));
$m->connect('featured/', array('action' => 'featured'));