Merge remote-tracking branch 'upstream/master'

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

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 7caea1bb759f119ce6a84043dc6d7ed8a67fa83d..f7aa0f60f88088cf06857042cf424b3650263ccc 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -33,24 +33,15 @@ by the startdaemons script
 
 ENDOFHELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+// No unnecessary error reporting to avoid invalid daemon names
+error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
 
-$daemons = array();
-
-$daemons[] = INSTALLDIR.'/scripts/pluginqueuehandler.php';
-$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php';
-$daemons[] = INSTALLDIR.'/scripts/facebookqueuehandler.php';
-$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.php';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
-if(common_config('xmpp','enabled')) {
-    $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
-    $daemons[] = INSTALLDIR.'/scripts/jabberqueuehandler.php';
-    $daemons[] = INSTALLDIR.'/scripts/publicqueuehandler.php';
-    $daemons[] = INSTALLDIR.'/scripts/xmppconfirmhandler.php';
-}
+$daemons = array();
 
-if (common_config('sms', 'enabled')) {
-    $daemons[] = INSTALLDIR.'/scripts/smsqueuehandler.php';
+if (common_config('queue', 'daemon')) {
+    $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
 }
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {