Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	lib/router.php

diff --combined index.php
index b060a3d52ac9ec9c60214702bc2a2c1b63dd63a8,9501e2275da6d610b9263bcb5a9e911e721d64de..049d46afceea1ff567956e7bdaaed50d76427da8
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -189,7 -189,7 +189,7 @@@ function checkMirror($action_obj, $args
  
  function isLoginAction($action)
  {
 -    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd');
 +    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd', 'hostmeta');
  
      $login = null;
  
@@@ -272,11 -272,7 +272,7 @@@ function main(
          return;
      }
  
-     // Note the order here: arguments from the URL mapper will
-     // override request params that have been sent. This ensures
-     // that for instance an action parameter can't be overridden
-     // with an arbitrary action class.
-     $args = array_merge($_REQUEST, $args);
+     $args = array_merge($args, $_REQUEST);
  
      Event::handle('ArgsInitialize', array(&$args));
  

diff --combined lib/router.php
index 9640ec1e042afacd47d4be1277306e8201fed758,7272a96904ba786d81977b1b49c9a3c88b4582df..a0ea996ecf747ca4e4f9cf7018f78324ce6bbc16
--- 1/lib/router.php
--- 2/lib/router.php
+++ b/lib/router.php
@@@ -128,12 -128,13 +128,13 @@@ class Route
      {
          if (empty($this->m)) {
              $k = self::cacheKey();
-             $m = Cache::get($k);
+             $c = Cache::instance();
+             $m = $c->get($k);
              if (!empty($m)) {
                  $this->m = $m;
              } else {
                  $this->m = $this->initialize();
-                 Cache::set($k, $this->m);
+                 $c->set($k, $this->m);
              }
          }
      }
@@@ -156,18 -157,18 +157,18 @@@
      static function cacheKey()
      {
          $plugins     = StatusNet::getActivePlugins();
-       $names       = array();
+         $names       = array();
        
-       foreach ($plugins as $plugin) {
-           $names[] = $plugin[0];
-       }
+         foreach ($plugins as $plugin) {
+             $names[] = $plugin[0];
+         }
  
-       $names = array_unique($names);
-       asort($names);
+         $names = array_unique($names);
+         asort($names);
  
-       // Unique enough.
+         // Unique enough.
        
-       $uniq = crc32(implode(',', $names));
+         $uniq = crc32(implode(',', $names));
        
          return Cache::key('router:'.STATUSNET_VERSION.':'.$uniq);
      }
@@@ -229,10 -230,6 +230,10 @@@
  
              $m->connect('main/xrds',
                          array('action' => 'publicxrds'));
 +            $m->connect('.well-known/host-meta',
 +                        array('action' => 'hostmeta'));
 +          $m->connect('main/xrd',
 +                      array('action' => 'userxrd'));
  
              // these take a code
  
@@@ -303,10 -300,10 +304,10 @@@
              $m->connect('notice/new', array('action' => 'newnotice'));
              $m->connect('notice/new?replyto=:replyto',
                          array('action' => 'newnotice'),
 -                        array('replyto' => '[A-Za-z0-9_-]+'));
 +                        array('replyto' => Nickname::DISPLAY_FMT));
              $m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
                          array('action' => 'newnotice'),
 -                        array('replyto' => '[A-Za-z0-9_-]+'),
 +                        array('replyto' => Nickname::DISPLAY_FMT),
                          array('inreplyto' => '[0-9]+'));
  
              $m->connect('notice/:notice/file',
@@@ -330,7 -327,7 +331,7 @@@
                          array('id' => '[0-9]+'));
  
              $m->connect('message/new', array('action' => 'newmessage'));
 -            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
 +            $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
              $m->connect('message/:message',
                          array('action' => 'showmessage'),
                          array('message' => '[0-9]+'));
@@@ -361,7 -358,7 +362,7 @@@
              foreach (array('edit', 'join', 'leave', 'delete') as $v) {
                  $m->connect('group/:nickname/'.$v,
                              array('action' => $v.'group'),
 -                            array('nickname' => '[a-zA-Z0-9]+'));
 +                            array('nickname' => Nickname::DISPLAY_FMT));
                  $m->connect('group/:id/id/'.$v,
                              array('action' => $v.'group'),
                              array('id' => '[0-9]+'));
@@@ -370,20 -367,20 +371,20 @@@
              foreach (array('members', 'logo', 'rss', 'designsettings') as $n) {
                  $m->connect('group/:nickname/'.$n,
                              array('action' => 'group'.$n),
 -                            array('nickname' => '[a-zA-Z0-9]+'));
 +                            array('nickname' => Nickname::DISPLAY_FMT));
              }
  
              $m->connect('group/:nickname/foaf',
                          array('action' => 'foafgroup'),
 -                        array('nickname' => '[a-zA-Z0-9]+'));
 +                        array('nickname' => Nickname::DISPLAY_FMT));
  
              $m->connect('group/:nickname/blocked',
                          array('action' => 'blockedfromgroup'),
 -                        array('nickname' => '[a-zA-Z0-9]+'));
 +                        array('nickname' => Nickname::DISPLAY_FMT));
  
              $m->connect('group/:nickname/makeadmin',
                          array('action' => 'makeadmin'),
 -                        array('nickname' => '[a-zA-Z0-9]+'));
 +                        array('nickname' => Nickname::DISPLAY_FMT));
  
              $m->connect('group/:id/id',
                          array('action' => 'groupbyid'),
@@@ -391,7 -388,7 +392,7 @@@
  
              $m->connect('group/:nickname',
                          array('action' => 'showgroup'),
 -                        array('nickname' => '[a-zA-Z0-9]+'));
 +                        array('nickname' => Nickname::DISPLAY_FMT));
  
              $m->connect('group/', array('action' => 'groups'));
              $m->connect('group', array('action' => 'groups'));
@@@ -412,7 -409,7 +413,7 @@@
  
              $m->connect('api/statuses/friends_timeline/:id.:format',
                          array('action' => 'ApiTimelineFriends',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statuses/home_timeline.:format',
@@@ -421,7 -418,7 +422,7 @@@
  
              $m->connect('api/statuses/home_timeline/:id.:format',
                          array('action' => 'ApiTimelineHome',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statuses/user_timeline.:format',
@@@ -430,7 -427,7 +431,7 @@@
  
              $m->connect('api/statuses/user_timeline/:id.:format',
                          array('action' => 'ApiTimelineUser',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statuses/mentions.:format',
@@@ -439,7 -436,7 +440,7 @@@
  
              $m->connect('api/statuses/mentions/:id.:format',
                          array('action' => 'ApiTimelineMentions',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statuses/replies.:format',
@@@ -448,7 -445,7 +449,7 @@@
  
              $m->connect('api/statuses/replies/:id.:format',
                          array('action' => 'ApiTimelineMentions',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statuses/retweeted_by_me.:format',
@@@ -469,7 -466,7 +470,7 @@@
  
              $m->connect('api/statuses/friends/:id.:format',
                          array('action' => 'ApiUserFriends',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statuses/followers.:format',
@@@ -478,17 -475,17 +479,17 @@@
  
              $m->connect('api/statuses/followers/:id.:format',
                          array('action' => 'ApiUserFollowers',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statuses/show.:format',
                          array('action' => 'ApiStatusesShow',
 -                              'format' => '(xml|json)'));
 +                              'format' => '(xml|json|atom)'));
  
              $m->connect('api/statuses/show/:id.:format',
                          array('action' => 'ApiStatusesShow',
                                'id' => '[0-9]+',
 -                              'format' => '(xml|json)'));
 +                              'format' => '(xml|json|atom)'));
  
              $m->connect('api/statuses/update.:format',
                          array('action' => 'ApiStatusesUpdate',
@@@ -521,7 -518,7 +522,7 @@@
  
              $m->connect('api/users/show/:id.:format',
                          array('action' => 'ApiUserShow',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              // direct messages
@@@ -559,12 -556,12 +560,12 @@@
  
              $m->connect('api/friendships/create/:id.:format',
                          array('action' => 'ApiFriendshipsCreate',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/friendships/destroy/:id.:format',
                          array('action' => 'ApiFriendshipsDestroy',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              // Social graph
@@@ -621,17 -618,17 +622,17 @@@
  
              $m->connect('api/favorites/:id.:format',
                          array('action' => 'ApiTimelineFavorites',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/favorites/create/:id.:format',
                          array('action' => 'ApiFavoriteCreate',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/favorites/destroy/:id.:format',
                          array('action' => 'ApiFavoriteDestroy',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
              // blocks
  
@@@ -641,7 -638,7 +642,7 @@@
  
              $m->connect('api/blocks/create/:id.:format',
                          array('action' => 'ApiBlockCreate',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/blocks/destroy.:format',
@@@ -650,7 -647,7 +651,7 @@@
  
              $m->connect('api/blocks/destroy/:id.:format',
                          array('action' => 'ApiBlockDestroy',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
              // help
  
@@@ -686,7 -683,7 +687,7 @@@
  
              $m->connect('api/statusnet/groups/timeline/:id.:format',
                          array('action' => 'ApiTimelineGroup',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statusnet/groups/show.:format',
@@@ -695,12 -692,12 +696,12 @@@
  
              $m->connect('api/statusnet/groups/show/:id.:format',
                          array('action' => 'ApiGroupShow',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statusnet/groups/join.:format',
                          array('action' => 'ApiGroupJoin',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statusnet/groups/join/:id.:format',
@@@ -709,7 -706,7 +710,7 @@@
  
              $m->connect('api/statusnet/groups/leave.:format',
                          array('action' => 'ApiGroupLeave',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statusnet/groups/leave/:id.:format',
@@@ -726,7 -723,7 +727,7 @@@
  
              $m->connect('api/statusnet/groups/list/:id.:format',
                          array('action' => 'ApiGroupList',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json|rss|atom)'));
  
              $m->connect('api/statusnet/groups/list_all.:format',
@@@ -739,7 -736,7 +740,7 @@@
  
              $m->connect('api/statusnet/groups/membership/:id.:format',
                          array('action' => 'ApiGroupMembership',
 -                              'id' => '[a-zA-Z0-9]+',
 +                              'id' => Nickname::DISPLAY_FMT,
                                'format' => '(xml|json)'));
  
              $m->connect('api/statusnet/groups/create.:format',
@@@ -770,13 -767,6 +771,13 @@@
              $m->connect('api/oauth/authorize',
                          array('action' => 'ApiOauthAuthorize'));
  
 +            $m->connect('api/statusnet/app/service/:id.xml',
 +                        array('action' => 'ApiAtomService',
 +                              'id' => Nickname::DISPLAY_FMT));
 +
 +            $m->connect('api/statusnet/app/service.xml',
 +                        array('action' => 'ApiAtomService'));
 +
              // Admin
  
              $m->connect('admin/site', array('action' => 'siteadminpanel'));
@@@ -869,54 -859,54 +870,54 @@@
                                 'replies', 'inbox', 'outbox', 'microsummary', 'hcard') as $a) {
                      $m->connect(':nickname/'.$a,
                                  array('action' => $a),
 -                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                                array('nickname' => Nickname::DISPLAY_FMT));
                  }
  
                  foreach (array('subscriptions', 'subscribers') as $a) {
                      $m->connect(':nickname/'.$a.'/:tag',
                                  array('action' => $a),
                                  array('tag' => '[a-zA-Z0-9]+',
 -                                      'nickname' => '[a-zA-Z0-9]{1,64}'));
 +                                      'nickname' => Nickname::DISPLAY_FMT));
                  }
  
                  foreach (array('rss', 'groups') as $a) {
                      $m->connect(':nickname/'.$a,
                                  array('action' => 'user'.$a),
 -                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                                array('nickname' => Nickname::DISPLAY_FMT));
                  }
  
                  foreach (array('all', 'replies', 'favorites') as $a) {
                      $m->connect(':nickname/'.$a.'/rss',
                                  array('action' => $a.'rss'),
 -                                array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                                array('nickname' => Nickname::DISPLAY_FMT));
                  }
  
                  $m->connect(':nickname/favorites',
                              array('action' => 'showfavorites'),
 -                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                            array('nickname' => Nickname::DISPLAY_FMT));
  
                  $m->connect(':nickname/avatar/:size',
                              array('action' => 'avatarbynickname'),
                              array('size' => '(original|96|48|24)',
 -                                  'nickname' => '[a-zA-Z0-9]{1,64}'));
 +                                  'nickname' => Nickname::DISPLAY_FMT));
  
                  $m->connect(':nickname/tag/:tag/rss',
                              array('action' => 'userrss'),
 -                            array('nickname' => '[a-zA-Z0-9]{1,64}'),
 +                            array('nickname' => Nickname::DISPLAY_FMT),
                              array('tag' => '[\pL\pN_\-\.]{1,64}'));
  
                  $m->connect(':nickname/tag/:tag',
                              array('action' => 'showstream'),
 -                            array('nickname' => '[a-zA-Z0-9]{1,64}'),
 +                            array('nickname' => Nickname::DISPLAY_FMT),
                              array('tag' => '[\pL\pN_\-\.]{1,64}'));
  
                  $m->connect(':nickname/rsd.xml',
                              array('action' => 'rsd'),
 -                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                            array('nickname' => Nickname::DISPLAY_FMT));
  
                  $m->connect(':nickname',
                              array('action' => 'showstream'),
 -                            array('nickname' => '[a-zA-Z0-9]{1,64}'));
 +                            array('nickname' => Nickname::DISPLAY_FMT));
              }
  
              // user stuff