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

confirmation code sent by web user, not xmppdaemon

Browse Source 
darcs-hash:20080626073530-34904-e56c156737db036b0de4bd6e396833bf044cb865.gz
This commit is contained in:
Evan Prodromou 2008-06-26 03:35:30 -04:00
parent 06d267bd88
commit cdcfdc8cb4
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/jabber.php
View File

@ -79,12 +79,21 @@ function jabber_send_presence($status=Null, $show='available', $to=Null) {
function jabber_confirm_address($code, $nickname, $address) {
# FIXME: above arguments are unused, we start the process with a
# subscription
# XXX: no idea what we do if the update daemon is already subscribed.
# Fire off a subscription, just in case
jabber_special_presence('subscribe', $address);
# Hopefully this goes through if we're not already subscribed
$body = 'User "' . $nickname . '" on ' . common_config('site', 'name') .
'has said that your Jabber ID belongs to them. ' .
'If that\'s true, you can confirm by clicking on this URL: ' .
common_local_url('confirmaddress', array('code' => $confirm->code)) .
' . (If you cannot click it, copy-and-paste it into the ' .
'address bar of your browser). If that user isn\'t you, ' .
'or if you didn\'t request this confirmation, just ignore this message.';
jabber_send_message($address, $body);
}
function jabber_special_presence($type, $to=NULL, $show=NULL, $status=NULL) {

18
xmppdaemon.php
View File

@ -162,13 +162,6 @@ class XMPPDaemon {
$this->subscribed($from);
break;
case 'subscribed':
# Are we trying to confirm this address?
$confirm = Confirm_address::staticGet('address', $from);
if ($confirm) {
$this->send_confirmation_code($from, $confirm);
}
# Otherwise, silently ignore
break;
case 'unsubscribe':
case 'unsubscribed':
# XXX: do we care?
@ -217,17 +210,6 @@ class XMPPDaemon {
$this->conn->send($out);
}
function send_confirmation_code($to, &$confirm) {
$body = 'Someone has asked to add this Jabber ID to their ' .
'account on ' . common_config('site', 'name') . '. ' .
'If it was you, you can confirm by clicking on this URL: ' .
common_local_url('confirmaddress', array('code' => $confirm->code)) .
' . (If you cannot click it, copy-and-paste it into the ' .
'address bar of your browser). If it wasn\'t you, ' .
'just ignore this message.';
$this->conn->message($to, $body);
}
}
$daemon = new XMPPDaemon();