Merge remote-tracking branch 'upstream/master'

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

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 8f48e8e6f04019a105771e6a2232345af4338d36..f7aa0f60f88088cf06857042cf424b3650263ccc 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -33,22 +33,20 @@ 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);
 
-if(common_config('xmpp','enabled')) {
-    echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
-    echo "xmppconfirmhandler.php ";
-}
-if(common_config('twitterbridge','enabled')) {
-    echo "twitterstatusfetcher.php ";
-}
-echo "ombqueuehandler.php ";
-if (common_config('twitter', 'enabled')) {
-    echo "twitterqueuehandler.php ";
-    echo "synctwitterfriends.php ";
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
+
+$daemons = array();
+
+if (common_config('queue', 'daemon')) {
+    $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
 }
-echo "facebookqueuehandler.php ";
-echo "pingqueuehandler.php ";
-if (common_config('sms', 'enabled')) {
-    echo "smsqueuehandler.php ";
+
+if (Event::handle('GetValidDaemons', array(&$daemons))) {
+    foreach ($daemons as $daemon) {
+        print $daemon . ' ';
+    }
+    print "\n";
 }