wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correct use of $user to $this->user

Browse Source 
darcs-hash:20081004170342-5ed1f-f4b4656d765c67cf95ca3a9193ff64e3220c1526.gz
This commit is contained in:
Evan Prodromou 2008-10-04 13:03:42 -04:00
parent bdeba50c34
commit 46b96887e6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Command.php
View File

@ -190,19 +190,19 @@ class MessageCommand extends Command {
$channel->error($this->user, _('No content!')); $channel->error($this->user, _('No content!'));
return; return;
} else if ($len > 140) { } else if ($len > 140) {
$channel->error($this->user,sprintf(_('Message too long - maximum is 140 characters, you sent %d'), $len)); $channel->error($this->user, sprintf(_('Message too long - maximum is 140 characters, you sent %d'), $len));
return; return;
} else if (!$other) { } else if (!$other) {
$channel->error($this->user, _('No such user.')); $channel->error($this->user, _('No such user.'));
return; return;
} else if (!$user->mutuallySubscribed($other)) { } else if (!$this->user->mutuallySubscribed($other)) {
$channel->error($this->user, _('You can\'t send a message to this user.')); $channel->error($this->user, _('You can\'t send a message to this user.'));
return; return;
} else if ($user->id == $other->id) { } else if ($this->user->id == $other->id) {
$channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.')); $channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.'));
return; return;
} }
$message = Message::saveNew($user->id, $other->id, $body, 'xmpp'); $message = Message::saveNew($this->user->id, $other->id, $body, 'xmpp');
if ($message) { if ($message) {
$channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other)); $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other));
} else { } else {
@ -254,7 +254,7 @@ class SubCommand extends Command {
return; return;
} }
$result = subs_subscribe_user($user, $this->other); $result = subs_subscribe_user($this->user, $this->other);
if ($result == 'true') { if ($result == 'true') {
$channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other)); $channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
@ -279,7 +279,7 @@ class UnsubCommand extends Command {
return; return;
} }
$result=subs_unsubscribe_user($user, $this->other); $result=subs_unsubscribe_user($this->user, $this->other);
if ($result) { if ($result) {
$channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other)); $channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));