wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
Brion Vibber 2010-06-16 12:37:14 -07:00
commit d65d982681
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/router.php
View File

@ -263,7 +263,7 @@ class Router
$m->connect('tag', array('action' => 'publictagcloud')); $m->connect('tag', array('action' => 'publictagcloud'));
$m->connect('tag/:tag/rss', $m->connect('tag/:tag/rss',
array('action' => 'tagrss'), array('action' => 'tagrss'),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('tag/:tag', $m->connect('tag/:tag',
array('action' => 'tag'), array('action' => 'tag'),
array('tag' => '[\pL\pN_\-\.]{1,64}')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
@ -749,12 +749,12 @@ class Router
$m->connect('tag/:tag/rss', $m->connect('tag/:tag/rss',
array('action' => 'userrss', array('action' => 'userrss',
'nickname' => $nickname), 'nickname' => $nickname),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('tag/:tag', $m->connect('tag/:tag',
array('action' => 'showstream', array('action' => 'showstream',
'nickname' => $nickname), 'nickname' => $nickname),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect('rsd.xml', $m->connect('rsd.xml',
array('action' => 'rsd', array('action' => 'rsd',
@ -815,12 +815,12 @@ class Router
$m->connect(':nickname/tag/:tag/rss', $m->connect(':nickname/tag/:tag/rss',
array('action' => 'userrss'), array('action' => 'userrss'),
array('nickname' => '[a-zA-Z0-9]{1,64}'), array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/tag/:tag', $m->connect(':nickname/tag/:tag',
array('action' => 'showstream'), array('action' => 'showstream'),
array('nickname' => '[a-zA-Z0-9]{1,64}'), array('nickname' => '[a-zA-Z0-9]{1,64}'),
array('tag' => '[a-zA-Z0-9]+')); array('tag' => '[\pL\pN_\-\.]{1,64}'));
$m->connect(':nickname/rsd.xml', $m->connect(':nickname/rsd.xml',
array('action' => 'rsd'), array('action' => 'rsd'),

17
plugins/OpenID/openidserver.php
View File

@ -69,9 +69,13 @@ class OpenidserverAction extends Action
//cannot prompt the user to login in immediate mode, so answer false //cannot prompt the user to login in immediate mode, so answer false
$response = $this->generateDenyResponse($request); $response = $this->generateDenyResponse($request);
}else{ }else{
/* Go log in, and then come back. */ // Go log in, and then come back.
//
// Note: 303 redirect rather than 307 to avoid
// prompting user for form resubmission if we
// were POSTed here.
common_set_returnto($_SERVER['REQUEST_URI']); common_set_returnto($_SERVER['REQUEST_URI']);
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'), 303);
return; return;
} }
}else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){ }else if(common_profile_url($user->nickname) == $request->identity || $request->idSelect()){
@ -90,8 +94,13 @@ class OpenidserverAction extends Action
$this->oserver->encodeResponse($denyResponse); //sign the response $this->oserver->encodeResponse($denyResponse); //sign the response
$_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl(); $_SESSION['openid_allow_url'] = $allowResponse->encodeToUrl();
$_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl(); $_SESSION['openid_deny_url'] = $denyResponse->encodeToUrl();
//ask the user to trust this trust root
common_redirect(common_local_url('openidtrust')); // Ask the user to trust this trust root...
//
// Note: 303 redirect rather than 307 to avoid
// prompting user for form resubmission if we
// were POSTed here.
common_redirect(common_local_url('openidtrust'), 303);
return; return;
} }
}else{ }else{