eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

allowed_nickname blocks top level url router names

Browse Source
This commit is contained in:
Craig Andrews 2009-11-02 15:18:04 -05:00
parent 12eec0fea2
commit 15d0055c6f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/User.php
View File

@ -118,7 +118,7 @@ class User extends Memcached_DataObject
{ {
// XXX: should already be validated for size, content, etc. // XXX: should already be validated for size, content, etc.
$blacklist = array(); $blacklist = common_config('nickname', 'blacklist');
//all directory and file names should be blacklisted //all directory and file names should be blacklisted
$d = dir(INSTALLDIR); $d = dir(INSTALLDIR);
@ -126,8 +126,15 @@ class User extends Memcached_DataObject
$blacklist[]=$entry; $blacklist[]=$entry;
} }
$d->close(); $d->close();
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
return !in_array($nickname, $merged); //all top level names in the router should be blacklisted
$router = Router::get();
foreach(array_keys($router->m->getPaths()) as $path){
if(preg_match('/^\/(.*?)[\/\?]/',$path,$matches)){
$blacklist[]=$matches[1];
}
}
return !in_array($nickname, $blacklist);
} }
function getCurrentNotice($dt=null) function getCurrentNotice($dt=null)