fix hungry match for group name

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

diff --git a/lib/util.php b/lib/util.php
index 9ca817eab304478eece29acce9c5b6c5985a69c5..56fbc29f5001a145acb81d0b7ac8f757684fba3f 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -770,6 +770,8 @@ function common_fancy_url($action, $args=null)
         return common_path('main/openid');
      case 'profilesettings':
         return common_path('settings/profile');
+     case 'passwordsettings':
+        return common_path('settings/password');
      case 'emailsettings':
         return common_path('settings/email');
      case 'openidsettings':
@@ -852,6 +854,8 @@ function common_fancy_url($action, $args=null)
         return common_path($path);
      case 'imsettings':
         return common_path('settings/im');
+     case 'avatarsettings':
+        return common_path('settings/avatar');
      case 'peoplesearch':
         return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
      case 'noticesearch':
@@ -861,13 +865,11 @@ function common_fancy_url($action, $args=null)
      case 'avatarbynickname':
         return common_path($args['nickname'].'/avatar/'.$args['size']);
      case 'tag':
-        if (isset($args['tag']) && $args['tag']) {
-            $path = 'tag/' . $args['tag'];
-            unset($args['tag']);
-        } else {
-            $path = 'tags';
-        }
+        $path = 'tag/' . $args['tag'];
+        unset($args['tag']);
         return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
+     case 'publictagcloud':
+        return common_path('tags');
      case 'peopletag':
         $path = 'peopletag/' . $args['tag'];
         unset($args['tag']);
@@ -913,6 +915,24 @@ function common_fancy_url($action, $args=null)
         } else {
             return common_path('main/sup');
         }
+     case 'newgroup':
+        return common_path('group/new');
+     case 'showgroup':
+        return common_path('group/'.$args['nickname']);
+     case 'editgroup':
+        return common_path('group/'.$args['nickname'].'/edit');
+     case 'joingroup':
+        return common_path('group/'.$args['nickname'].'/join');
+     case 'leavegroup':
+        return common_path('group/'.$args['nickname'].'/leave');
+     case 'groupbyid':
+        return common_path('group/'.$args['id'].'/id');
+     case 'grouprss':
+        return common_path('group/'.$args['nickname'].'/rss');
+     case 'groupmembers':
+        return common_path('group/'.$args['nickname'].'/members');
+     case 'usergroups':
+        return common_path($args['nickname'].'/groups');
      default:
         return common_simple_url($action, $args);
     }
@@ -1024,14 +1044,16 @@ function common_redirect($url, $code=307)
                            302 => "Found",
                            303 => "See Other",
                            307 => "Temporary Redirect");
+
     header("Status: ${code} $status[$code]");
     header("Location: $url");
 
-    common_start_xml('a',
-                     '-//W3C//DTD XHTML 1.0 Strict//EN',
-                     'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
-    common_element('a', array('href' => $url), $url);
-    common_end_xml();
+    $xo = new XMLOutputter();
+    $xo->startXML('a',
+                  '-//W3C//DTD XHTML 1.0 Strict//EN',
+                  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+    $xo->output('a', array('href' => $url), $url);
+    $xo->endXML();
     exit;
 }