Merge branch '0.9.x' into tinymce

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

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index 8f48e8e6f04019a105771e6a2232345af4338d36..a332e06b58bc3d270226c08976677d7b405b5f19 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -35,20 +35,17 @@ ENDOFHELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
+$daemons = array();
+
+$daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
+
 if(common_config('xmpp','enabled')) {
-    echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
-    echo "xmppconfirmhandler.php ";
-}
-if(common_config('twitterbridge','enabled')) {
-    echo "twitterstatusfetcher.php ";
+    $daemons[] = INSTALLDIR.'/scripts/xmppdaemon.php';
 }
-echo "ombqueuehandler.php ";
-if (common_config('twitter', 'enabled')) {
-    echo "twitterqueuehandler.php ";
-    echo "synctwitterfriends.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";
 }