Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 102 insertions, 97 deletions

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 8961b0b6e..2b8b085ce 100755
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -20,8 +20,8 @@
 
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
-	print "This script must be run from the command line\n";
-	exit();
+    print "This script must be run from the command line\n";
+    exit();
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
@@ -35,104 +35,109 @@ set_error_handler('common_error_handler');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler extends XmppQueueHandler {
+class XmppConfirmHandler extends XmppQueueHandler
+{
 
-	var $_id = 'confirm';
-	
-	function class_name() {
-		return 'XmppConfirmHandler';
-	}
-	
-	function run() {
-		if (!$this->start()) {
-			return false;
-		}
-		$this->log(LOG_INFO, 'checking for queued confirmations');
-		do {
-			$confirm = $this->next_confirm();
-			if ($confirm) {
-				$this->log(LOG_INFO, 'Sending confirmation for ' . $confirm->address);
-				$user = User::staticGet($confirm->user_id);
-				if (!$user) {
-					$this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id);
-					continue;
-				}
-				$success = jabber_confirm_address($confirm->code,
-												  $user->nickname,
-												  $confirm->address);
-				if (!$success) {
-					$this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
-					# Just let the claim age out; hopefully things work then
-					continue;
-				} else {
-					$this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
-					# Mark confirmation sent; need a dupe so we don't have the WHERE clause
-					$dupe = Confirm_address::staticGet('code', $confirm->code);
-					if (!$dupe) {
-						common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__);
-						continue;
-					}
-					$orig = clone($dupe);
-					$dupe->sent = $dupe->claimed;
-					$result = $dupe->update($orig);
-					if (!$result) {
-						common_log_db_error($dupe, 'UPDATE', __FILE__);
-						# Just let the claim age out; hopefully things work then
-						continue;
-					}
-					$dupe->free();
-					unset($dupe);
-				}
-				$user->free();
-				unset($user);
-				$confirm->free();
-				unset($confirm);
-				$this->idle(0);
-			} else {
-#				$this->clear_old_confirm_claims();
-				$this->idle(10);
-			}
-		} while (true);
-		if (!$this->finish()) {
-			return false;
-		}
-		return true;
-	}
+    var $_id = 'confirm';
+    
+    function class_name()
+    {
+        return 'XmppConfirmHandler';
+    }
+    
+    function run()
+    {
+        if (!$this->start()) {
+            return false;
+        }
+        $this->log(LOG_INFO, 'checking for queued confirmations');
+        do {
+            $confirm = $this->next_confirm();
+            if ($confirm) {
+                $this->log(LOG_INFO, 'Sending confirmation for ' . $confirm->address);
+                $user = User::staticGet($confirm->user_id);
+                if (!$user) {
+                    $this->log(LOG_WARNING, 'Confirmation for unknown user ' . $confirm->user_id);
+                    continue;
+                }
+                $success = jabber_confirm_address($confirm->code,
+                                                  $user->nickname,
+                                                  $confirm->address);
+                if (!$success) {
+                    $this->log(LOG_ERR, 'Confirmation failed for ' . $confirm->address);
+                    # Just let the claim age out; hopefully things work then
+                    continue;
+                } else {
+                    $this->log(LOG_INFO, 'Confirmation sent for ' . $confirm->address);
+                    # Mark confirmation sent; need a dupe so we don't have the WHERE clause
+                    $dupe = Confirm_address::staticGet('code', $confirm->code);
+                    if (!$dupe) {
+                        common_log(LOG_WARNING, 'Could not refetch confirm', __FILE__);
+                        continue;
+                    }
+                    $orig = clone($dupe);
+                    $dupe->sent = $dupe->claimed;
+                    $result = $dupe->update($orig);
+                    if (!$result) {
+                        common_log_db_error($dupe, 'UPDATE', __FILE__);
+                        # Just let the claim age out; hopefully things work then
+                        continue;
+                    }
+                    $dupe->free();
+                    unset($dupe);
+                }
+                $user->free();
+                unset($user);
+                $confirm->free();
+                unset($confirm);
+                $this->idle(0);
+            } else {
+#                $this->clear_old_confirm_claims();
+                $this->idle(10);
+            }
+        } while (true);
+        if (!$this->finish()) {
+            return false;
+        }
+        return true;
+    }
 
-	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);
-		        # working around some weird DB_DataObject behaviour
-			$confirm->whereAdd(''); # clears where stuff
-			$original = clone($confirm);
-			$confirm->claimed = common_sql_now();
-			$result = $confirm->update($original);
-			if ($result) {
-				$this->log(LOG_INFO, 'Succeeded in claim! '. $result);
-				return $confirm;
-			} else {
-				$this->log(LOG_INFO, 'Failed in claim!');
-				return false;
-			}
-		}
-		return NULL;
-	}
+    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);
+                # working around some weird DB_DataObject behaviour
+            $confirm->whereAdd(''); # clears where stuff
+            $original = clone($confirm);
+            $confirm->claimed = common_sql_now();
+            $result = $confirm->update($original);
+            if ($result) {
+                $this->log(LOG_INFO, 'Succeeded in claim! '. $result);
+                return $confirm;
+            } else {
+                $this->log(LOG_INFO, 'Failed in claim!');
+                return false;
+            }
+        }
+        return null;
+    }
 
-	function clear_old_confirm_claims() {
-		$confirm = new Confirm();
-		$confirm->claimed = NULL;
-		$confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
-		$confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
-		$confirm->free();
-		unset($confirm);
-	}
+    function clear_old_confirm_claims()
+    {
+        $confirm = new Confirm();
+        $confirm->claimed = null;
+        $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
+        $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
+        $confirm->free();
+        unset($confirm);
+    }
 }
 
 ini_set("max_execution_time", "0");