GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make the newmessage page better with new framework

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-26 14:05:59 +01:00
parent 80e04a8d9f
commit 3e0e7ddb2c
1 changed files with 66 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
actions/newmessage.php
View File

@ -54,6 +54,10 @@ class NewmessageAction extends Action
var $msg = null; var $msg = null;
var $content = null;
var $to = null;
var $other = null;
/** /**
* Title of the page * Title of the page
* *
@ -88,11 +92,35 @@ class NewmessageAction extends Action
} }
} }
function prepare($args)
{
parent::prepare($args);
$user = common_current_user();
$this->content = $this->trimmed('content');
$this->to = $this->trimmed('to');
if ($this->to) {
$this->other = User::staticGet('id', $this->to);
if (!$this->other) {
$this->clientError(_('No such user'), 404);
return false;
}
if (!$user->mutuallySubscribed($this->other)) {
$this->clientError(_('You can\'t send a message to this user.'), 404);
return false;
}
}
return true;
}
function saveNewMessage() function saveNewMessage()
{ {
$user = common_current_user();
assert($user); // XXX: maybe an error instead...
// CSRF protection // CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
@ -102,48 +130,42 @@ class NewmessageAction extends Action
return; return;
} }
$content = $this->trimmed('content'); $user = common_current_user();
$to = $this->trimmed('to'); assert($user); // XXX: maybe an error instead...
if (!$content) { if (!$this->content) {
$this->showForm(_('No content!')); $this->showForm(_('No content!'));
return; return;
} else { } else {
$content_shortened = common_shorten_links($content); $content_shortened = common_shorten_links($this->content);
if (mb_strlen($content_shortened) > 140) { if (mb_strlen($content_shortened) > 140) {
common_debug("Content = '$content_shortened'", __FILE__);
common_debug("mb_strlen(\$content) = " .
mb_strlen($content_shortened),
__FILE__);
$this->showForm(_('That\'s too long. ' . $this->showForm(_('That\'s too long. ' .
'Max message size is 140 chars.')); 'Max message size is 140 chars.'));
return; return;
} }
} }
$other = User::staticGet('id', $to); if (!$this->other) {
if (!$other) {
$this->showForm(_('No recipient specified.')); $this->showForm(_('No recipient specified.'));
return; return;
} else if (!$user->mutuallySubscribed($other)) { } else if (!$user->mutuallySubscribed($this->other)) {
$this->clientError(_('You can\'t send a message to this user.'), 404); $this->clientError(_('You can\'t send a message to this user.'), 404);
return; return;
} else if ($user->id == $other->id) { } else if ($user->id == $this->other->id) {
$this->clientError(_('Don\'t send a message to yourself; ' . $this->clientError(_('Don\'t send a message to yourself; ' .
'just say it to yourself quietly instead.'), 403); 'just say it to yourself quietly instead.'), 403);
return; return;
} }
$message = Message::saveNew($user->id, $other->id, $content, 'web'); $message = Message::saveNew($user->id, $this->other->id, $this->content, 'web');
if (is_string($message)) { if (is_string($message)) {
$this->showForm($message); $this->showForm($message);
return; return;
} }
$this->notify($user, $other, $message); $this->notify($user, $this->other, $message);
$url = common_local_url('outbox', array('nickname' => $user->nickname)); $url = common_local_url('outbox', array('nickname' => $user->nickname));
@ -152,32 +174,16 @@ class NewmessageAction extends Action
function showForm($msg = null) function showForm($msg = null)
{ {
$content = $this->trimmed('content');
$user = common_current_user();
$to = $this->trimmed('to');
$other = User::staticGet('id', $to);
if (!$other) {
$this->clientError(_('No such user'), 404);
return;
}
if (!$user->mutuallySubscribed($other)) {
$this->clientError(_('You can\'t send a message to this user.'), 404);
return;
}
$this->msg = $msg; $this->msg = $msg;
$this->showPage(); $this->showPage();
} }
function showContent() function showPageNotice()
{ {
$message_form = new MessageForm($this); if ($this->msg) {
$message_form->show(); $this->element('p', 'error', $this->msg);
}
} }
function notify($from, $to, $message) function notify($from, $to, $message)
@ -185,4 +191,12 @@ class NewmessageAction extends Action
mail_notify_message($message, $from, $to); mail_notify_message($message, $from, $to);
// XXX: Jabber, SMS notifications... probably queued // XXX: Jabber, SMS notifications... probably queued
} }
// Do nothing (override)
function showNoticeForm()
{
$message_form = new MessageForm($this);
$message_form->show();
}
} }