do some moving around of forwarding stuff

4 files changed, 0 insertions, 212 deletions

diff --git a/plugins/Repeat/forward.php b/actions/repeat.php
index 194833fe0..194833fe0 100644
--- a/plugins/Repeat/forward.php
+++ b/actions/repeat.php
diff --git a/plugins/Repeat/forwardform.php b/lib/repeatform.php
index 2052856ae..2052856ae 100644
--- a/plugins/Repeat/forwardform.php
+++ b/lib/repeatform.php
diff --git a/plugins/Repeat/Forward.php b/plugins/Repeat/Forward.php
deleted file mode 100644
index 09b2d6a4e..000000000
--- a/plugins/Repeat/Forward.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2009, StatusNet, Inc.
- *
- * 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/>.
- */
-
-if (!defined('STATUSNET')) {
-    exit(1);
-}
-
-/**
- * Table Definition for location_namespace
- */
-
-require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-
-class Forward extends Memcached_DataObject
-{
-    ###START_AUTOCODE
-    /* the code below is auto generated do not remove the above tag */
-
-    public $__table = 'forward';                         // table name
-    public $profile_id;                      // int(4)  primary_key not_null
-    public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
-
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Forward',$k,$v); }
-
-    /* the code above is auto generated do not remove the tag below */
-    ###END_AUTOCODE
-
-    function &pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Forward', $kv);
-    }
-
-    static function saveNew($profile_id, $notice_id)
-    {
-        $forward = new Forward();
-
-        $forward->profile_id = $profile_id;
-        $forward->notice_id  = $notice_id;
-        $forward->created    = common_sql_now();
-
-        $forward->query('BEGIN');
-
-        if (!$forward->insert()) {
-            throw new ServerException(_("Couldn't insert forward."));
-        }
-
-        $ni = $forward->addToInboxes();
-
-        $forward->query('COMMIT');
-
-        $forward->blowCache($ni);
-
-        return $forward;
-    }
-
-    function addToInboxes()
-    {
-        $inbox = new Notice_inbox();
-
-        $user = new User();
-
-        $usertable = common_database_tablename('user');
-        $user->query("SELECT $usertable.* FROM $usertable INNER JOIN subscription ON $usertable.id = subscription.subscriber ".
-                     'WHERE subscription.subscribed = '.$this->profile_id);
-
-        $ni = array();
-
-        $notice = Notice::staticGet('id', $this->notice_id);
-
-        $author = Profile::staticGet('id', $notice->profile_id);
-
-        while ($user->fetch()) {
-            $inbox = Notice_inbox::pkeyGet(array('user_id' => $user->id,
-                                                 'notice_id' => $this->notice_id));
-
-            if (empty($inbox)) {
-                if (!$user->hasBlocked($author)) {
-                    $ni[$user->id] = NOTICE_INBOX_SOURCE_FORWARD;
-                }
-            } else {
-                $inbox->free();
-            }
-        }
-
-        $user->free();
-        $author->free();
-
-        unset($user);
-        unset($author);
-
-        Notice_inbox::bulkInsert($this->notice_id, $this->created, $ni);
-
-        return $ni;
-    }
-
-    function blowCache($ni)
-    {
-        $cache = common_memcache();
-
-        if (!empty($cache)) {
-            foreach ($ni as $id => $source) {
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id));
-                $cache->delete(common_cache_key('notice_inbox:by_user:'.$id.';last'));
-                $cache->delete(common_cache_key('notice_inbox:by_user_own:'.$id.';last'));
-            }
-        }
-    }
-}
diff --git a/plugins/Repeat/inboxnoticelist.php b/plugins/Repeat/inboxnoticelist.php
deleted file mode 100644
index 809fbe8af..000000000
--- a/plugins/Repeat/inboxnoticelist.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-class InboxNoticeList extends NoticeList
-{
-    var $owner = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner  = $owner;
-    }
-
-    function newListItem($notice)
-    {
-        return new InboxNoticeListItem($notice, $this->owner, $this->out);
-    }
-}
-
-class InboxNoticeListItem extends NoticeListItem
-{
-    var $owner = null;
-    var $ib    = null;
-
-    function __construct($notice, $owner, $out=null)
-    {
-        parent::__construct($notice, $out);
-        $this->owner = $owner;
-
-        $this->ib = Notice_inbox::pkeyGet(array('user_id' => $owner->id,
-                                                'notice_id' => $notice->id));
-    }
-
-    function showAuthor()
-    {
-        parent::showAuthor();
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-            $this->out->element('span', 'forward', _('Fwd'));
-        }
-    }
-
-    function showEnd()
-    {
-        if ($this->ib->source == NOTICE_INBOX_SOURCE_FORWARD) {
-
-            $forward = new Forward();
-
-            // FIXME: scary join!
-
-            $forward->query('SELECT profile_id '.
-                            'FROM forward JOIN subscription ON forward.profile_id = subscription.subscribed '.
-                            'WHERE subscription.subscriber = ' . $this->owner->id . ' '.
-                            'AND forward.notice_id = ' . $this->notice->id . ' '.
-                            'ORDER BY forward.created ');
-
-            $n = 0;
-
-            $firstForwarder = null;
-
-            while ($forward->fetch()) {
-                if (empty($firstForwarder)) {
-                    $firstForwarder = Profile::staticGet('id', $forward->profile_id);
-                }
-                $n++;
-            }
-
-            $forward->free();
-            unset($forward);
-
-            $this->out->elementStart('span', 'forwards');
-
-            $link = XMLStringer::estring('a', array('href' => $firstForwarder->profileurl),
-                                         $firstForwarder->nickname);
-
-            if ($n == 1) {
-                $this->out->raw(sprintf(_('Forwarded by %s'), $link));
-            } else {
-                // XXX: use that cool ngettext thing
-                $this->out->raw(sprintf(_('Forwarded by %s and %d other(s)'), $link, $n - 1));
-            }
-
-            $this->out->elementEnd('span');
-        }
-        parent::showEnd();
-    }
-}