* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
- exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
/**
* URL Router
array('action' => 'shownotice'),
array('notice' => '[0-9]+'));
- $m->connect('notice/delete/:notice',
+ $m->connect('notice/:notice/delete',
array('action' => 'deletenotice'),
array('notice' => '[0-9]+'));
- $m->connect('notice/delete', array('action' => 'deletenotice'));
-
// conversation
$m->connect('conversation/:id',
'api/statuses/update_with_media.json',
array('action' => 'ApiMediaUpload')
);
+ // Twitter Media upload API v1.1
+ $m->connect(
+ 'api/media/upload.:format',
+ array('action' => 'ApiMediaUpload',
+ 'format' => '(xml|json)',
+ )
+ );
// search
$m->connect('api/search.atom', array('action' => 'ApiSearchAtom'));
$m->connect('all/:tag',
array('action' => 'showprofiletag',
+ 'nickname' => $nickname,
'tag' => self::REGEX_TAG));
foreach (array('subscriptions', 'subscribers') as $a) {
'tagger_id' => '[0-9]+',
'id' => '[0-9]+'));
- $m->connect(':tagger/all/:tag',
- array('action' => 'showprofiletag',
- 'tagger' => Nickname::DISPLAY_FMT,
+ $m->connect(':nickname/all/:tag',
+ array('action' => 'showprofiletag'),
+ array('nickname' => Nickname::DISPLAY_FMT,
'tag' => self::REGEX_TAG));
foreach (array('subscriptions', 'subscribers') as $a) {
function map($path)
{
try {
- $match = $this->m->match($path);
- } catch (Exception $e) {
- common_log(LOG_ERR, "Problem getting route for $path - " .
- $e->getMessage());
+ return $this->m->match($path);
+ } catch (NoRouteMapException $e) {
+ common_debug($e->getMessage());
// TRANS: Client error on action trying to visit a non-existing page.
- $cac = new ClientErrorAction(_('Page not found.'), 404);
- $cac->showPage();
+ throw new ClientException(_('Page not found.'), 404);
}
-
- return $match;
}
function build($action, $args=null, $params=null, $fragment=null)