Only output Facebook namespace, scripts, css, etc. when strictly necessary
This commit is contained in:
parent
e00f433314
commit
13d5479a11
|
@ -69,6 +69,9 @@ class FBConnectPlugin extends Plugin
|
||||||
// Add in xmlns:fb
|
// Add in xmlns:fb
|
||||||
function onStartShowHTML($action)
|
function onStartShowHTML($action)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if ($this->requiresFB($action)) {
|
||||||
|
|
||||||
// XXX: Horrible hack to make Safari, FF2, and Chrome work with
|
// XXX: Horrible hack to make Safari, FF2, and Chrome work with
|
||||||
// Facebook Connect. These browser cannot use Facebook's
|
// Facebook Connect. These browser cannot use Facebook's
|
||||||
// DOM parsing routines unless the mime type of the page is
|
// DOM parsing routines unless the mime type of the page is
|
||||||
|
@ -92,12 +95,19 @@ class FBConnectPlugin extends Plugin
|
||||||
'lang' => $language));
|
'lang' => $language));
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Note: this script needs to appear in the <body>
|
// Note: this script needs to appear in the <body>
|
||||||
|
|
||||||
function onStartShowHeader($action)
|
function onStartShowHeader($action)
|
||||||
{
|
{
|
||||||
|
if ($this->requiresFB($action)) {
|
||||||
|
|
||||||
$apikey = common_config('facebook', 'apikey');
|
$apikey = common_config('facebook', 'apikey');
|
||||||
$plugin_path = common_path('plugins/FBConnect');
|
$plugin_path = common_path('plugins/FBConnect');
|
||||||
|
|
||||||
|
@ -129,23 +139,71 @@ class FBConnectPlugin extends Plugin
|
||||||
$action->raw($html);
|
$action->raw($html);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// 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)
|
||||||
{
|
{
|
||||||
|
if ($this->requiresFB($action)) {
|
||||||
|
|
||||||
$action->element('script',
|
$action->element('script',
|
||||||
array('type' => 'text/javascript',
|
array('type' => 'text/javascript',
|
||||||
'src' => 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php'),
|
'src' => 'http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php'),
|
||||||
'');
|
'');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function onEndShowLaconicaStyles($action)
|
function onEndShowLaconicaStyles($action)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
if ($this->requiresFB($action)) {
|
||||||
|
|
||||||
$action->element('link', array('rel' => 'stylesheet',
|
$action->element('link', array('rel' => 'stylesheet',
|
||||||
'type' => 'text/css',
|
'type' => 'text/css',
|
||||||
'href' => common_path('plugins/FBConnect/FBConnectPlugin.css')));
|
'href' => common_path('plugins/FBConnect/FBConnectPlugin.css')));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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
|
||||||
|
* really need them.
|
||||||
|
*
|
||||||
|
* @param Action the action in question
|
||||||
|
*
|
||||||
|
* @return boolean true
|
||||||
|
*/
|
||||||
|
|
||||||
|
function requiresFB($action) {
|
||||||
|
|
||||||
|
// If you're logged in w/FB Connect, you always need the FB stuff
|
||||||
|
|
||||||
|
$fbuid = $this->loggedIn();
|
||||||
|
|
||||||
|
if (!empty($fbuid)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// List of actions that require FB stuff
|
||||||
|
|
||||||
|
$needy = array('FBConnectLoginAction',
|
||||||
|
'FBConnectauthAction',
|
||||||
|
'FBConnectSettingsAction');
|
||||||
|
|
||||||
|
if (in_array(get_class($action), $needy)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is the user currently logged in with FB Connect?
|
||||||
|
*
|
||||||
|
* @return mixed $fbuid the Facebook ID of the logged in user, or null
|
||||||
|
*/
|
||||||
|
|
||||||
function loggedIn()
|
function loggedIn()
|
||||||
{
|
{
|
||||||
|
@ -170,8 +228,6 @@ class FBConnectPlugin extends Plugin
|
||||||
$e->getMessage());
|
$e->getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Display Facebook Logged in indicator w/Facebook favicon
|
|
||||||
|
|
||||||
if ($fbuid > 0) {
|
if ($fbuid > 0) {
|
||||||
return $fbuid;
|
return $fbuid;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user