Merge branch '0.9.x' into facebook-upgrade

[quix0rs-gnu-social.git] / plugins / FacebookSSO / actions / facebooklogin.php

diff --git a/plugins/FacebookSSO/actions/facebooklogin.php b/plugins/FacebookSSO/actions/facebooklogin.php
index bb30be1af7f99cc8b91d77d074a9e9980c998d92..9a230b72410092661f411f36de33706588453e4a 100644 (file)
--- a/plugins/FacebookSSO/actions/facebooklogin.php
+++ b/plugins/FacebookSSO/actions/facebooklogin.php
@@ -40,90 +40,10 @@ class FacebookloginAction extends Action
         parent::handle($args);
 
         if (common_is_real_login()) {
-            
             $this->clientError(_m('Already logged in.'));
-
-        } else {
-
-            $facebook = new Facebook(
-                array(
-                    'appId'  => common_config('facebook', 'appid'),
-                    'secret' => common_config('facebook', 'secret'),
-                    'cookie' => true,
-                )
-            );
-
-            $session = $facebook->getSession();
-            $fbuser  = null;
-
-            if ($session) {
-                try {
-                    $fbuid = $facebook->getUser();
-                    $fbuser  = $facebook->api('/me');
-                } catch (FacebookApiException $e) {
-                    common_log(LOG_ERROR, $e);
-                }
-            }
-
-            if (!empty($fbuser)) {
-                common_debug("Found a valid Facebook user", __FILE__);
-
-                // Check to see if we have a foreign link already
-                $flink = Foreign_link::getByForeignId($fbuid, FACEBOOK_SERVICE);
-
-                if (empty($flink)) {
-
-                    // See if the user would like to register a new local
-                    // account
-                    common_redirect(
-                        common_local_url('facebookregister'),
-                        303
-                    );
-
-                } else {
-
-                    // Log our user in!
-                    $user = $flink->getUser();
-
-                    if (!empty($user)) {
-
-                        common_log(
-                            LOG_INFO,
-                            sprintf(
-                                'Logged in Facebook user %s as user %s (%s)',
-                                $fbuid,
-                                $user->id,
-                                $user->nickname
-                            ),
-                            __FILE__
-                        );
-
-                        common_set_user($user);
-                        common_real_login(true);
-                        $this->goHome($user->nickname);
-                    }
-                }
-
-            }
-        }
-
-        $this->showPage();
-    }
-
-    function goHome($nickname)
-    {
-        $url = common_get_returnto();
-        if ($url) {
-            // We don't have to return to it again
-            common_set_returnto(null);
         } else {
-            $url = common_local_url(
-                'all',
-                array('nickname' => $nickname)
-            );
+            $this->showPage();
         }
-
-        common_redirect($url, 303);
     }
 
     function getInstructions()
@@ -151,14 +71,45 @@ class FacebookloginAction extends Action
 
         $this->elementStart('fieldset');
 
+        $facebook = Facebookclient::getFacebook();
+
+        // Degrade to plain link if JavaScript is not available
+        $this->elementStart(
+            'a',
+            array(
+                'href' => $facebook->getLoginUrl(
+                    array(
+                        'next'   => common_local_url('facebookfinishlogin'),
+                        'cancel' => common_local_url('facebooklogin')
+                    )
+                 ),
+                'id'    => 'facebook_button'
+            )
+        );
+
         $attrs = array(
-            //'show-faces' => 'true',
-            //'max-rows'   => '4',
-            //'width'      => '600',
-            'perms'      => 'user_location,user_website,offline_access,publish_stream'
+            'src' => common_path(
+                'plugins/FacebookBridge/images/login-button.png',
+                true
+            ),
+            'alt'   => 'Login with Facebook',
+            'title' => 'Login with Facebook'
         );
 
-        $this->element('fb:login-button', $attrs);
+        $this->element('img', $attrs);
+
+        $this->elementEnd('a');
+
+        /*
+        $this->element('div', array('id' => 'fb-root'));
+        $this->script(
+            sprintf(
+                'http://connect.facebook.net/en_US/all.js#appId=%s&xfbml=1',
+                common_config('facebook', 'appid')
+            )
+        );
+        $this->element('fb:facepile', array('max-rows' => '2', 'width' =>'300'));
+        */
         $this->elementEnd('fieldset');
     }