Merge branch '1.1.x'

This commit is contained in:
Evan Prodromou 2012-07-06 10:47:00 -04:00
commit 0c6ca3ec41

View File

@ -23,7 +23,7 @@ define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
$shortoptions = 'fi::a';
$longoptions = array('id::', 'foreground', 'all');
$helptext = <<<END_OF_XMPP_HELP
$helptext = <<<END_OF_TWITTERDAEMON_HELP
Daemon script for receiving new notices from Twitter users.
-i --id Identity (default none)
@ -31,12 +31,10 @@ Daemon script for receiving new notices from Twitter users.
(requires Stomp queue handler, status_network setup)
-f --foreground Stay in the foreground (default background)
END_OF_XMPP_HELP;
END_OF_TWITTERDAEMON_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/jabber.php';
class TwitterDaemon extends SpawningDaemon
{
protected $allsites = false;