Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

[quix0rs-gnu-social.git] / scripts / xmppconfirmhandler.php

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index b059149bc9642b18b16f9747681e16358ff3a95b..7f39235fed8464f7e3847990c3976d75e7bd05b8 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -35,7 +35,8 @@ set_error_handler('common_error_handler');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler extends XmppQueueHandler {
+class XmppConfirmHandler extends XmppQueueHandler
+{
 
     var $_id = 'confirm';
     
@@ -110,7 +111,7 @@ class XmppConfirmHandler extends XmppQueueHandler {
         $confirm->address_type = 'jabber';
         $confirm->orderBy('modified DESC');
         $confirm->limit(1);
-        if ($confirm->find(TRUE)) {
+        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
@@ -139,6 +140,13 @@ class XmppConfirmHandler extends XmppQueueHandler {
     }
 }
 
+// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
+// lots of CPU trying to connect to unconfigured servers
+if (common_config('xmpp','enabled')==false) {
+    print "Aborting daemon - xmpp is disabled\n";
+    exit();
+}
+
 ini_set("max_execution_time", "0");
 ini_set("max_input_time", "0");
 set_time_limit(0);