X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fgetvaliddaemons.php;h=448fbb6d32cceb9282804fa6a162a66893a23aa2;hb=c285f80b1830cffd20a28c693d74c59f8c3c39f6;hp=99ad41b37471aae803949c025a87b7619087bf14;hpb=5f5413624d166a9b2116d266c7698dd6dcd2d8c4;p=quix0rs-gnu-social.git diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php index 99ad41b374..448fbb6d32 100755 --- a/scripts/getvaliddaemons.php +++ b/scripts/getvaliddaemons.php @@ -33,23 +33,15 @@ 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'; $daemons = array(); -$daemons[] = INSTALLDIR.'/scripts/pluginqueuehandler.php'; -$daemons[] = INSTALLDIR.'/scripts/ombqueuehandler.php'; -$daemons[] = INSTALLDIR.'/scripts/pingqueuehandler.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'; -} - -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))) {