GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make paths and class loading work right

Browse Source
This commit is contained in:
Zach Copley 2009-10-21 22:02:10 +00:00
parent 3e5c8f28c3
commit 6a2185a26b
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
plugins/Facebook/FacebookPlugin.php
View File

@ -34,12 +34,6 @@ if (!defined('STATUSNET')) {
define("FACEBOOK_CONNECT_SERVICE", 3); define("FACEBOOK_CONNECT_SERVICE", 3);
require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php'; require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
require_once INSTALLDIR . '/plugins/Facebook/FBConnectAuth.php';
require_once INSTALLDIR . '/plugins/Facebook/FBConnectLogin.php';
require_once INSTALLDIR . '/plugins/Facebook/FBConnectSettings.php';
require_once INSTALLDIR . '/plugins/Facebook/FBCLoginGroupNav.php';
require_once INSTALLDIR . '/plugins/Facebook/FBCSettingsNav.php';
require_once INSTALLDIR . '/plugins/Facebook/FBC_XDReceiver.php';
/** /**
* Facebook plugin to add a StatusNet Facebook application * Facebook plugin to add a StatusNet Facebook application
@ -69,11 +63,11 @@ class FacebookPlugin extends Plugin
// Facebook App stuff // Facebook App stuff
$m->connect('facebook', array('action' => 'facebookhome')); $m->connect('facebook/app', array('action' => 'facebookhome'));
$m->connect('facebook/index.php', array('action' => 'facebookhome')); $m->connect('facebook/app/index.php', array('action' => 'facebookhome'));
$m->connect('facebook/settings.php', array('action' => 'facebooksettings')); $m->connect('facebook/app/settings.php', array('action' => 'facebooksettings'));
$m->connect('facebook/invite.php', array('action' => 'facebookinvite')); $m->connect('facebook/app/invite.php', array('action' => 'facebookinvite'));
$m->connect('facebook/remove', array('action' => 'facebookremove')); $m->connect('facebook/app/remove', array('action' => 'facebookremove'));
// Facebook Connect stuff // Facebook Connect stuff
@ -104,12 +98,25 @@ class FacebookPlugin extends Plugin
include_once INSTALLDIR . '/plugins/Facebook/' . include_once INSTALLDIR . '/plugins/Facebook/' .
strtolower(mb_substr($cls, 0, -6)) . '.php'; strtolower(mb_substr($cls, 0, -6)) . '.php';
return false; return false;
case 'FBConnectAuthAction':
case 'FBConnectLoginAction':
case 'FBConnectSettingsAction':
case 'FBC_XDReceiverAction':
include_once INSTALLDIR . '/plugins/Facebook/' .
mb_substr($cls, 0, -6) . '.php';
return false;
case 'FBCLoginGroupNav':
include_once INSTALLDIR . '/plugins/Facebook/FBCLoginGroupNav.php';
return false;
case 'FBCSettingsNav':
include_once INSTALLDIR . '/plugins/Facebook/FBCSettingsNav.php';
return false;
default: default:
return true; return true;
} }
} }
// Add in xmlns:fb // Add in xmlns:fb
function onStartShowHTML($action) function onStartShowHTML($action)
{ {
@ -143,7 +150,7 @@ class FacebookPlugin extends Plugin
} }
} }
// Note: this script needs to appear in the <body> // Note: this script needs to appear in the <body>
function onEndShowScripts($action) function onEndShowScripts($action)
{ {
@ -204,7 +211,7 @@ class FacebookPlugin extends Plugin
} }
// Note: this script needs to appear as close as possible to </body> // Note: this script needs to appear as close as possible to </body>
function onEndShowFooter($action) function onEndShowFooter($action)
{ {
@ -220,7 +227,7 @@ class FacebookPlugin extends Plugin
} }
} }
/** /**
* Does the Action we're plugged into require the FB Scripts? We only * Does the Action we're plugged into require the FB Scripts? We only
* want to output FB namespace, scripts, CSS, etc. on the pages that * want to output FB namespace, scripts, CSS, etc. on the pages that
* really need them. * really need them.

5
plugins/Facebook/facebookqueuehandler.php
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,8 +30,7 @@ Daemon script for pushing new notices to Facebook.
END_OF_FACEBOOK_HELP; END_OF_FACEBOOK_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc'; require_once INSTALLDIR . '/scripts/commandline.inc';
require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php'; require_once INSTALLDIR . '/plugins/Facebook/facebookutil.php';
require_once INSTALLDIR . '/lib/queuehandler.php'; require_once INSTALLDIR . '/lib/queuehandler.php';

2
plugins/Facebook/facebooksettings.php
View File

@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1); exit(1);
} }
require_once INSTALLDIR . '/lib/facebookaction.php'; require_once INSTALLDIR . '/plugins/Facebook/facebookaction.php';
class FacebooksettingsAction extends FacebookAction class FacebooksettingsAction extends FacebookAction
{ {