Changing opacity to 1 only on the hovered notice item

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

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 2168aade29ba21523deaf9d9d0e2cdab5e8bd76d..b0fa22d438e6a66c0c3931e33965a739e4afe087 100755 (executable)
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -33,13 +33,16 @@ require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class PublicQueueHandler extends XmppQueueHandler {
+class PublicQueueHandler extends XmppQueueHandler
+{
     
-    function transport() {
+    function transport()
+    {
         return 'public';
     }
     
-    function handle_notice($notice) {
+    function handle_notice($notice)
+    {
         try {
             return jabber_public_notice($notice);
         } catch (XMPPHP_Exception $e) {
@@ -49,6 +52,13 @@ class PublicQueueHandler 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);