Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / TwitterBridge / daemons / twitterdaemon.php

diff --git a/plugins/TwitterBridge/daemons/twitterdaemon.php b/plugins/TwitterBridge/daemons/twitterdaemon.php
index 9e218a1a1cbca07e65539fde1188dd446b452057..e563f534934ce2a4ce09c8eeaa99079a95b53e51 100644 (file)
--- a/plugins/TwitterBridge/daemons/twitterdaemon.php
+++ b/plugins/TwitterBridge/daemons/twitterdaemon.php
@@ -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,11 +31,9 @@ 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';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 class TwitterDaemon extends SpawningDaemon
 {
@@ -98,8 +96,8 @@ class TwitterManager extends IoManager
     const USERS_PER_STREAM = 100;
     const STREAMS_PER_SECOND = 20;
 
-    protected $twitterStreams;
-    protected $twitterUsers;
+    protected $streams;
+    protected $users;
 
     /**
      * Pull the site's active Twitter-importing users and start spawning