L10n/i18n updated.

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index ccc4b0978170fc75eaa0395e5bcdf443c39f0301..6533e24e57ff672b578e23057e9bfdda775e4f53 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -41,7 +41,7 @@ class StatusNet_URL_Mapper extends Net_URL_Mapper
     private function __construct()
     {
     }
-    
+
     public static function getInstance($id = '__default__')
     {
         if (empty(self::$_singleton)) {
@@ -67,7 +67,7 @@ class StatusNet_URL_Mapper extends Net_URL_Mapper
         }
         return $result;
     }
-    
+
     protected function _mapAction($action, $path)
     {
         if (!array_key_exists($action, $this->_actionToPath)) {
@@ -76,19 +76,19 @@ class StatusNet_URL_Mapper extends Net_URL_Mapper
         $this->_actionToPath[$action][] = $path;
         return;
     }
-    
+
     public function generate($values = array(), $qstring = array(), $anchor = '')
     {
         if (!array_key_exists('action', $values)) {
             return parent::generate($values, $qstring, $anchor);
         }
-       
+
         $action = $values['action'];
 
         if (!array_key_exists($action, $this->_actionToPath)) {
             return parent::generate($values, $qstring, $anchor);
         }
-       
+
         $oldPaths    = $this->paths;
         $this->paths = $this->_actionToPath[$action];
         $result      = parent::generate($values, $qstring, $anchor);
@@ -147,19 +147,19 @@ class Router
 
     /**
      * Create a unique hashkey for the router.
-     * 
+     *
      * The router's url map can change based on the version of the software
      * you're running and the plugins that are enabled. To avoid having bad routes
      * get stuck in the cache, the key includes a list of plugins and the software
      * version.
-     * 
-     * There can still be problems with a) differences in versions of the plugins and 
+     *
+     * There can still be problems with a) differences in versions of the plugins and
      * b) people running code between official versions, but these tend to be more
      * sophisticated users who can grok what's going on and clear their caches.
-     * 
+     *
      * @return string cache key string that should uniquely identify a router
      */
-    
+
     static function cacheKey()
     {
         $parts = array('router');
@@ -173,7 +173,7 @@ class Router
 
         return Cache::codeKey(implode(':', $parts));
     }
-    
+
     function initialize()
     {
         $m = StatusNet_URL_Mapper::getInstance();
@@ -199,7 +199,8 @@ class Router
             // main stuff is repetitive
 
             $main = array('login', 'logout', 'register', 'subscribe',
-                          'unsubscribe', 'confirmaddress', 'recoverpassword',
+                          'unsubscribe', 'cancelsubscription', 'approvesub',
+                          'confirmaddress', 'recoverpassword',
                           'invite', 'favor', 'disfavor', 'sup',
                           'block', 'unblock', 'subedit',
                           'groupblock', 'groupunblock',
@@ -333,6 +334,9 @@ class Router
             $m->connect('conversation/:id',
                         array('action' => 'conversation'),
                         array('id' => '[0-9]+'));
+            $m->connect('conversation/:id/replies',
+                        array('action' => 'conversationreplies'),
+                        array('id' => '[0-9]+'));
 
             $m->connect('message/new', array('action' => 'newmessage'));
             $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => Nickname::DISPLAY_FMT));
@@ -363,7 +367,7 @@ class Router
 
             $m->connect('group/new', array('action' => 'newgroup'));
 
-            foreach (array('edit', 'join', 'leave', 'delete') as $v) {
+            foreach (array('edit', 'join', 'leave', 'delete', 'cancel', 'approve') as $v) {
                 $m->connect('group/:nickname/'.$v,
                             array('action' => $v.'group'),
                             array('nickname' => Nickname::DISPLAY_FMT));
@@ -390,6 +394,10 @@ class Router
                         array('action' => 'makeadmin'),
                         array('nickname' => Nickname::DISPLAY_FMT));
 
+            $m->connect('group/:nickname/members/pending',
+                        array('action' => 'groupqueue'),
+                        array('nickname' => Nickname::DISPLAY_FMT));
+
             $m->connect('group/:id/id',
                         array('action' => 'groupbyid'),
                         array('id' => '[0-9]+'));
@@ -836,6 +844,10 @@ class Router
                                 array('tag' => self::REGEX_TAG));
                 }
 
+                $m->connect('subscribers/pending',
+                            array('action' => 'subqueue',
+                                  'nickname' => $nickname));
+
                 foreach (array('rss', 'groups') as $a) {
                     $m->connect($a,
                                 array('action' => 'user'.$a,
@@ -892,6 +904,9 @@ class Router
                                 array('action' => $a),
                                 array('nickname' => Nickname::DISPLAY_FMT));
                 }
+                $m->connect(':nickname/subscribers/pending',
+                            array('action' => 'subqueue'),
+                            array('nickname' => Nickname::DISPLAY_FMT));
 
                 foreach (array('subscriptions', 'subscribers') as $a) {
                     $m->connect(':nickname/'.$a.'/:tag',