Single-user mode
New configuration options to define a single-user mode. This hides
most of the "community" pages, like the public timeline and groups.
The main user's timeline becomes the main page, and most other URLs
are changed.
Switching back and forth between 1-user and multi-user mode is
probably hazardous.
Squashed commit of the following:
commit d814aa5c92d14a27a12baba7893f3f8bf63f1d08
Author: Evan Prodromou <evan@status.net>
Date: Tue Jan 26 00:17:27 2010 -0500
don't show inbox and outbox in single-user mode
commit 47f19b9523a7015d4c6e460b73ea32c839e00aa1
Author: Evan Prodromou <evan@status.net>
Date: Tue Jan 26 00:15:22 2010 -0500
show correct URL for logo in single-user mode
commit 552010cffc33eadbc512ec5a67619dbc2015239a
Author: Evan Prodromou <evan@status.net>
Date: Tue Jan 26 00:15:06 2010 -0500
make singleuser its own config section
commit 786ab260a3ca172e57b555c75ca10946d8f258a1
Author: Evan Prodromou <evan@status.net>
Date: Tue Jan 26 00:05:19 2010 -0500
make single-user mode work
commit 5b21d7309b3a8dd5a4e0f29aea76f7897f1818b1
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 23:45:55 2010 -0500
add single-user mode
This commit is contained in:
Evan Prodromou
parent
687b1719d1
commit
655573c213
9
README
9
README
|
|
@ -1492,6 +1492,15 @@ disabled: whether to enable this command. If enabled, users who send
|
||||||
should enable it only after you've convinced yourself that
|
should enable it only after you've convinced yourself that
|
||||||
it is safe. Default is 'false'.
|
it is safe. Default is 'false'.
|
||||||
|
|
||||||
|
singleuser
|
||||||
|
----------
|
||||||
|
|
||||||
|
If an installation has only one user, this can simplify a lot of the
|
||||||
|
interface. It also makes the user's profile the root URL.
|
||||||
|
|
||||||
|
enabled: Whether to run in "single user mode". Default false.
|
||||||
|
nickname: nickname of the single user.
|
||||||
|
|
||||||
Plugins
|
Plugins
|
||||||
=======
|
=======
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -392,8 +392,14 @@ class Action extends HTMLOutputter // lawsuit
|
||||||
$this->elementStart('address', array('id' => 'site_contact',
|
$this->elementStart('address', array('id' => 'site_contact',
|
||||||
'class' => 'vcard'));
|
'class' => 'vcard'));
|
||||||
if (Event::handle('StartAddressData', array($this))) {
|
if (Event::handle('StartAddressData', array($this))) {
|
||||||
|
if (common_config('singleuser', 'enabled')) {
|
||||||
|
$url = common_local_url('showstream',
|
||||||
|
array('nickname' => common_config('singleuser', 'nickname')));
|
||||||
|
} else {
|
||||||
|
$url = common_local_url('public');
|
||||||
|
}
|
||||||
$this->elementStart('a', array('class' => 'url home bookmark',
|
$this->elementStart('a', array('class' => 'url home bookmark',
|
||||||
'href' => common_local_url('public')));
|
'href' => $url));
|
||||||
if (common_config('site', 'logo') || file_exists(Theme::file('logo.png'))) {
|
if (common_config('site', 'logo') || file_exists(Theme::file('logo.png'))) {
|
||||||
$this->element('img', array('class' => 'logo photo',
|
$this->element('img', array('class' => 'logo photo',
|
||||||
'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'),
|
'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : Theme::path('logo.png'),
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ $default =
|
||||||
'dupelimit' => 60, # default for same person saying the same thing
|
'dupelimit' => 60, # default for same person saying the same thing
|
||||||
'textlimit' => 140,
|
'textlimit' => 140,
|
||||||
'indent' => true,
|
'indent' => true,
|
||||||
'use_x_sendfile' => false,
|
'use_x_sendfile' => false
|
||||||
),
|
),
|
||||||
'db' =>
|
'db' =>
|
||||||
array('database' => 'YOU HAVE TO SET THIS IN config.php',
|
array('database' => 'YOU HAVE TO SET THIS IN config.php',
|
||||||
|
|
@ -260,4 +260,7 @@ $default =
|
||||||
),
|
),
|
||||||
'admin' =>
|
'admin' =>
|
||||||
array('panels' => array('design', 'site', 'user', 'paths')),
|
array('panels' => array('design', 'site', 'user', 'paths')),
|
||||||
|
'singleuser' =>
|
||||||
|
array('enabled' => false,
|
||||||
|
'nickname' => null),
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -78,9 +78,9 @@ class PersonalGroupNav extends Widget
|
||||||
function show()
|
function show()
|
||||||
{
|
{
|
||||||
$user = null;
|
$user = null;
|
||||||
|
|
||||||
// FIXME: we should probably pass this in
|
// FIXME: we should probably pass this in
|
||||||
|
|
||||||
$action = $this->action->trimmed('action');
|
$action = $this->action->trimmed('action');
|
||||||
$nickname = $this->action->trimmed('nickname');
|
$nickname = $this->action->trimmed('nickname');
|
||||||
|
|
||||||
|
|
@ -117,7 +117,8 @@ class PersonalGroupNav extends Widget
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
if ($cur && $cur->id == $user->id) {
|
if ($cur && $cur->id == $user->id &&
|
||||||
|
!common_config('singleuser', 'enabled')) {
|
||||||
|
|
||||||
$this->out->menuItem(common_local_url('inbox', array('nickname' =>
|
$this->out->menuItem(common_local_url('inbox', array('nickname' =>
|
||||||
$nickname)),
|
$nickname)),
|
||||||
|
|
|
||||||
215
lib/router.php
215
lib/router.php
|
|
@ -73,12 +73,6 @@ class Router
|
||||||
|
|
||||||
if (Event::handle('StartInitializeRouter', array(&$m))) {
|
if (Event::handle('StartInitializeRouter', array(&$m))) {
|
||||||
|
|
||||||
// In the "root"
|
|
||||||
|
|
||||||
$m->connect('', array('action' => 'public'));
|
|
||||||
$m->connect('rss', array('action' => 'publicrss'));
|
|
||||||
$m->connect('featuredrss', array('action' => 'featuredrss'));
|
|
||||||
$m->connect('favoritedrss', array('action' => 'favoritedrss'));
|
|
||||||
$m->connect('opensearch/people', array('action' => 'opensearch',
|
$m->connect('opensearch/people', array('action' => 'opensearch',
|
||||||
'type' => 'people'));
|
'type' => 'people'));
|
||||||
$m->connect('opensearch/notice', array('action' => 'opensearch',
|
$m->connect('opensearch/notice', array('action' => 'opensearch',
|
||||||
|
|
@ -145,6 +139,18 @@ class Router
|
||||||
$m->connect('settings/'.$s, array('action' => $s.'settings'));
|
$m->connect('settings/'.$s, array('action' => $s.'settings'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$m->connect('settings/oauthapps/show/:id',
|
||||||
|
array('action' => 'showapplication'),
|
||||||
|
array('id' => '[0-9]+')
|
||||||
|
);
|
||||||
|
$m->connect('settings/oauthapps/new',
|
||||||
|
array('action' => 'newapplication')
|
||||||
|
);
|
||||||
|
$m->connect('settings/oauthapps/edit/:id',
|
||||||
|
array('action' => 'editapplication'),
|
||||||
|
array('id' => '[0-9]+')
|
||||||
|
);
|
||||||
|
|
||||||
// search
|
// search
|
||||||
|
|
||||||
foreach (array('group', 'people', 'notice') as $s) {
|
foreach (array('group', 'people', 'notice') as $s) {
|
||||||
|
|
@ -227,11 +233,6 @@ class Router
|
||||||
array('action' => 'peopletag'),
|
array('action' => 'peopletag'),
|
||||||
array('tag' => '[a-zA-Z0-9]+'));
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
|
||||||
$m->connect('featured/', array('action' => 'featured'));
|
|
||||||
$m->connect('featured', array('action' => 'featured'));
|
|
||||||
$m->connect('favorited/', array('action' => 'favorited'));
|
|
||||||
$m->connect('favorited', array('action' => 'favorited'));
|
|
||||||
|
|
||||||
// groups
|
// groups
|
||||||
|
|
||||||
$m->connect('group/new', array('action' => 'newgroup'));
|
$m->connect('group/new', array('action' => 'newgroup'));
|
||||||
|
|
@ -622,37 +623,6 @@ class Router
|
||||||
$m->connect('api/search.json', array('action' => 'twitapisearchjson'));
|
$m->connect('api/search.json', array('action' => 'twitapisearchjson'));
|
||||||
$m->connect('api/trends.json', array('action' => 'twitapitrends'));
|
$m->connect('api/trends.json', array('action' => 'twitapitrends'));
|
||||||
|
|
||||||
$m->connect('admin/site', array('action' => 'siteadminpanel'));
|
|
||||||
$m->connect('admin/design', array('action' => 'designadminpanel'));
|
|
||||||
$m->connect('admin/user', array('action' => 'useradminpanel'));
|
|
||||||
$m->connect('admin/paths', array('action' => 'pathsadminpanel'));
|
|
||||||
|
|
||||||
$m->connect('getfile/:filename',
|
|
||||||
array('action' => 'getfile'),
|
|
||||||
array('filename' => '[A-Za-z0-9._-]+'));
|
|
||||||
|
|
||||||
// user stuff
|
|
||||||
|
|
||||||
foreach (array('subscriptions', 'subscribers',
|
|
||||||
'nudge', 'all', 'foaf', 'xrds',
|
|
||||||
'replies', 'inbox', 'outbox', 'microsummary') as $a) {
|
|
||||||
$m->connect(':nickname/'.$a,
|
|
||||||
array('action' => $a),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
|
||||||
}
|
|
||||||
|
|
||||||
$m->connect('settings/oauthapps/show/:id',
|
|
||||||
array('action' => 'showapplication'),
|
|
||||||
array('id' => '[0-9]+')
|
|
||||||
);
|
|
||||||
$m->connect('settings/oauthapps/new',
|
|
||||||
array('action' => 'newapplication')
|
|
||||||
);
|
|
||||||
$m->connect('settings/oauthapps/edit/:id',
|
|
||||||
array('action' => 'editapplication'),
|
|
||||||
array('id' => '[0-9]+')
|
|
||||||
);
|
|
||||||
|
|
||||||
$m->connect('api/oauth/request_token',
|
$m->connect('api/oauth/request_token',
|
||||||
array('action' => 'apioauthrequesttoken'));
|
array('action' => 'apioauthrequesttoken'));
|
||||||
|
|
||||||
|
|
@ -662,47 +632,136 @@ class Router
|
||||||
$m->connect('api/oauth/authorize',
|
$m->connect('api/oauth/authorize',
|
||||||
array('action' => 'apioauthauthorize'));
|
array('action' => 'apioauthauthorize'));
|
||||||
|
|
||||||
foreach (array('subscriptions', 'subscribers') as $a) {
|
// Admin
|
||||||
$m->connect(':nickname/'.$a.'/:tag',
|
|
||||||
array('action' => $a),
|
$m->connect('admin/site', array('action' => 'siteadminpanel'));
|
||||||
array('tag' => '[a-zA-Z0-9]+',
|
$m->connect('admin/design', array('action' => 'designadminpanel'));
|
||||||
|
$m->connect('admin/user', array('action' => 'useradminpanel'));
|
||||||
|
$m->connect('admin/paths', array('action' => 'pathsadminpanel'));
|
||||||
|
|
||||||
|
$m->connect('getfile/:filename',
|
||||||
|
array('action' => 'getfile'),
|
||||||
|
array('filename' => '[A-Za-z0-9._-]+'));
|
||||||
|
|
||||||
|
// In the "root"
|
||||||
|
|
||||||
|
if (common_config('singleuser', 'enabled')) {
|
||||||
|
|
||||||
|
$nickname = common_config('singleuser', 'nickname');
|
||||||
|
|
||||||
|
foreach (array('subscriptions', 'subscribers',
|
||||||
|
'all', 'foaf', 'xrds',
|
||||||
|
'replies', 'microsummary') as $a) {
|
||||||
|
$m->connect($a,
|
||||||
|
array('action' => $a,
|
||||||
|
'nickname' => $nickname));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('subscriptions', 'subscribers') as $a) {
|
||||||
|
$m->connect($a.'/:tag',
|
||||||
|
array('action' => $a,
|
||||||
|
'nickname' => $nickname),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('rss', 'groups') as $a) {
|
||||||
|
$m->connect($a,
|
||||||
|
array('action' => 'user'.$a,
|
||||||
|
'nickname' => $nickname));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('all', 'replies', 'favorites') as $a) {
|
||||||
|
$m->connect($a.'/rss',
|
||||||
|
array('action' => $a.'rss',
|
||||||
|
'nickname' => $nickname));
|
||||||
|
}
|
||||||
|
|
||||||
|
$m->connect('favorites',
|
||||||
|
array('action' => 'showfavorites',
|
||||||
|
'nickname' => $nickname));
|
||||||
|
|
||||||
|
$m->connect('avatar/:size',
|
||||||
|
array('action' => 'avatarbynickname',
|
||||||
|
'nickname' => $nickname),
|
||||||
|
array('size' => '(original|96|48|24)'));
|
||||||
|
|
||||||
|
$m->connect('tag/:tag/rss',
|
||||||
|
array('action' => 'userrss',
|
||||||
|
'nickname' => $nickname),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
|
||||||
|
$m->connect('tag/:tag',
|
||||||
|
array('action' => 'showstream',
|
||||||
|
'nickname' => $nickname),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
|
||||||
|
$m->connect('',
|
||||||
|
array('action' => 'showstream',
|
||||||
|
'nickname' => $nickname));
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
$m->connect('', array('action' => 'public'));
|
||||||
|
$m->connect('rss', array('action' => 'publicrss'));
|
||||||
|
$m->connect('featuredrss', array('action' => 'featuredrss'));
|
||||||
|
$m->connect('favoritedrss', array('action' => 'favoritedrss'));
|
||||||
|
$m->connect('featured/', array('action' => 'featured'));
|
||||||
|
$m->connect('featured', array('action' => 'featured'));
|
||||||
|
$m->connect('favorited/', array('action' => 'favorited'));
|
||||||
|
$m->connect('favorited', array('action' => 'favorited'));
|
||||||
|
|
||||||
|
foreach (array('subscriptions', 'subscribers',
|
||||||
|
'nudge', 'all', 'foaf', 'xrds',
|
||||||
|
'replies', 'inbox', 'outbox', 'microsummary') as $a) {
|
||||||
|
$m->connect(':nickname/'.$a,
|
||||||
|
array('action' => $a),
|
||||||
|
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('subscriptions', 'subscribers') as $a) {
|
||||||
|
$m->connect(':nickname/'.$a.'/:tag',
|
||||||
|
array('action' => $a),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+',
|
||||||
|
'nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('rss', 'groups') as $a) {
|
||||||
|
$m->connect(':nickname/'.$a,
|
||||||
|
array('action' => 'user'.$a),
|
||||||
|
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (array('all', 'replies', 'favorites') as $a) {
|
||||||
|
$m->connect(':nickname/'.$a.'/rss',
|
||||||
|
array('action' => $a.'rss'),
|
||||||
|
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
|
}
|
||||||
|
|
||||||
|
$m->connect(':nickname/favorites',
|
||||||
|
array('action' => 'showfavorites'),
|
||||||
|
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
|
|
||||||
|
$m->connect(':nickname/avatar/:size',
|
||||||
|
array('action' => 'avatarbynickname'),
|
||||||
|
array('size' => '(original|96|48|24)',
|
||||||
'nickname' => '[a-zA-Z0-9]{1,64}'));
|
'nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
}
|
|
||||||
|
|
||||||
foreach (array('rss', 'groups') as $a) {
|
$m->connect(':nickname/tag/:tag/rss',
|
||||||
$m->connect(':nickname/'.$a,
|
array('action' => 'userrss'),
|
||||||
array('action' => 'user'.$a),
|
array('nickname' => '[a-zA-Z0-9]{1,64}'),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
|
||||||
|
$m->connect(':nickname/tag/:tag',
|
||||||
|
array('action' => 'showstream'),
|
||||||
|
array('nickname' => '[a-zA-Z0-9]{1,64}'),
|
||||||
|
array('tag' => '[a-zA-Z0-9]+'));
|
||||||
|
|
||||||
|
$m->connect(':nickname',
|
||||||
|
array('action' => 'showstream'),
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (array('all', 'replies', 'favorites') as $a) {
|
// user stuff
|
||||||
$m->connect(':nickname/'.$a.'/rss',
|
|
||||||
array('action' => $a.'rss'),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
|
||||||
}
|
|
||||||
|
|
||||||
$m->connect(':nickname/favorites',
|
|
||||||
array('action' => 'showfavorites'),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
|
||||||
|
|
||||||
$m->connect(':nickname/avatar/:size',
|
|
||||||
array('action' => 'avatarbynickname'),
|
|
||||||
array('size' => '(original|96|48|24)',
|
|
||||||
'nickname' => '[a-zA-Z0-9]{1,64}'));
|
|
||||||
|
|
||||||
$m->connect(':nickname/tag/:tag/rss',
|
|
||||||
array('action' => 'userrss'),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'),
|
|
||||||
array('tag' => '[a-zA-Z0-9]+'));
|
|
||||||
|
|
||||||
$m->connect(':nickname/tag/:tag',
|
|
||||||
array('action' => 'showstream'),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'),
|
|
||||||
array('tag' => '[a-zA-Z0-9]+'));
|
|
||||||
|
|
||||||
$m->connect(':nickname',
|
|
||||||
array('action' => 'showstream'),
|
|
||||||
array('nickname' => '[a-zA-Z0-9]{1,64}'));
|
|
||||||
|
|
||||||
Event::handle('RouterInitialized', array($m));
|
Event::handle('RouterInitialized', array($m));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user