Leding tabs to spaces.

Superfluous whitespace removed.

diff --git a/lib/activityobject.php b/lib/activityobject.php
index a47928e871b0f2d7af6f651027bf207ddf4e0e0c..444d098073a04500d8ddff0d5363a31d96e83fc9 100644 (file)
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -426,17 +426,17 @@ class ActivityObject
     {
         $object = new ActivityObject();
 
-               if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
+        if (Event::handle('StartActivityObjectFromNotice', array($notice, &$object))) {
 
-                       $object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
+            $object->type    = (empty($notice->object_type)) ? ActivityObject::NOTE : $notice->object_type;
 
-                       $object->id      = $notice->uri;
-                       $object->title   = $notice->content;
-                       $object->content = $notice->rendered;
-                       $object->link    = $notice->bestUrl();
+            $object->id      = $notice->uri;
+            $object->title   = $notice->content;
+            $object->content = $notice->rendered;
+            $object->link    = $notice->bestUrl();
 
-                       Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
-               }
+            Event::handle('EndActivityObjectFromNotice', array($notice, &$object));
+        }
 
         return $object;
     }
@@ -445,62 +445,61 @@ class ActivityObject
     {
         $object = new ActivityObject();
 
-               if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) {
-
-                       $object->type   = ActivityObject::PERSON;
-                       $object->id     = $profile->getUri();
-                       $object->title  = $profile->getBestName();
-                       $object->link   = $profile->profileurl;
+        if (Event::handle('StartActivityObjectFromProfile', array($profile, &$object))) {
+            $object->type   = ActivityObject::PERSON;
+            $object->id     = $profile->getUri();
+            $object->title  = $profile->getBestName();
+            $object->link   = $profile->profileurl;
 
-                       $orig = $profile->getOriginalAvatar();
+            $orig = $profile->getOriginalAvatar();
 
-                       if (!empty($orig)) {
-                               $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
-                       }
+            if (!empty($orig)) {
+                $object->avatarLinks[] = AvatarLink::fromAvatar($orig);
+            }
 
-                       $sizes = array(
+            $sizes = array(
                 AVATAR_PROFILE_SIZE,
                 AVATAR_STREAM_SIZE,
                 AVATAR_MINI_SIZE
             );
 
-                       foreach ($sizes as $size) {
-                               $alink  = null;
-                               $avatar = $profile->getAvatar($size);
-
-                               if (!empty($avatar)) {
-                                       $alink = AvatarLink::fromAvatar($avatar);
-                               } else {
-                                       $alink = new AvatarLink();
-                                       $alink->type   = 'image/png';
-                                       $alink->height = $size;
-                                       $alink->width  = $size;
-                                       $alink->url    = Avatar::defaultImage($size);
-
-                                       if ($size == AVATAR_PROFILE_SIZE) {
-                                               // Hack for Twitter import: we don't have a 96x96 image,
-                                               // but we do have a 73x73 image. For now, fake it with that.
-                                               $avatar = $profile->getAvatar(73);
-                                               if ($avatar) {
-                                                       $alink = AvatarLink::fromAvatar($avatar);
-                                                       $alink->height= $size;
-                                                       $alink->width = $size;
-                                               }
-                                       }
-                               }
-
-                               $object->avatarLinks[] = $alink;
-                       }
-
-                       if (isset($profile->lat) && isset($profile->lon)) {
-                               $object->geopoint = (float)$profile->lat
-                                       . ' ' . (float)$profile->lon;
-                       }
-
-                       $object->poco = PoCo::fromProfile($profile);
-
-                       Event::handle('EndActivityObjectFromProfile', array($profile, &$object));
-               }
+            foreach ($sizes as $size) {
+                $alink  = null;
+                $avatar = $profile->getAvatar($size);
+
+                if (!empty($avatar)) {
+                    $alink = AvatarLink::fromAvatar($avatar);
+                } else {
+                    $alink = new AvatarLink();
+                    $alink->type   = 'image/png';
+                    $alink->height = $size;
+                    $alink->width  = $size;
+                    $alink->url    = Avatar::defaultImage($size);
+
+                    if ($size == AVATAR_PROFILE_SIZE) {
+                        // Hack for Twitter import: we don't have a 96x96 image,
+                        // but we do have a 73x73 image. For now, fake it with that.
+                        $avatar = $profile->getAvatar(73);
+                        if ($avatar) {
+                            $alink = AvatarLink::fromAvatar($avatar);
+                            $alink->height= $size;
+                            $alink->width = $size;
+                        }
+                    }
+                }
+
+                $object->avatarLinks[] = $alink;
+            }
+
+            if (isset($profile->lat) && isset($profile->lon)) {
+                $object->geopoint = (float)$profile->lat
+                    . ' ' . (float)$profile->lon;
+            }
+
+            $object->poco = PoCo::fromProfile($profile);
+
+            Event::handle('EndActivityObjectFromProfile', array($profile, &$object));
+        }
 
         return $object;
     }
@@ -509,25 +508,25 @@ class ActivityObject
     {
         $object = new ActivityObject();
 
-               if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) {
+        if (Event::handle('StartActivityObjectFromGroup', array($group, &$object))) {
 
-                       $object->type   = ActivityObject::GROUP;
-                       $object->id     = $group->getUri();
-                       $object->title  = $group->getBestName();
-                       $object->link   = $group->getUri();
+            $object->type   = ActivityObject::GROUP;
+            $object->id     = $group->getUri();
+            $object->title  = $group->getBestName();
+            $object->link   = $group->getUri();
 
-                       $object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo,
-                                                                                                                         AVATAR_PROFILE_SIZE);
+            $object->avatarLinks[] = AvatarLink::fromFilename($group->homepage_logo,
+                                                              AVATAR_PROFILE_SIZE);
 
-                       $object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo,
-                                                                                                                         AVATAR_STREAM_SIZE);
+            $object->avatarLinks[] = AvatarLink::fromFilename($group->stream_logo,
+                                                              AVATAR_STREAM_SIZE);
 
-                       $object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo,
-                                                                                                                         AVATAR_MINI_SIZE);
+            $object->avatarLinks[] = AvatarLink::fromFilename($group->mini_logo,
+                                                              AVATAR_MINI_SIZE);
 
-                       $object->poco = PoCo::fromGroup($group);
-                   Event::handle('EndActivityObjectFromGroup', array($group, &$object));
-               }
+            $object->poco = PoCo::fromGroup($group);
+            Event::handle('EndActivityObjectFromGroup', array($group, &$object));
+        }
 
         return $object;
     }
@@ -544,16 +543,16 @@ class ActivityObject
             $object->link    = $ptag->homeUrl();
             $object->owner   = Profile::staticGet('id', $ptag->tagger);
             $object->poco    = PoCo::fromProfile($object->owner);
-                   Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object));
+            Event::handle('EndActivityObjectFromPeopletag', array($ptag, &$object));
         }
         return $object;
     }
 
-       function outputTo($xo, $tag='activity:object')
-       {
-               if (!empty($tag)) {
-                       $xo->elementStart($tag);
-               }
+    function outputTo($xo, $tag='activity:object')
+    {
+        if (!empty($tag)) {
+            $xo->elementStart($tag);
+        }
 
         if (Event::handle('StartActivityObjectOutputAtom', array($this, $xo))) {
             $xo->element('activity:object-type', null, $this->type);
@@ -629,7 +628,6 @@ class ActivityObject
                 }
             }
 
-
             if (!empty($this->geopoint)) {
                 $xo->element(
                     'georss:point',
@@ -652,18 +650,18 @@ class ActivityObject
             Event::handle('EndActivityObjectOutputAtom', array($this, $xo));
         }
 
-               if (!empty($tag)) {
-                       $xo->elementEnd($tag);
-               }
+        if (!empty($tag)) {
+            $xo->elementEnd($tag);
+        }
 
         return;
-       }
+    }
 
     function asString($tag='activity:object')
     {
         $xs = new XMLStringer(true);
 
-               $this->outputTo($xs, $tag);
+        $this->outputTo($xs, $tag);
 
         return $xs->getString();
     }