summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--actions/forward.php2
-rw-r--r--js/util.js10
-rw-r--r--lib/forwardform.php147
-rw-r--r--lib/noticelist.php21
4 files changed, 176 insertions, 4 deletions
diff --git a/actions/forward.php b/actions/forward.php
index 87365c2d3..867ed97d2 100644
--- a/actions/forward.php
+++ b/actions/forward.php
@@ -72,7 +72,7 @@ class ForwardAction extends Action
return false;
}
- $token = $this->trimmed('token');
+ $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."));
diff --git a/js/util.js b/js/util.js
index ed6a781f7..67df73507 100644
--- a/js/util.js
+++ b/js/util.js
@@ -208,7 +208,7 @@ var SN = { // StatusNet
$('#'+form_id+' .form_response').remove();
var result;
if ($('#'+SN.C.S.Error, data).length > 0) {
- result = document._importNode($('p', data)[0], true);
+ result = document._importNode($('p', data)[0], true);
result = result.textContent || result.innerHTML;
form.append('<p class="form_response error">'+result+'</p>');
}
@@ -306,8 +306,12 @@ var SN = { // StatusNet
$('.form_disfavor').each(function() { SN.U.FormXHR($(this)); });
},
+ NoticeForward: function() {
+ $('.form_forward').each(function() { SN.U.FormXHR($(this)); });
+ },
+
NoticeAttachments: function() {
- $('.notice a.attachment').each(function() {
+ $('.notice a.attachment').each(function() {
SN.U.NoticeWithAttachment($(this).closest('.notice'));
});
},
@@ -439,7 +443,7 @@ var SN = { // StatusNet
Notices: function() {
if ($('body.user_in').length > 0) {
SN.U.NoticeFavor();
-
+ SN.U.NoticeForward();
SN.U.NoticeReply();
}
diff --git a/lib/forwardform.php b/lib/forwardform.php
new file mode 100644
index 000000000..2052856ae
--- /dev/null
+++ b/lib/forwardform.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Form for forwarding a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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 Form
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+ exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for forwarding a notice
+ *
+ * @category Form
+ * @package StatusNet
+ * @author Evan Prodromou <evan@status.net>
+ * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link http://status.net/
+ */
+
+class ForwardForm extends Form
+{
+ /**
+ * Notice to forward
+ */
+
+ var $notice = null;
+
+ /**
+ * Constructor
+ *
+ * @param HTMLOutputter $out output channel
+ * @param Notice $notice notice to forward
+ */
+
+ function __construct($out=null, $notice=null)
+ {
+ parent::__construct($out);
+
+ $this->notice = $notice;
+ }
+
+ /**
+ * ID of the form
+ *
+ * @return int ID of the form
+ */
+
+ function id()
+ {
+ return 'forward-' . $this->notice->id;
+ }
+
+ /**
+ * Action of the form
+ *
+ * @return string URL of the action
+ */
+
+ function action()
+ {
+ return common_local_url('forward');
+ }
+
+ /**
+ * Include a session token for CSRF protection
+ *
+ * @return void
+ */
+
+ function sessionToken()
+ {
+ $this->out->hidden('token-' . $this->notice->id,
+ common_session_token());
+ }
+
+ /**
+ * Legend of the Form
+ *
+ * @return void
+ */
+ function formLegend()
+ {
+ $this->out->element('legend', null, _('Forward this notice'));
+ }
+
+ /**
+ * Data elements
+ *
+ * @return void
+ */
+
+ function formData()
+ {
+ $this->out->hidden('notice-n'.$this->notice->id,
+ $this->notice->id,
+ 'notice');
+ }
+
+ /**
+ * Action elements
+ *
+ * @return void
+ */
+
+ function formActions()
+ {
+ $this->out->submit('forward-submit-' . $this->notice->id,
+ _('Forward'), 'submit', null, _('Forward this notice'));
+ }
+
+ /**
+ * Class of the form.
+ *
+ * @return string the form's class
+ */
+
+ function formClass()
+ {
+ return 'form_forward';
+ }
+}
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 21cec528f..b38860880 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -212,6 +212,7 @@ class NoticeListItem extends Widget
$this->out->elementStart('div', 'notice-options');
$this->showFaveForm();
$this->showReplyLink();
+ $this->showForwardForm();
$this->showDeleteLink();
$this->out->elementEnd('div');
}
@@ -531,6 +532,26 @@ class NoticeListItem extends Widget
}
/**
+ * show the form to forward a notice
+ *
+ * @return void
+ */
+
+ function showForwardForm()
+ {
+ $user = common_current_user();
+ if ($user) {
+ $profile = $user->getProfile();
+ if ($profile->hasForwarded($this->notice->id)) {
+ $this->out->text(_('Forwarded'));
+ } else {
+ $ff = new ForwardForm($this->out, $this->notice);
+ $ff->show();
+ }
+ }
+ }
+
+ /**
* if the user is the author, let them delete the notice
*
* @return void