Minor: Including formData()'s inreplyto in action check

[quix0rs-gnu-social.git] / actions / userbyid.php

diff --git a/actions/userbyid.php b/actions/userbyid.php
index c42cad0836567049818a066fd82b0834f201834a..d57ed21a54d233f4e9c1fda45247b84d0ff6340f 100644 (file)
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -19,24 +19,34 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-class UserbyidAction extends Action {
-       
-       function is_readonly() {                                
-               return true;
-       }
-       
-    function handle($args) {
+class UserbyidAction extends Action
+{
+    
+    function is_readonly()
+    {                
+        return true;
+    }
+    
+    function handle($args)
+    {
         parent::handle($args);
         $id = $this->trimmed('id');
         if (!$id) {
-               $this->client_error(_('No id.'));
-               }
-               $user =& User::staticGet($id);
-               if (!$user) {
-                       $this->client_error(_('No such user.'));
-               }
-               $url=common_local_url('showstream',
-                               array('nickname' => $user->nickname));
-               common_redirect($url, 303);
-       }
+            $this->client_error(_('No id.'));
+        }
+        $user =& User::staticGet($id);
+        if (!$user) {
+            $this->client_error(_('No such user.'));
+        }
+
+        // support redirecting to FOAF rdf/xml if the agent prefers it
+        $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
+        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
+        $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
+                                      common_accept_to_prefs($page_prefs));
+        $page = $type == 'application/rdf+xml' ? 'foaf' : 'showstream';
+
+        $url = common_local_url($page, array('nickname' => $user->nickname));
+        common_redirect($url, 303);
+    }
 }