Using lowercase for form action 'post'

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

diff --git a/scripts/xmppconfirmhandler.php b/scripts/xmppconfirmhandler.php
index 454616ca09bc42cec2ac862a49c43e8b77cdc371..7f39235fed8464f7e3847990c3976d75e7bd05b8 100755 (executable)
--- a/scripts/xmppconfirmhandler.php
+++ b/scripts/xmppconfirmhandler.php
@@ -35,15 +35,18 @@ set_error_handler('common_error_handler');
 
 define('CLAIM_TIMEOUT', 1200);
 
-class XmppConfirmHandler extends XmppQueueHandler {
+class XmppConfirmHandler extends XmppQueueHandler
+{
 
     var $_id = 'confirm';
     
-    function class_name() {
+    function class_name()
+    {
         return 'XmppConfirmHandler';
     }
     
-    function run() {
+    function run()
+    {
         if (!$this->start()) {
             return false;
         }
@@ -99,15 +102,16 @@ class XmppConfirmHandler extends XmppQueueHandler {
         return true;
     }
 
-    function next_confirm() {
+    function next_confirm()
+    {
         $confirm = new Confirm_address();
-        $confirm->whereAdd('claimed IS NULL');
-        $confirm->whereAdd('sent IS NULL');
+        $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)) {
+        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
@@ -122,12 +126,13 @@ class XmppConfirmHandler extends XmppQueueHandler {
                 return false;
             }
         }
-        return NULL;
+        return null;
     }
 
-    function clear_old_confirm_claims() {
+    function clear_old_confirm_claims()
+    {
         $confirm = new Confirm();
-        $confirm->claimed = NULL;
+        $confirm->claimed = null;
         $confirm->whereAdd('now() - claimed > '.CLAIM_TIMEOUT);
         $confirm->update(DB_DATAOBJECT_WHEREADD_ONLY);
         $confirm->free();
@@ -135,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);