summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/common.php1
-rw-r--r--plugins/TwitterBridge/TwitterBridgePlugin.php2
-rwxr-xr-xplugins/TwitterBridge/daemons/synctwitterfriends.php (renamed from scripts/synctwitterfriends.php)3
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterqueuehandler.php (renamed from scripts/twitterqueuehandler.php)7
-rwxr-xr-xplugins/TwitterBridge/daemons/twitterstatusfetcher.php (renamed from scripts/twitterstatusfetcher.php)5
-rw-r--r--plugins/TwitterBridge/twitter.php (renamed from lib/twitter.php)0
-rw-r--r--plugins/TwitterBridge/twitterauthorization.php2
-rw-r--r--plugins/TwitterBridge/twittersettings.php4
8 files changed, 13 insertions, 11 deletions
diff --git a/lib/common.php b/lib/common.php
index 62cf5640d..d23d9da7d 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -409,7 +409,6 @@ require_once INSTALLDIR.'/lib/theme.php';
require_once INSTALLDIR.'/lib/mail.php';
require_once INSTALLDIR.'/lib/subs.php';
require_once INSTALLDIR.'/lib/Shorturl_api.php';
-require_once INSTALLDIR.'/lib/twitter.php';
require_once INSTALLDIR.'/lib/clientexception.php';
require_once INSTALLDIR.'/lib/serverexception.php';
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index f7daa9a22..a8de1c664 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -90,7 +90,7 @@ class TwitterBridgePlugin extends Plugin
require_once(INSTALLDIR.'/plugins/TwitterBridge/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
return false;
case 'TwitterOAuthClient':
- require_once(INSTALLDIR.'/plugins/TwitterBridge/twitteroAuthclient.php');
+ require_once(INSTALLDIR.'/plugins/TwitterBridge/twitteroauthclient.php');
return false;
default:
return true;
diff --git a/scripts/synctwitterfriends.php b/plugins/TwitterBridge/daemons/synctwitterfriends.php
index 2de464bcc..b7be5d043 100755
--- a/scripts/synctwitterfriends.php
+++ b/plugins/TwitterBridge/daemons/synctwitterfriends.php
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
$shortoptions = 'di::';
$longoptions = array('id::', 'debug');
@@ -32,6 +32,7 @@ END_OF_TRIM_HELP;
require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/parallelizingdaemon.php';
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/**
* Daemon to sync local friends with Twitter friends
diff --git a/scripts/twitterqueuehandler.php b/plugins/TwitterBridge/daemons/twitterqueuehandler.php
index 00e735d98..9aa9d1ed0 100755
--- a/scripts/twitterqueuehandler.php
+++ b/plugins/TwitterBridge/daemons/twitterqueuehandler.php
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
+define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
$shortoptions = 'i::';
$longoptions = array('id::');
@@ -30,10 +30,9 @@ Daemon script for pushing new notices to Twitter.
END_OF_ENJIT_HELP;
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-require_once INSTALLDIR . '/lib/twitter.php';
+require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/queuehandler.php';
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
class TwitterQueueHandler extends QueueHandler
{
diff --git a/scripts/twitterstatusfetcher.php b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
index f5289c5f4..3023bf423 100755
--- a/scripts/twitterstatusfetcher.php
+++ b/plugins/TwitterBridge/daemons/twitterstatusfetcher.php
@@ -18,7 +18,7 @@
* 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
// 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;
-require_once INSTALLDIR .'/scripts/commandline.inc';
+require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/lib/daemon.php';
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/**
* Fetcher for statuses from Twitter
diff --git a/lib/twitter.php b/plugins/TwitterBridge/twitter.php
index 280cdb0a3..280cdb0a3 100644
--- a/lib/twitter.php
+++ b/plugins/TwitterBridge/twitter.php
diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php
index b04f35327..a54528434 100644
--- a/plugins/TwitterBridge/twitterauthorization.php
+++ b/plugins/TwitterBridge/twitterauthorization.php
@@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
exit(1);
}
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
+
/**
* Class for doing OAuth authentication against Twitter
*
diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index a3e02e125..b3d4a971f 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -31,8 +31,8 @@ if (!defined('LACONICA')) {
exit(1);
}
-require_once INSTALLDIR.'/lib/connectsettingsaction.php';
-require_once INSTALLDIR.'/lib/twitter.php';
+require_once INSTALLDIR . '/lib/connectsettingsaction.php';
+require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
/**
* Settings for Twitter integration