Moved the rest of the Twitter stuff into the TwitterBridge plugin

This commit is contained in:
Zach Copley 2009-08-26 00:59:06 +00:00
parent 9b9d80cd97
commit 5efe588174
8 changed files with 13 additions and 11 deletions

View File

@ -409,7 +409,6 @@ require_once INSTALLDIR.'/lib/theme.php';
require_once INSTALLDIR.'/lib/mail.php'; require_once INSTALLDIR.'/lib/mail.php';
require_once INSTALLDIR.'/lib/subs.php'; require_once INSTALLDIR.'/lib/subs.php';
require_once INSTALLDIR.'/lib/Shorturl_api.php'; require_once INSTALLDIR.'/lib/Shorturl_api.php';
require_once INSTALLDIR.'/lib/twitter.php';
require_once INSTALLDIR.'/lib/clientexception.php'; require_once INSTALLDIR.'/lib/clientexception.php';
require_once INSTALLDIR.'/lib/serverexception.php'; require_once INSTALLDIR.'/lib/serverexception.php';

View File

@ -90,7 +90,7 @@ class TwitterBridgePlugin extends Plugin
require_once(INSTALLDIR.'/plugins/TwitterBridge/' . strtolower(mb_substr($cls, 0, -6)) . '.php'); require_once(INSTALLDIR.'/plugins/TwitterBridge/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
return false; return false;
case 'TwitterOAuthClient': case 'TwitterOAuthClient':
require_once(INSTALLDIR.'/plugins/TwitterBridge/twitteroAuthclient.php'); require_once(INSTALLDIR.'/plugins/TwitterBridge/twitteroauthclient.php');
return false; return false;
default: default:
return true; return true;

View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
$shortoptions = 'di::'; $shortoptions = 'di::';
$longoptions = array('id::', 'debug'); $longoptions = array('id::', 'debug');
@ -32,6 +32,7 @@ END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/parallelizingdaemon.php'; require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/** /**
* Daemon to sync local friends with Twitter friends * Daemon to sync local friends with Twitter friends

View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
$shortoptions = 'i::'; $shortoptions = 'i::';
$longoptions = array('id::'); $longoptions = array('id::');
@ -30,10 +30,9 @@ Daemon script for pushing new notices to Twitter.
END_OF_ENJIT_HELP; END_OF_ENJIT_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/twitter.php';
require_once INSTALLDIR . '/lib/queuehandler.php'; require_once INSTALLDIR . '/lib/queuehandler.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
class TwitterQueueHandler extends QueueHandler class TwitterQueueHandler extends QueueHandler
{ {

View File

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
// Tune number of processes and how often to poll Twitter // Tune number of processes and how often to poll Twitter
// XXX: Should these things be in config.php? // XXX: Should these things be in config.php?
@ -36,8 +36,9 @@ Batch script for retrieving Twitter messages from foreign service.
END_OF_TRIM_HELP; END_OF_TRIM_HELP;
require_once INSTALLDIR .'/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/daemon.php'; require_once INSTALLDIR . '/lib/daemon.php';
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/** /**
* Fetcher for statuses from Twitter * Fetcher for statuses from Twitter

View File

@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/** /**
* Class for doing OAuth authentication against Twitter * Class for doing OAuth authentication against Twitter
* *

View File

@ -31,8 +31,8 @@ if (!defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR.'/lib/connectsettingsaction.php'; require_once INSTALLDIR . '/lib/connectsettingsaction.php';
require_once INSTALLDIR.'/lib/twitter.php'; require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/** /**
* Settings for Twitter integration * Settings for Twitter integration