From aa58e8a73800d21d299b8c28d1b466b4d2b9cc70 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Wed, 21 Oct 2009 01:17:31 +0000 Subject: Combine Facebook and Facebook Connect plugins into one big plugin --- plugins/Facebook/FBConnect.css | 36 ++++ plugins/Facebook/FBConnectPlugin.css | 36 ---- plugins/Facebook/FBConnectPlugin.php | 367 ----------------------------------- plugins/Facebook/FacebookPlugin.php | 318 ++++++++++++++++++++++++++++++ 4 files changed, 354 insertions(+), 403 deletions(-) create mode 100644 plugins/Facebook/FBConnect.css delete mode 100644 plugins/Facebook/FBConnectPlugin.css delete mode 100644 plugins/Facebook/FBConnectPlugin.php (limited to 'plugins/Facebook') diff --git a/plugins/Facebook/FBConnect.css b/plugins/Facebook/FBConnect.css new file mode 100644 index 000000000..49217bf13 --- /dev/null +++ b/plugins/Facebook/FBConnect.css @@ -0,0 +1,36 @@ +/** Styles for Facebook logo and Facebook user profile avatar. + * + * @package StatusNet + * @author Sarven Capadisli + * @copyright 2009 StatusNet, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://status.net/ + */ + +#site_nav_global_primary #nav_fb { +position:relative; +margin-left:18px; +} + +#nav_fb #fbc_profile-pic { +position:absolute; +top:-3px; +left:-18px; +display:inline; +border:1px solid #3B5998; +padding:1px; +} + +#nav_fb #fb_favicon { +position:absolute; +top:-13px; +left:-25px; +display:inline; +} + +#settings_facebook_connect_options legend { +display:none; +} +#form_settings_facebook_connect fieldset fieldset legend { +display:block; +} diff --git a/plugins/Facebook/FBConnectPlugin.css b/plugins/Facebook/FBConnectPlugin.css deleted file mode 100644 index 49217bf13..000000000 --- a/plugins/Facebook/FBConnectPlugin.css +++ /dev/null @@ -1,36 +0,0 @@ -/** Styles for Facebook logo and Facebook user profile avatar. - * - * @package StatusNet - * @author Sarven Capadisli - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -#site_nav_global_primary #nav_fb { -position:relative; -margin-left:18px; -} - -#nav_fb #fbc_profile-pic { -position:absolute; -top:-3px; -left:-18px; -display:inline; -border:1px solid #3B5998; -padding:1px; -} - -#nav_fb #fb_favicon { -position:absolute; -top:-13px; -left:-25px; -display:inline; -} - -#settings_facebook_connect_options legend { -display:none; -} -#form_settings_facebook_connect fieldset fieldset legend { -display:block; -} diff --git a/plugins/Facebook/FBConnectPlugin.php b/plugins/Facebook/FBConnectPlugin.php deleted file mode 100644 index 0dacf9012..000000000 --- a/plugins/Facebook/FBConnectPlugin.php +++ /dev/null @@ -1,367 +0,0 @@ -. - * - * @category Plugin - * @package StatusNet - * @author Zach Copley - * @copyright 2009 StatusNet, Inc. - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -define("FACEBOOK_CONNECT_SERVICE", 3); - -require_once INSTALLDIR . '/lib/facebookutil.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBConnectAuth.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBConnectLogin.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBConnectSettings.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBCLoginGroupNav.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBCSettingsNav.php'; -require_once INSTALLDIR . '/plugins/FBConnect/FBC_XDReceiver.php'; - -/** - * Plugin to enable Facebook Connect - * - * @category Plugin - * @package StatusNet - * @author Zach Copley - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - */ - -class FBConnectPlugin extends Plugin -{ - function __construct() - { - parent::__construct(); - } - - // Hook in new actions - function onRouterInitialized(&$m) { - $m->connect('main/facebookconnect', array('action' => 'FBConnectAuth')); - $m->connect('main/facebooklogin', array('action' => 'FBConnectLogin')); - $m->connect('settings/facebook', array('action' => 'FBConnectSettings')); - $m->connect('xd_receiver.html', array('action' => 'FBC_XDReceiver')); - } - - // Add in xmlns:fb - function onStartShowHTML($action) - { - - if ($this->reqFbScripts($action)) { - - // XXX: Horrible hack to make Safari, FF2, and Chrome work with - // Facebook Connect. These browser cannot use Facebook's - // DOM parsing routines unless the mime type of the page is - // text/html even though Facebook Connect uses XHTML. This is - // A bug in Facebook Connect, and this is a temporary solution - // until they fix their JavaScript libs. - header('Content-Type: text/html'); - - $action->extraHeaders(); - - $action->startXML('html'); - - $language = $action->getLanguage(); - - $action->elementStart('html', - array('xmlns' => 'http://www.w3.org/1999/xhtml', - 'xmlns:fb' => 'http://www.facebook.com/2008/fbml', - 'xml:lang' => $language, - 'lang' => $language)); - - return false; - - } else { - - return true; - } - } - - // Note: this script needs to appear in the - - function onEndShowScripts($action) - { - if ($this->reqFbScripts($action)) { - - $apikey = common_config('facebook', 'apikey'); - $plugin_path = common_path('plugins/FBConnect'); - - $login_url = common_local_url('FBConnectAuth'); - $logout_url = common_local_url('logout'); - - // XXX: Facebook says we don't need this FB_RequireFeatures(), - // but we actually do, for IE and Safari. Gar. - - $js = ''; - - $js = sprintf($js, $apikey, $login_url, $logout_url); - - // Compress the bugger down a bit - $js = str_replace(' ', '', $js); - - $action->raw(" $js"); // leading two spaces to make it line up - } - - } - - // Note: this script needs to appear as close as possible to - - function onEndShowFooter($action) - { - if ($this->reqFbScripts($action)) { - $action->script('http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php'); - } - } - - function onEndShowStatusNetStyles($action) - { - if ($this->reqFbScripts($action)) { - $action->cssLink('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 reqFbScripts($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() - { - $user = common_current_user(); - - if (!empty($user)) { - - $flink = Foreign_link::getByUserId($user->id, - FACEBOOK_CONNECT_SERVICE); - $fbuid = 0; - - if (!empty($flink)) { - - try { - - $facebook = getFacebook(); - $fbuid = $facebook->get_loggedin_user(); - - } catch (Exception $e) { - common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . - 'Problem getting Facebook user: ' . - $e->getMessage()); - } - - if ($fbuid > 0) { - return $fbuid; - } - } - } - - return null; - } - - function onStartPrimaryNav($action) - { - - $user = common_current_user(); - $connect = 'FBConnectSettings'; - if (common_config('xmpp', 'enabled')) { - $connect = 'imsettings'; - } else if (common_config('sms', 'enabled')) { - $connect = 'smssettings'; - } else if (common_config('twitter', 'enabled')) { - $connect = 'twittersettings'; - } - - if (!empty($user)) { - - $fbuid = $this->loggedIn(); - - if (!empty($fbuid)) { - - /* Default FB silhouette pic for FB users who haven't - uploaded a profile pic yet. */ - - $silhouetteUrl = - 'http://static.ak.fbcdn.net/pics/q_silhouette.gif'; - - $url = $this->getProfilePicURL($fbuid); - - $action->elementStart('li', array('id' => 'nav_fb')); - - $action->element('img', array('id' => 'fbc_profile-pic', - 'src' => (!empty($url)) ? $url : $silhouetteUrl, - 'alt' => 'Facebook Connect User', - 'width' => '16'), ''); - - $iconurl = common_path('plugins/FBConnect/fbfavicon.ico'); - $action->element('img', array('id' => 'fb_favicon', - 'src' => $iconurl)); - - $action->elementEnd('li'); - - } - } - - return true; - } - - function onStartShowLocalNavBlock($action) - { - $action_name = get_class($action); - - $login_actions = array('LoginAction', 'RegisterAction', - 'OpenidloginAction', 'FBConnectLoginAction'); - - if (in_array($action_name, $login_actions)) { - $nav = new FBCLoginGroupNav($action); - $nav->show(); - return false; - } - - $connect_actions = array('SmssettingsAction', 'ImsettingsAction', - 'TwittersettingsAction', 'FBConnectSettingsAction'); - - if (in_array($action_name, $connect_actions)) { - $nav = new FBCSettingsNav($action); - $nav->show(); - return false; - } - - return true; - } - - function onStartLogout($action) - { - $action->logout(); - $fbuid = $this->loggedIn(); - - if (!empty($fbuid)) { - try { - $facebook = getFacebook(); - $facebook->expire_session(); - } catch (Exception $e) { - common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . - 'Could\'t logout of Facebook: ' . - $e->getMessage()); - } - } - - return true; - } - - function getProfilePicURL($fbuid) - { - - $facebook = getFacebook(); - $url = null; - - try { - - $fqry = 'SELECT pic_square FROM user WHERE uid = %s'; - - $result = $facebook->api_client->fql_query(sprintf($fqry, $fbuid)); - - if (!empty($result)) { - $url = $result[0]['pic_square']; - } - - } catch (Exception $e) { - common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . - "Facebook client failure requesting profile pic!"); - } - - return $url; - - } - -} diff --git a/plugins/Facebook/FacebookPlugin.php b/plugins/Facebook/FacebookPlugin.php index 127cf96e6..cf6781cfa 100644 --- a/plugins/Facebook/FacebookPlugin.php +++ b/plugins/Facebook/FacebookPlugin.php @@ -31,6 +31,16 @@ if (!defined('STATUSNET')) { exit(1); } +define("FACEBOOK_CONNECT_SERVICE", 3); + +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 * @@ -56,12 +66,22 @@ class FacebookPlugin extends Plugin function onRouterInitialized(&$m) { + + // Facebook App stuff + $m->connect('facebook', array('action' => 'facebookhome')); $m->connect('facebook/index.php', array('action' => 'facebookhome')); $m->connect('facebook/settings.php', array('action' => 'facebooksettings')); $m->connect('facebook/invite.php', array('action' => 'facebookinvite')); $m->connect('facebook/remove', array('action' => 'facebookremove')); + // Facebook Connect stuff + + $m->connect('main/facebookconnect', array('action' => 'FBConnectAuth')); + $m->connect('main/facebooklogin', array('action' => 'FBConnectLogin')); + $m->connect('settings/facebook', array('action' => 'FBConnectSettings')); + $m->connect('xd_receiver.html', array('action' => 'FBC_XDReceiver')); + return true; } @@ -89,6 +109,304 @@ class FacebookPlugin extends Plugin } } + // Add in xmlns:fb + function onStartShowHTML($action) + { + + if ($this->reqFbScripts($action)) { + + // XXX: Horrible hack to make Safari, FF2, and Chrome work with + // Facebook Connect. These browser cannot use Facebook's + // DOM parsing routines unless the mime type of the page is + // text/html even though Facebook Connect uses XHTML. This is + // A bug in Facebook Connect, and this is a temporary solution + // until they fix their JavaScript libs. + header('Content-Type: text/html'); + + $action->extraHeaders(); + + $action->startXML('html'); + + $language = $action->getLanguage(); + + $action->elementStart('html', + array('xmlns' => 'http://www.w3.org/1999/xhtml', + 'xmlns:fb' => 'http://www.facebook.com/2008/fbml', + 'xml:lang' => $language, + 'lang' => $language)); + + return false; + + } else { + + return true; + } + } + + // Note: this script needs to appear in the + + function onEndShowScripts($action) + { + if ($this->reqFbScripts($action)) { + + $apikey = common_config('facebook', 'apikey'); + $plugin_path = common_path('plugins/Facebook'); + + $login_url = common_local_url('FBConnectAuth'); + $logout_url = common_local_url('logout'); + + // XXX: Facebook says we don't need this FB_RequireFeatures(), + // but we actually do, for IE and Safari. Gar. + + $js = ''; + + $js = sprintf($js, $apikey, $login_url, $logout_url); + + // Compress the bugger down a bit + $js = str_replace(' ', '', $js); + + $action->raw(" $js"); // leading two spaces to make it line up + } + + } + + // Note: this script needs to appear as close as possible to + + function onEndShowFooter($action) + { + if ($this->reqFbScripts($action)) { + $action->script('http://static.ak.connect.facebook.com/js/api_lib/v0.4/FeatureLoader.js.php'); + } + } + + function onEndShowStatusNetStyles($action) + { + if ($this->reqFbScripts($action)) { + $action->cssLink('plugins/Facebook/FBConnect.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 reqFbScripts($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() + { + $user = common_current_user(); + + if (!empty($user)) { + + $flink = Foreign_link::getByUserId($user->id, + FACEBOOK_CONNECT_SERVICE); + $fbuid = 0; + + if (!empty($flink)) { + + try { + + $facebook = getFacebook(); + $fbuid = $facebook->get_loggedin_user(); + + } catch (Exception $e) { + common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . + 'Problem getting Facebook user: ' . + $e->getMessage()); + } + + if ($fbuid > 0) { + return $fbuid; + } + } + } + + return null; + } + + function onStartPrimaryNav($action) + { + + $user = common_current_user(); + $connect = 'FBConnectSettings'; + if (common_config('xmpp', 'enabled')) { + $connect = 'imsettings'; + } else if (common_config('sms', 'enabled')) { + $connect = 'smssettings'; + } else if (common_config('twitter', 'enabled')) { + $connect = 'twittersettings'; + } + + if (!empty($user)) { + + $fbuid = $this->loggedIn(); + + if (!empty($fbuid)) { + + /* Default FB silhouette pic for FB users who haven't + uploaded a profile pic yet. */ + + $silhouetteUrl = + 'http://static.ak.fbcdn.net/pics/q_silhouette.gif'; + + $url = $this->getProfilePicURL($fbuid); + + $action->elementStart('li', array('id' => 'nav_fb')); + + $action->element('img', array('id' => 'fbc_profile-pic', + 'src' => (!empty($url)) ? $url : $silhouetteUrl, + 'alt' => 'Facebook Connect User', + 'width' => '16'), ''); + + $iconurl = common_path('plugins/Facebook/fbfavicon.ico'); + $action->element('img', array('id' => 'fb_favicon', + 'src' => $iconurl)); + + $action->elementEnd('li'); + + } + } + + return true; + } + + function onStartShowLocalNavBlock($action) + { + $action_name = get_class($action); + + $login_actions = array('LoginAction', 'RegisterAction', + 'OpenidloginAction', 'FBConnectLoginAction'); + + if (in_array($action_name, $login_actions)) { + $nav = new FBCLoginGroupNav($action); + $nav->show(); + return false; + } + + $connect_actions = array('SmssettingsAction', 'ImsettingsAction', + 'TwittersettingsAction', 'FBConnectSettingsAction'); + + if (in_array($action_name, $connect_actions)) { + $nav = new FBCSettingsNav($action); + $nav->show(); + return false; + } + + return true; + } + + function onStartLogout($action) + { + $action->logout(); + $fbuid = $this->loggedIn(); + + if (!empty($fbuid)) { + try { + $facebook = getFacebook(); + $facebook->expire_session(); + } catch (Exception $e) { + common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . + 'Could\'t logout of Facebook: ' . + $e->getMessage()); + } + } + + return true; + } + + function getProfilePicURL($fbuid) + { + + $facebook = getFacebook(); + $url = null; + + try { + + $fqry = 'SELECT pic_square FROM user WHERE uid = %s'; + + $result = $facebook->api_client->fql_query(sprintf($fqry, $fbuid)); + + if (!empty($result)) { + $url = $result[0]['pic_square']; + } + + } catch (Exception $e) { + common_log(LOG_WARNING, 'Facebook Connect Plugin - ' . + "Facebook client failure requesting profile pic!"); + } + + return $url; + + } + /** * Add a Facebook queue item for each notice * -- cgit v1.2.3-54-g00ecf