3 files changed, 124 insertions, 5 deletions

diff --git a/plugins/SocialObject/SocialObject.php b/plugins/SocialObject/SocialObject.php
index f4b84dd9f..2d29e31d0 100644
--- a/plugins/SocialObject/SocialObject.php
+++ b/plugins/SocialObject/SocialObject.php
@@ -137,7 +137,6 @@ class SocialObject extends Memcached_DataObject
         }
 
         $this->free();
-        $this = NULL;
 
         return $ids;
     }
@@ -327,7 +326,7 @@ class SocialObject extends Memcached_DataObject
 
             # just return the $objects array, we can then use $notices->id
             # each time to get the object associated
-            return new array($notices, $objects);
+            return array($notices, $objects);
         }
     }
 }
diff --git a/plugins/SocialObject/SocialObjectGroupAction.php b/plugins/SocialObject/SocialObjectGroupAction.php
index e69de29bb..38e8960f3 100644
--- a/plugins/SocialObject/SocialObjectGroupAction.php
+++ b/plugins/SocialObject/SocialObjectGroupAction.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, 2010, StatusNet, Inc.
+ * Copyright (C) 2010, Free Software Foundation, Inc.
+ *
+ * Show a stream of a particular social object in this group.
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  GNUSocial
+ * @package   StatusNet
+ * @author    Shashi Gowda <connect2shashi@gmail.com>
+ * @copyright 2009, 2010, StatusNet, Inc.
+ * @copyright 2010, Free Software Foundation, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://daisycha.in
+ */
+
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/actions/showgroup.php';
+
+class SocialObjectGroupAction extends ShowgroupAction
+{
+    var $slug_plural = null;
+
+    function title()
+    {
+        return $this->name_plural . ' in ' . parent::title();
+    }
+
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        $nickname_arg = $this->arg('group');
+        $nickname = common_canonical_nickname($nickname_arg);
+
+        // Permanent redirect on non-canonical nickname
+
+        if ($nickname_arg != $nickname) {
+            $args = array('group' => $nickname);
+            if ($this->page != 1) {
+                $args['page'] = $this->page;
+            }
+            common_redirect(common_local_url('group'.$this->slug_plural, $args), 301);
+            return false;
+        }
+
+        if (!$nickname) {
+            $this->clientError(_('No nickname.'), 404);
+            return false;
+        }
+
+        $local = Local_group::staticGet('nickname', $nickname);
+
+        if (!$local) {
+            $alias = Group_alias::staticGet('alias', $nickname);
+            if ($alias) {
+                $local = Local_group::staticGet('id', $alias->group_id);
+                $args = array('group' => $local->nickname);
+                if ($this->page != 1) {
+                    $args['page'] = $this->page;
+                }
+                common_redirect(common_local_url('group'.$this->slug_plural, $args), 301);
+                return false;
+            } else {
+                common_log(LOG_NOTICE, "Couldn't find local group for nickname '$nickname'");
+                $this->clientError(_('No such group.'), 404);
+                return false;
+            }
+        }
+
+        $this->group = User_group::staticGet('id', $local->group_id);
+
+        if (!$this->group) {
+            $this->clientError(_('No such group.'), 404);
+            return false;
+        }
+
+        common_set_returnto($this->selfUrl());
+
+        return true;
+    }
+
+    function showGroupNotices()
+    {
+        list($notice, $objects) = "{$this->dbclass}"::groupStream(($this->page-1)*NOTICES_PER_PAGE,
+                                           NOTICES_PER_PAGE + 1);
+
+        $nl = new SocialObjectList($notice, $objects, $this);
+        $cnt = $nl->show();
+
+        $this->pagination($this->page > 1,
+                          $cnt > NOTICES_PER_PAGE,
+                          $this->page,
+                          'group'.$this->slug_plural,
+                          array('nickname' => $this->group->nickname));
+    }
+}
diff --git a/plugins/SocialObject/SocialObjectPlugin.php b/plugins/SocialObject/SocialObjectPlugin.php
index 7c63c8a70..173b3d5bf 100644
--- a/plugins/SocialObject/SocialObjectPlugin.php
+++ b/plugins/SocialObject/SocialObjectPlugin.php
@@ -75,8 +75,8 @@ class SocialObjectPlugin extends Plugin
     function onCheckSchema()
     {
         $schema = Schema::get();
-        $classname = $this->dbclass
-        $schema->ensureTable($classname::schemaDef());
+        $schema->ensureTable(call_user_func(
+                array($this->dbname, 'schemaDef')));
         return true;
     }
 
@@ -114,7 +114,7 @@ class SocialObjectPlugin extends Plugin
             $len = strlen($s);
             # if key starts with $s,
             if(substr($key, 0, $len) === $s) {
-                Memcached_DataObject::blow(sprintf($r, $this->slug)));
+                Memcached_DataObject::blow(sprintf($r, $this->slug));
             }
         }
     }