fixes on bourdin for confirm claims0.4.2

darcs-hash:20080706090309-5a68a-188f45e295e43933595dadfa0c2cfa71b6573386.gz

3 files changed, 12 insertions, 3 deletions

diff --git a/classes/Confirm_address.php b/classes/Confirm_address.php
index 80dc94621..d6d0d7796 100644
--- a/classes/Confirm_address.php
+++ b/classes/Confirm_address.php
@@ -24,4 +24,6 @@ class Confirm_address extends DB_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+	
+    function sequenceKey() { return array(false, false); }
 }
diff --git a/classes/Remember_me.php b/classes/Remember_me.php
index fd21c2fce..92a1e4617 100644
--- a/classes/Remember_me.php
+++ b/classes/Remember_me.php
@@ -19,4 +19,6 @@ class Remember_me extends DB_DataObject
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
+	
+    function sequenceKey() { return array(false, false); }
 }
diff --git a/xmppdaemon.php b/xmppdaemon.php
index e5c5c20af..85810fdbf 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -315,6 +315,7 @@ class XMPPDaemon {
 
 	function clear_old_claims() {
 		$qi = new Queue_item();
+	        $qi->claimed = NULL;
 		$qi->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
 		$qi->update(DB_DATAOBJECT_WHEREADD_ONLY);
 	}
@@ -347,7 +348,7 @@ class XMPPDaemon {
 					$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
 					# Mark confirmation sent
 					$original = clone($confirm);
-					$confirm->sent = DB_DataObject_Cast::dateTime();
+					$confirm->sent = $confirm->claimed;
 					$result = $confirm->update($original);
 					if (!$result) {
 						$this->log(LOG_ERROR, 'Cannot mark sent for ' . $confirm->address);
@@ -362,17 +363,20 @@ class XMPPDaemon {
 	function next_confirm() {
 		$confirm = new Confirm_address();
 		$confirm->whereAdd('claimed IS NULL');
+		$confirm->whereAdd('sent IS NULL');
 		# XXX: eventually we could do other confirmations in the queue, too
 		$confirm->address_type = 'jabber';
 		$confirm->orderBy('modified DESC');
 		$confirm->limit(1);
 		if ($confirm->find(TRUE)) {
 			$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();
 			$result = $confirm->update($original);
 			if ($result) {
-				$this->log(LOG_INFO, 'Succeeded in claim!');
+				$this->log(LOG_INFO, 'Succeeded in claim! '. $result);
 				return $confirm;
 			} else {
 				$this->log(LOG_INFO, 'Failed in claim!');
@@ -384,6 +388,7 @@ class XMPPDaemon {
 	
 	function clear_old_confirm_claims() {
 		$confirm = new Confirm();
+	        $confirm->claimed = NULL;
 		$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
 		$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
 	}