Merge branch 'cas-user-whitelist' into 'nightly'

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

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 7fffac783b8ae67f6f7183911e9c1d84aed072e0..448fbb6d32cceb9282804fa6a162a66893a23aa2 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -33,23 +33,20 @@ by the startdaemons script
 
 ENDOFHELP;
 
+// No unnecessary error reporting to avoid invalid daemon names
+error_reporting(E_ALL & ~E_STRICT & ~E_NOTICE);
+
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-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 ";
+$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";
 }
-?>