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

Handle the case where confirmation is cancelled

Browse Source
This commit is contained in:
Luke Fitzgerald 2010-07-24 07:54:09 -07:00
parent be0fb03560
commit 9f0eea69ff
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/Irc/extlib/phergie/Phergie/Plugin/Statusnet.php
View File

@ -95,11 +95,11 @@ class Phergie_Plugin_Statusnet extends Phergie_Plugin_Abstract {
if ($event->getNick() == 'NickServ') {
$message = $event->getArgument(1);
if (preg_match($this->unregRegexp, $message, $groups)) {
$nick = $groups[1];
call_user_func($this->regCallback, array('nick' => $nick, 'registered' => false));
$screenname = $groups[1];
call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => false));
} elseif (preg_match($this->regRegexp, $message, $groups)) {
$nick = $groups[1];
call_user_func($this->regCallback, array('nick' => $nick, 'registered' => true));
$screenname = $groups[1];
call_user_func($this->regCallback, array('screenname' => $screenname, 'registered' => true));
}
}
}

63
plugins/Irc/ircmanager.php
View File

@ -151,36 +151,40 @@ class IrcManager extends ImManager {
*/
public function handle_reg_response($data) {
// Retrieve data
$nickdata = $this->regchecks[$data['nick']];
$screenname = $data['screenname'];
$nickdata = $this->regchecks[$screenname];
$usernick = $nickdata['user']->nickname;
if ($data['registered']) {
// Send message
$this->plugin->send_confirmation_code($nickdata['screenname'], $nickdata['code'], $nickdata['user'], true);
} else {
$this->plugin->send_message($nickdata['screenname'], _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
if (isset($this->regchecksLookup[$usernick])) {
if ($data['registered']) {
// Send message
$this->plugin->send_confirmation_code($screenname, $nickdata['code'], $nickdata['user'], true);
} else {
$this->plugin->send_message($screenname, _m('Your nickname is not registered so IRC connectivity cannot be enabled'));
$confirm = new Confirm_address();
$confirm = new Confirm_address();
$confirm->user_id = $user->id;
$confirm->address_type = $this->plugin->transport;
$confirm->user_id = $user->id;
$confirm->address_type = $this->plugin->transport;
if ($confirm->find(true)) {
$result = $confirm->delete();
if ($confirm->find(true)) {
$result = $confirm->delete();
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
// TRANS: Server error thrown on database error canceling IM address confirmation.
$this->serverError(_('Couldn\'t delete confirmation.'));
return;
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
// TRANS: Server error thrown on database error canceling IM address confirmation.
$this->serverError(_('Couldn\'t delete confirmation.'));
return;
}
}
}
// Unset lookup value
unset($this->regchecksLookup[$usernick]);
// Unset data
unset($this->regchecks[$screename]);
}
// Unset lookup value
unset($this->regchecksLookup[$nickdata['screenname']]);
// Unset data
unset($this->regchecks[$data['nick']]);
}
/**
@ -194,14 +198,20 @@ class IrcManager extends ImManager {
if (!$this->conn) {
return false;
}
if ($data['type'] != 'message') {
// Nick checking
$screenname = $data['nickdata']['screenname'];
if (isset($this->regchecksLookup[$user->nickname])) {
$nickdata = $data['nickdata'];
$usernick = $nickdata['user']->nickname;
$screenname = $nickdata['screenname'];
// Cancel any existing checks for this user
if (isset($this->regchecksLookup[$usernick])) {
unset($this->regchecks[$this->regchecksLookup[$usernick]]);
}
$this->regchecks[$screenname] = $data['nickdata'];
$this->regchecksLookup[$user->nickname] = $screenname;
$this->regchecks[$screenname] = $nickdata;
$this->regchecksLookup[$usernick] = $screenname;
}
try {
@ -210,6 +220,7 @@ class IrcManager extends ImManager {
$this->conn->reconnect();
return false;
}
return true;
}
}