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

Some fixes for OpenID and OMB URLs

Browse Source
This commit is contained in:
Evan Prodromou 2009-03-06 17:18:21 -08:00
parent e8f36b4f6a
commit 16a6aa5390
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/router.php
View File

@ -49,6 +49,8 @@ class Router
{ {
var $m = null; var $m = null;
static $inst = null; static $inst = null;
static $bare = array('requesttoken', 'accesstoken', 'userauthorization',
'postnotice', 'updateprofile', 'finishremotesubscribe');
static function get() static function get()
{ {
@ -118,8 +120,7 @@ class Router
$m->connect('main/remote', array('action' => 'remotesubscribe')); $m->connect('main/remote', array('action' => 'remotesubscribe'));
$m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+')); $m->connect('main/remote?nickname=:nickname', array('action' => 'remotesubscribe'), array('nickname' => '[A-Za-z0-9_-]+'));
foreach (array('requesttoken', 'accesstoken', 'userauthorization', foreach (Router::$bare as $action) {
'postnotice', 'updateprofile', 'finishremotesubscribe') as $action) {
$m->connect('index.php?action=' . $action, array('action' => $action)); $m->connect('index.php?action=' . $action, array('action' => $action));
} }
@ -277,7 +278,6 @@ class Router
'apiaction' => 'friendships'), 'apiaction' => 'friendships'),
array('method' => 'exists(\.(xml|json|rss|atom))')); array('method' => 'exists(\.(xml|json|rss|atom))'));
// Social graph // Social graph
$m->connect('api/friends/ids/:argument', $m->connect('api/friends/ids/:argument',
@ -352,7 +352,6 @@ class Router
array('action' => 'api', array('action' => 'api',
'apiaction' => 'laconica')); 'apiaction' => 'laconica'));
// search // search
$m->connect('api/search.atom', array('action' => 'twitapisearchatom')); $m->connect('api/search.atom', array('action' => 'twitapisearchatom'));
$m->connect('api/search.json', array('action' => 'twitapisearchjson')); $m->connect('api/search.json', array('action' => 'twitapisearchjson'));

9
lib/util.php
View File

@ -722,12 +722,15 @@ function common_local_url($action, $args=null, $params=null, $fragment=null)
{ {
$r = Router::get(); $r = Router::get();
$path = $r->build($action, $args, $params, $fragment); $path = $r->build($action, $args, $params, $fragment);
if ($path) {
}
if (common_config('site','fancy')) { if (common_config('site','fancy')) {
$url = common_path(mb_substr($path, 1)); $url = common_path(mb_substr($path, 1));
} else { } else {
$url = common_path('index.php'.$path); if (mb_strpos($path, '/index.php') === 0) {
$url = common_path(mb_substr($path, 1));
} else {
$url = common_path('index.php'.$path);
}
} }
return $url; return $url;
} }