Moved the rest of the Twitter stuff into the TwitterBridge plugin
This commit is contained in:
		@@ -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';
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
@@ -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
 | 
			
		||||
{
 | 
			
		||||
@@ -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
 | 
			
		||||
@@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
 | 
			
		||||
    exit(1);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
require_once INSTALLDIR . '/plugins/TwitterBridge/twitter.php';
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * Class for doing OAuth authentication against Twitter
 | 
			
		||||
 *
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user