diff options
| -rw-r--r-- | classes/User.php | 3 | ||||
| -rw-r--r-- | htaccess.sample | 3 | ||||
| -rw-r--r-- | lib/util.php | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php index 4a03630b5..99aac626f 100644 --- a/classes/User.php +++ b/classes/User.php @@ -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); } diff --git a/htaccess.sample b/htaccess.sample index 35c0ef7e3..48ee74bfa 100644 --- a/htaccess.sample +++ b/htaccess.sample @@ -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¬ice=$1 [L,QSA] diff --git a/lib/util.php b/lib/util.php index 1498ffb14..c6b456a03 100644 --- a/lib/util.php +++ b/lib/util.php @@ -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); } |