git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 06f60b57 authored by mmn's avatar mmn

StartpageAction essentially duplicated TopAction

parent 37e8b027
...@@ -63,7 +63,7 @@ class LogoutAction extends ManagedAction ...@@ -63,7 +63,7 @@ class LogoutAction extends ManagedAction
} }
Event::handle('EndLogout', array($this)); Event::handle('EndLogout', array($this));
common_redirect(common_local_url('startpage')); common_redirect(common_local_url('top'));
} }
// Accessed through the action on events // Accessed through the action on events
......
<?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);
}
}
}
...@@ -20,67 +20,29 @@ ...@@ -20,67 +20,29 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category Top
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* An action to redirect to the top of the site
*
* @category Action * @category Action
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @author Mikael Nordfeldth <mmn@hethane.se>
* @copyright 2010 StatusNet, Inc. * @copyright 2010 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0 * @copyright 2015 Free Software Foundation, Inc.
* @link http://status.net/ * @license https://www.gnu.org/licenses/agpl-3.0.html AGPL 3.0
* @link https://gnu.io/social
*/ */
class TopAction extends Action if (!defined('GNUSOCIAL')) { exit(1); }
{
/**
* For initializing members of the class.
*
* @param array $argarray misc. arguments
*
* @return boolean true
*/
function prepare($argarray) class TopAction extends ManagedAction
{ {
parent::prepare($argarray); public function showPage()
return true;
}
/**
* Handler method
*
* @param array $argarray is ignored since it's now passed in in prepare()
*
* @return void
*/
function handle($argarray=null)
{ {
if (common_config('singleuser', 'enabled')) { if (common_config('singleuser', 'enabled')) {
$url = common_local_url('showstream', array('nickname' => User::singleUserNickname())); $user = User::singleUser();
common_redirect(common_local_url('showstream', array('nickname' => $user->getNickname())), 303);
} elseif (common_config('public', 'localonly')) {
common_redirect(common_local_url('public'), 303);
} else { } else {
$url = common_local_url('public'); common_redirect(common_local_url('networkpublic'), 303);
} }
// XXX: Permanent? I think so.
common_redirect($url, 301);
return;
} }
} }
...@@ -108,6 +108,11 @@ class Router ...@@ -108,6 +108,11 @@ class Router
if (Event::handle('StartInitializeRouter', array(&$m))) { if (Event::handle('StartInitializeRouter', array(&$m))) {
// top of the menu hierarchy, sometimes "Home"
$m->connect('', array('action' => 'top'));
// public endpoints
$m->connect('robots.txt', array('action' => 'robotstxt')); $m->connect('robots.txt', array('action' => 'robotstxt'));
$m->connect('opensearch/people', array('action' => 'opensearch', $m->connect('opensearch/people', array('action' => 'opensearch',
...@@ -156,13 +161,13 @@ class Router ...@@ -156,13 +161,13 @@ class Router
'deleteaccount', 'deleteaccount',
'restoreaccount', 'restoreaccount',
'top', 'top',
'public',
); );
foreach ($main as $a) { foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a)); $m->connect('main/'.$a, array('action' => $a));
} }
$m->connect('main/public', array('action' => 'public'));
$m->connect('main/all', array('action' => 'networkpublic')); $m->connect('main/all', array('action' => 'networkpublic'));
$m->connect('main/tagprofile/:id', array('action' => 'tagprofile'), $m->connect('main/tagprofile/:id', array('action' => 'tagprofile'),
...@@ -875,9 +880,6 @@ class Router ...@@ -875,9 +880,6 @@ class Router
array('action' => 'rsd', array('action' => 'rsd',
'nickname' => $nickname)); 'nickname' => $nickname));
$m->connect('',
array('action' => 'startpage'));
// peopletags // peopletags
$m->connect('peopletags', $m->connect('peopletags',
...@@ -930,9 +932,6 @@ class Router ...@@ -930,9 +932,6 @@ class Router
} }
} }
$m->connect('', array('action' => 'startpage'));
$m->connect('main/public', array('action' => 'public'));
$m->connect('main/all', array('action' => 'networkpublic'));
$m->connect('rss', array('action' => 'publicrss')); $m->connect('rss', array('action' => 'publicrss'));
$m->connect('featuredrss', array('action' => 'featuredrss')); $m->connect('featuredrss', array('action' => 'featuredrss'));
$m->connect('featured/', array('action' => 'featured')); $m->connect('featured/', array('action' => 'featured'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment