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

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

diff --git a/lib/xrdaction.php b/lib/xrdaction.php
index b59e0f78a40f3c2dab4a8eb43053f2d2b579f5c1..a0e7a1c4151f5caf7aacf72bed25fd5a3ceb9fc4 100644 (file)
--- a/lib/xrdaction.php
+++ b/lib/xrdaction.php
@@ -31,7 +31,7 @@ class XrdAction extends Action
     const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
     const UPDATESFROM = 'http://schemas.google.com/g/2010#updates-from';
     const HCARD = 'http://microformats.org/profile/hcard';
-    
+
     public $uri;
 
     public $user;
@@ -54,39 +54,39 @@ class XrdAction extends Action
         }
 
         if (Event::handle('StartXrdActionAliases', array(&$xrd, $this->user))) {
-           
+
             // Possible aliases for the user
-           
+
             $uris = array($this->user->uri, $profile->profileurl);
-           
+
             // FIXME: Webfinger generation code should live somewhere on its own
-           
+
             $path = common_config('site', 'path');
-           
+
             if (empty($path)) {
                 $uris[] = sprintf('acct:%s@%s', $nick, common_config('site', 'server'));
             }
-           
+
             foreach ($uris as $uri) {
                 if ($uri != $xrd->subject) {
                     $xrd->alias[] = $uri;
                 }
             }
-           
+
             Event::handle('EndXrdActionAliases', array(&$xrd, $this->user));
         }
 
         if (Event::handle('StartXrdActionLinks', array(&$xrd, $this->user))) {
-           
+
             $xrd->links[] = array('rel' => self::PROFILEPAGE,
                                   'type' => 'text/html',
                                   'href' => $profile->profileurl);
-           
+
             // hCard
             $xrd->links[] = array('rel' => self::HCARD,
                                   'type' => 'text/html',
                                   'href' => common_local_url('hcard', array('nickname' => $nick)));
-           
+
             // XFN
             $xrd->links[] = array('rel' => 'http://gmpg.org/xfn/11',
                                   'type' => 'text/html',
@@ -96,7 +96,7 @@ class XrdAction extends Action
                                   'type' => 'application/rdf+xml',
                                   'href' => common_local_url('foaf',
                                                              array('nickname' => $nick)));
-           
+
             $xrd->links[] = array('rel' => 'http://apinamespace.org/atom',
                                   'type' => 'application/atomsvc+xml',
                                   'href' => common_local_url('ApiAtomService', array('id' => $nick)),
@@ -108,7 +108,7 @@ class XrdAction extends Action
             } else {
                 $apiRoot = common_path('index.php/api/', true);
             }
-            
+
             $xrd->links[] = array('rel' => 'http://apinamespace.org/twitter',
                                   'href' => $apiRoot,
                                   'property' => array(array('type' => 'http://apinamespace.org/twitter/username',
@@ -120,12 +120,12 @@ class XrdAction extends Action
         header('Content-type: application/xrd+xml');
         print $xrd->toXML();
     }
-    
+
     /**
      * Given a "user id" make sure it's normalized to either a webfinger
      * acct: uri or a profile HTTP URL.
      */
-    
+
     public static function normalize($user_id)
     {
         if (substr($user_id, 0, 5) == 'http:' ||