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

add fancy urls for search 

darcs-hash:20080709223144-84dde-10f7f9db7dc5ba200fdeea4d6c1f277e71c54c16.gz
This commit is contained in:
Evan Prodromou 2008-07-09 18:31:44 -04:00
parent e6d772a5a8
commit 62747030ca
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/User.php
View File

@ -90,7 +90,8 @@ class User extends DB_DataObject
function allowed_nickname($nickname) {
# XXX: should already be validated for size, content, etc.
static $blacklist = array('rss', 'xrds', 'doc', 'main',
'settings', 'notice', 'user');
'settings', 'notice', 'user',
'search');
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
return !in_array($nickname, $merged);
}

3
htaccess.sample
View File

@ -33,6 +33,9 @@ RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
RewriteRule ^search/people$ index.php?action=peoplesearch [L,QSA]
RewriteRule ^search/notice$ index.php?action=noticesearch [L,QSA]
RewriteRule ^notice/new$ index.php?action=newnotice [L,QSA]
RewriteRule ^notice/(\d+)$ index.php?action=shownotice&notice=$1 [L,QSA]

5
lib/util.php
View File

@ -278,6 +278,7 @@ function common_nav_menu() {
_t('Home'));
}
common_menu_item(common_local_url('public'), _t('Public'));
common_menu_item(common_local_url('peoplesearch'), _t('Search'));
common_menu_item(common_local_url('doc', array('title' => 'help')),
_t('Help'));
if ($user) {
@ -773,6 +774,10 @@ function common_fancy_url($action, $args=NULL) {
return common_path($path);
case 'imsettings':
return common_path('settings/im');
case 'peoplesearch':
return common_path('search/people' . (($args) ? '?' . implode('&', $args)) : '');
case 'noticesearch':
return common_path('search/notice' . (($args) ? '?' . implode('&', $args)) : '');
default:
return common_simple_url($action, $args);
}