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

debugging on the live server 

darcs-hash:20080706061437-5a68a-734b7f7b7966e8091f1c6df3abaf10bed9b0f0f8.gz
This commit is contained in:
Evan Prodromou 2008-07-06 02:14:37 -04:00
parent 62db03d31f
commit 973831002a
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xmppdaemon.php
View File

@ -95,7 +95,7 @@ class XMPPDaemon {
} }
$this->broadcast_queue(); $this->broadcast_queue();
$this->confirmation_queue(); # $this->confirmation_queue();
} }
} }
@ -325,7 +325,7 @@ class XMPPDaemon {
} }
function confirmation_queue() { function confirmation_queue() {
$this->clear_old_confirm_claims(); # $this->clear_old_confirm_claims();
$this->log(LOG_INFO, 'checking for queued confirmations'); $this->log(LOG_INFO, 'checking for queued confirmations');
do { do {
$confirm = $this->next_confirm(); $confirm = $this->next_confirm();
@ -336,10 +336,9 @@ class XMPPDaemon {
$this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id); $this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id);
continue; continue;
} }
$success = jabber_confirm_address($confirm->code, $success = jabber_confirm_address($confirm->code,
$user->nickname, $user->nickname,
$jabber); $confirm->address);
if (!$success) { if (!$success) {
$this->log(LOG_ERROR, 'Confirmation failed for ' . $confirm->address); $this->log(LOG_ERROR, 'Confirmation failed for ' . $confirm->address);
# Just let the claim age out; hopefully things work then # Just let the claim age out; hopefully things work then
@ -362,8 +361,7 @@ class XMPPDaemon {
function next_confirm() { function next_confirm() {
$confirm = new Confirm_address(); $confirm = new Confirm_address();
$confirm->sent = NULL; $confirm->whereAdd('claimed IS NULL');
$confirm->claimed = NULL;
# XXX: eventually we could do other confirmations in the queue, too # XXX: eventually we could do other confirmations in the queue, too
$confirm->address_type = 'jabber'; $confirm->address_type = 'jabber';
$confirm->orderBy('modified DESC'); $confirm->orderBy('modified DESC');