]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
move forwarding stuff to Repeat plugin
authorEvan Prodromou <evan@status.net>
Thu, 10 Dec 2009 18:31:16 +0000 (13:31 -0500)
committerEvan Prodromou <evan@status.net>
Thu, 10 Dec 2009 18:31:16 +0000 (13:31 -0500)
actions/forward.php [deleted file]
classes/Forward.php [deleted file]
plugins/Repeat/Forward.php [new file with mode: 0644]
plugins/Repeat/forward.php [new file with mode: 0644]

diff --git a/actions/forward.php b/actions/forward.php
deleted file mode 100644 (file)
index 194833f..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * Forward action.
- *
- * PHP version 5
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- *
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 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);
-}
-
-/**
- * Forward action
- *
- * @category Action
- * @package  StatusNet
- * @author   Evan Prodromou <evan@status.net>
- * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
- * @link     http://status.net/
- */
-
-class ForwardAction extends Action
-{
-    var $user = null;
-    var $notice = null;
-
-    function prepare($args)
-    {
-        parent::prepare($args);
-
-        $this->user = common_current_user();
-
-        if (empty($this->user)) {
-            $this->clientError(_("Only logged-in users can forward notices."));
-            return false;
-        }
-
-        $id = $this->trimmed('notice');
-
-        if (empty($id)) {
-            $this->clientError(_("No notice specified."));
-            return false;
-        }
-
-        $this->notice = Notice::staticGet('id', $id);
-
-        if (empty($this->notice)) {
-            $this->clientError(_("No notice specified."));
-            return false;
-        }
-
-        if ($this->user->id == $this->notice->profile_id) {
-            $this->clientError(_("You can't forward your own notice."));
-            return false;
-        }
-
-        $token  = $this->trimmed('token-'.$id);
-
-        if (empty($token) || $token != common_session_token()) {
-            $this->clientError(_("There was a problem with your session token. Try again, please."));
-            return false;
-        }
-
-        $profile = $this->user->getProfile();
-
-        if ($profile->hasForwarded($id)) {
-            $this->clientError(_("You already forwarded that notice."));
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Class handler.
-     *
-     * @param array $args query arguments
-     *
-     * @return void
-     */
-
-    function handle($args)
-    {
-        $forward = Forward::saveNew($this->user->id, $this->notice->id);
-
-        if ($this->boolean('ajax')) {
-            $this->startHTML('text/xml;charset=utf-8');
-            $this->elementStart('head');
-            $this->element('title', null, _('Forwarded'));
-            $this->elementEnd('head');
-            $this->elementStart('body');
-            $this->element('p', array('id' => 'forward_response'), _('Forwarded!'));
-            $this->elementEnd('body');
-            $this->elementEnd('html');
-        } else {
-            // FIXME!
-        }
-    }
-}
diff --git a/classes/Forward.php b/classes/Forward.php
deleted file mode 100644 (file)
index 09b2d6a..0000000
+++ /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/Forward.php b/plugins/Repeat/Forward.php
new file mode 100644 (file)
index 0000000..09b2d6a
--- /dev/null
@@ -0,0 +1,127 @@
+<?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/forward.php b/plugins/Repeat/forward.php
new file mode 100644 (file)
index 0000000..194833f
--- /dev/null
@@ -0,0 +1,122 @@
+<?php
+
+/**
+ * Forward action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 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);
+}
+
+/**
+ * Forward action
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ */
+
+class ForwardAction extends Action
+{
+    var $user = null;
+    var $notice = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user = common_current_user();
+
+        if (empty($this->user)) {
+            $this->clientError(_("Only logged-in users can forward notices."));
+            return false;
+        }
+
+        $id = $this->trimmed('notice');
+
+        if (empty($id)) {
+            $this->clientError(_("No notice specified."));
+            return false;
+        }
+
+        $this->notice = Notice::staticGet('id', $id);
+
+        if (empty($this->notice)) {
+            $this->clientError(_("No notice specified."));
+            return false;
+        }
+
+        if ($this->user->id == $this->notice->profile_id) {
+            $this->clientError(_("You can't forward your own notice."));
+            return false;
+        }
+
+        $token  = $this->trimmed('token-'.$id);
+
+        if (empty($token) || $token != common_session_token()) {
+            $this->clientError(_("There was a problem with your session token. Try again, please."));
+            return false;
+        }
+
+        $profile = $this->user->getProfile();
+
+        if ($profile->hasForwarded($id)) {
+            $this->clientError(_("You already forwarded that notice."));
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Class handler.
+     *
+     * @param array $args query arguments
+     *
+     * @return void
+     */
+
+    function handle($args)
+    {
+        $forward = Forward::saveNew($this->user->id, $this->notice->id);
+
+        if ($this->boolean('ajax')) {
+            $this->startHTML('text/xml;charset=utf-8');
+            $this->elementStart('head');
+            $this->element('title', null, _('Forwarded'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->element('p', array('id' => 'forward_response'), _('Forwarded!'));
+            $this->elementEnd('body');
+            $this->elementEnd('html');
+        } else {
+            // FIXME!
+        }
+    }
+}