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

fixes on bourdin for confirm claims

Browse Source 
darcs-hash:20080706090309-5a68a-188f45e295e43933595dadfa0c2cfa71b6573386.gz
This commit is contained in:
Evan Prodromou 2008-07-06 05:03:09 -04:00
parent 3f1f1427d9
commit b1903700d1
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Confirm_address.php
View File

@ -24,4 +24,6 @@ class Confirm_address extends DB_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function sequenceKey() { return array(false, false); }
} }

2
classes/Remember_me.php
View File

@ -19,4 +19,6 @@ class Remember_me extends DB_DataObject
/* the code above is auto generated do not remove the tag below */ /* the code above is auto generated do not remove the tag below */
###END_AUTOCODE ###END_AUTOCODE
function sequenceKey() { return array(false, false); }
} }

11
xmppdaemon.php
View File

@ -315,6 +315,7 @@ class XMPPDaemon {
function clear_old_claims() { function clear_old_claims() {
$qi = new Queue_item(); $qi = new Queue_item();
$qi->claimed = NULL;
$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); $qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$qi->update(DB_DATAOBJECT_WHEREADD_ONLY); $qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
} }
@ -347,7 +348,7 @@ class XMPPDaemon {
$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address); $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
# Mark confirmation sent # Mark confirmation sent
$original = clone($confirm); $original = clone($confirm);
$confirm->sent = DB_DataObject_Cast::dateTime(); $confirm->sent = $confirm->claimed;
$result = $confirm->update($original); $result = $confirm->update($original);
if (!$result) { if (!$result) {
$this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address); $this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
@ -362,17 +363,20 @@ class XMPPDaemon {
function next_confirm() { function next_confirm() {
$confirm = new Confirm_address(); $confirm = new Confirm_address();
$confirm->whereAdd('claimed IS NULL'); $confirm->whereAdd('claimed IS NULL');
$confirm->whereAdd('sent IS 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');
$confirm->limit(1); $confirm->limit(1);
if ($confirm->find(TRUE)) { if ($confirm->find(TRUE)) {
$this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address); $this->log(LOG_INFO, 'Claiming confirmation for ' . $confirm->address);
$original = clone($confirm); # working around some weird DB_DataObject behaviour
$confirm->whereAdd(''); # clears where stuff
$original = clone($confirm);
$confirm->claimed = DB_DataObject_Cast::dateTime(); $confirm->claimed = DB_DataObject_Cast::dateTime();
$result = $confirm->update($original); $result = $confirm->update($original);
if ($result) { if ($result) {
$this->log(LOG_INFO, 'Succeeded in claim!'); $this->log(LOG_INFO, 'Succeeded in claim! '. $result);
return $confirm; return $confirm;
} else { } else {
$this->log(LOG_INFO, 'Failed in claim!'); $this->log(LOG_INFO, 'Failed in claim!');
@ -384,6 +388,7 @@ class XMPPDaemon {
function clear_old_confirm_claims() { function clear_old_confirm_claims() {
$confirm = new Confirm(); $confirm = new Confirm();
$confirm->claimed = NULL;
$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT); $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY); $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
} }