Changeset 1252

Timestamp:

10/17/10 18:31:00 (3 years ago)

Author:

d0nut

Message:

facebook 2.0.0 RC 2

• bypass password queries, since facebook users do have have passwords
• add facebook login to existing wcf user

Location:

facebook

Files:

• de-informal.xml (copied) (copied from facebook/de.xml) (2 diffs)
• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• eventlistener.xml (modified) (1 diff)
• files/lib/system/auth (deleted)
• files/lib/system/event/listener/UserLoginFacebookListener.class.php (modified) (2 diffs)
• files/lib/util (added)
• files/lib/util/FacebookUtil.class.php (copied) (copied from facebook/files/lib/system/event/listener/UserLoginFacebookListener.class.php) (20 diffs)
• optionals/org.gnex.facebook.auth.wbb (deleted)
• package.xml (modified) (4 diffs)

facebook/de-informal.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "http://www.woltlab.com/DTDs/language.dtd">
-<language languagecode="de">
+<language languagecode="de-informal">
         <category name="wcf.acp.option">
                 <item name="wcf.acp.option.module_facebook"><![CDATA[Facebook]]></item>
@@ -12 +12 @@
                 <item name="wcf.acp.option.facebook_secret.description"><![CDATA[Geben Sie hier den Anwendungs-Geheimcode ein, den Sie auf <a href="http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site">Facebook</a> erhalten haben.]]></item>
         </category>
+        <category name="wcf.facebook">
+                <item name="wcf.facebook.title"><![CDATA[Facebook]]></item>
+                <item name="wcf.facebook.status.connected"><![CDATA[Sie sind erfolgreich mit Facebook verbunden.]]></item>
+                <item name="wcf.facebook.status.alreadyAssigned"><![CDATA[Der Benutzer &laquo;{$username}&raquo; benutzt ihren Facebook Login bereits.]]></item>
+        </category>
 </language>

facebook/de.xml

@@ -12 +12 @@
                 <item name="wcf.acp.option.facebook_secret.description"><![CDATA[Geben Sie hier den Anwendungs-Geheimcode ein, den Sie auf <a href="http://wiki.developers.facebook.com/index.php/Connect/Setting_Up_Your_Site">Facebook</a> erhalten haben.]]></item>
         </category>
+        <category name="wcf.facebook">
+                <item name="wcf.facebook.title"><![CDATA[Facebook]]></item>
+                <item name="wcf.facebook.status.connected"><![CDATA[Sie sind erfolgreich mit Facebook verbunden.]]></item>
+                <item name="wcf.facebook.status.alreadyAssigned"><![CDATA[Der Benutzer &laquo;{$username}&raquo; benutzt ihren Facebook Login bereits.]]></item>
+        </category>
 </language>

facebook/en.xml

@@ -12 +12 @@
                 <item name="wcf.acp.option.facebook_secret.description"><![CDATA[Enter your SecretKey.]]></item>
         </category>
+        <category name="wcf.facebook">
+                <item name="wcf.facebook.title"><![CDATA[Facebook]]></item>
+                <item name="wcf.facebook.status.connected"><![CDATA[Your are successfully connected to facebook.]]></item>
+                <item name="wcf.facebook.status.alreadyAssigned"><![CDATA[Your facebook login was already linked with the user &laquo;{$username}&raquo;.]]></item>
+        </category>
 </language>

facebook/eventlistener.xml

@@ -6 +6 @@
                         <eventclassname>UserLoginForm</eventclassname>
                         <eventname>readData</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginFacebookListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>AccountManagementForm</eventclassname>
+                        <eventname>validate</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginFacebookListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>UserProfileEditForm</eventclassname>
+                        <eventname>assignVariables</eventname>
                         <listenerclassfile>lib/system/event/listener/UserLoginFacebookListener.class.php</listenerclassfile>
                 </eventlistener>

facebook/files/lib/system/event/listener/UserLoginFacebookListener.class.php

@@ -1 +1 @@
 <?php
-require_once(WCF_DIR.'lib/system/event/EventListener.class.php');
-require_once(WCF_DIR.'lib/data/facebook/Facebook.class.php');
-require_once(WCF_DIR.'lib/data/user/avatar/AvatarEditor.class.php');
-require_once(WCF_DIR.'lib/data/user/UserEditor.class.php');
+require_once(WCF_DIR.'lib/util/FacebookUtil.class.php');
 
 /**
  * login will display facebook login button and manage all the login stuff
  * 
- * @author      Tim Wittenberg, Torben Brodt
+ * @author      Torben Brodt
  * @url         http://trac.easy-coding.de/trac/wcf/wiki/facebook
  * @license     GNU General Public License <http://opensource.org/licenses/gpl-3.0.html>
  */
 class UserLoginFacebookListener implements EventListener {
-        /**
-         * from eventlistener
-         *
-         * @var UserLoginForm
-         */
-        protected $eventObj;
-        
-        /**
-         * from eventlistener
-         *
-         * @var string
-         */
-        protected $className;
-
-        /**
-         * facebook api object
-         *
-         * @var Facebok
-         */
-        public $facebook;
 
         /**
@@ -41 +18 @@
                         return;
                 }
+                
+                switch($className) {
+                        // login or register with facebook
+                        case 'UserLoginForm':
+                                // readData
+                                FacebookUtil::loginOrRegister($eventObj);
+                        break;
+                        
+                        // registered user links with facebook
+                        case 'UserProfileEditForm':
+                                // assignVariables
+                                if($eventObj->activeCategory == 'settings.general') {
+                                        FacebookUtil::updateCurrentUser();
+                                }
+                        break;
+                        
+                        // password validations can be skipped if facebook auth is successfully
+                        case 'AccountManagementForm':
+                                // validate
+                                if(FacebookUtil::isValidFacebookUser()) {
 
-                $this->eventObj = $eventObj;
-                $this->className = $className;
-
-                if(method_exists($this, $eventName)) {
-                        $this->$eventName();
-                }
-        }
-
-        /**
-         * is there an existing user with given facebook id?
-         *
-         * @param       array           $me
-         * @return      User
-         */
-        protected function getFacebookEnabledUser($me) {
-                $sql = "SELECT          utb.userID
-                        FROM            wcf".WCF_N."_user_to_facebook utb
-                        WHERE           utb.facebookID = ".intval($me['id']);
-                $row = WCF::getDB()->getFirstRow($sql);
-
-                $user = $row ? new User($row['userID']) : null;
-                return $user && $user->userID ? $user : null;
-        }
-
-        /**
-         * adds facebook link to user
-         *
-         * @param       integer         $facebookID
-         * @param       User            $user
-         * @return      boolean
-         */
-        protected function addFacebookUser($facebookID, $user) {
-                $sql = "REPLACE INTO    wcf".WCF_N."_user_to_facebook
-                                        (facebookID, userID)
-                        VALUES          (".intval($facebookID).", ".intval($user->userID).")";
-
-                return WCF::getDB()->sendQuery($sql);
-        }
-
-        /**
-         * is there an existing user matching the given email address from facebook?
-         *
-         * @param       array           $me
-         * @return      User
-         */
-        protected function getEmailUser($me) {
-                $user = new User(null, null, null, $me['email']);
-                return $user->userID ? $user : null;
-        }
-
-        /**
-         * @see UserLoginForm::readData
-         */
-        public function readData() {
-
-                // Create our Application instance.
-                $this->facebook = new Facebook(array(
-                        'appId'  => FACEBOOK_APPID,
-                        'secret' => FACEBOOK_SECRET,
-                        'cookie' => true,
-                ));
-
-                // We may or may not have this data based on a $_GET or $_COOKIE based session.
-                //
-                // If we get a session here, it means we found a correctly signed session using
-                // the Application Secret only Facebook and the Application know. We dont know
-                // if it is still valid until we make an API call using the session. A session
-                // can become invalid if it has already expired (should not be getting the
-                // session back in this case) or if the user logged out of Facebook.
-                $session = $this->facebook->getSession();
-
-                $me = null;
-                $uid = array();
-
-                // Session based API call.
-                if ($session) {
-                        try {
-                                $uid = $this->facebook->getUser();
-                                $me = $this->facebook->api('/me');
-                        } catch (FacebookApiException $e) {
-                                error_log($e);
-                        }
-                }
-
-                // no permissions granted, ask for login
-                if(!$me) {
-                        $loginUrl = $this->facebook->getLoginUrl(array(
-                                'req_perms' => 'email',
-                                'display' => 'popup'
-                        ));
-
-                        WCF::getTPL()->assign(array(
-                                'session' => $session,
-                                'loginUrl' => $loginUrl,
-                        ));
-
-                        WCF::getTPL()->append('additionalFields', WCF::getTPL()->fetch('facebookLogin'));
-                        return;
-                }
-
-                // facebook permissions granted, does an login exist?
-                $user = $this->getFacebookEnabledUser($me);
-
-                // facebook permissions granted but no login exists
-                if(!$user) {
-
-                        // facebook is ultimativly trusted, if you get an account there,
-                        // you can get the account with the same email here!
-                        $user = $this->getEmailUser($me);
-
-                        // totally unknown, add a new user
-                        if(!$user) {
-                                $user = $this->registerUser($me);
-                        }
-
-                        // update avatar
-                        $this->updateAvatar('https://graph.facebook.com/'.$me['id'].'/picture', $user);
-
-                        // either user is new, oder just got a link, but add a facebook link
-                        $this->addFacebookUser($me['id'], $user);
-                }
-
-                if($user) {
-
-                        // UserLoginForm should not write cookie, since interfaces only support unhashed password
-                        $this->eventObj->useCookies = 0;
-
-                        // set cookies
-                        UserAuth::getInstance()->storeAccessData($user, $user->username, $user->password);
-                        HeaderUtil::setCookie('password', $user->password, TIME_NOW + 365 * 24 * 3600);
-
-                        // save cookie and redirect
-                        $this->eventObj->user = $user;
-                        $this->eventObj->save();
-
-                        exit;
-                }
-        }
-
-        /**
-         * get a available username
-         *
-         * @param       string          $username
-         * @return      string
-         */
-        protected function findUsername($username) {
-                if(!UserUtil::isValidUsername($username)) {
-                        return null;
-                }
-
-                if(UserUtil::isAvailableUsername($username)) {
-                        return $username;
-                }
-
-                // try to increase last digit
-                if(preg_match('/(\d+)$/', $username, $res)) {
-                        return $this->findUsername(preg_replace('/(\d+)/', ($res[1] + 1), $username));
-                } else {
-                        return $this->findUsername($username.'2');
-                }
-        }
-
-        /**
-         * registers a new user with valid username
-         *
-         * @param       array           $me
-         * @return      User
-         */
-        protected function registerUser($me) {
-                $user = null;
-                // get a valid username
-                $username = $this->findUsername($me['name']);
-
-                // create new user
-                if($username) {
-                        $user = $this->createNewUser(
-                                $username,
-                                $me['email'],
-                                $me['link']
-                        );
-                } else {
-                        throw new SystemException('invalid facebook username: '.$me['name']);
-                }
-                return $user;
-        }
-
-        /**
-         * adds a new wcf user and sends, bypasses all registration steps and send out mails
-         *
-         * @param       string          $username
-         * @param       string          $email
-         * @param       string          $facebookLink
-         * @return      User
-         */
-        protected function createNewUser($username, $email, $facebookLink) {
-
-                $password = UserRegistrationUtil::getNewPassword((REGISTER_PASSWORD_MIN_LENGTH > 9 ? REGISTER_PASSWORD_MIN_LENGTH : 9));
-                $groups = array();
-                $activeOptions = array();
-
-                $additionalFields = array();
-                $additionalFields['languageID'] = WCF::getLanguage()->getLanguageID();
-                $additionalFields['registrationIpAddress'] = WCF::getSession()->ipAddress;
-
-                $visibleLanguages = $this->getAvailableLanguages();
-                $visibleLanguages = array_keys($visibleLanguages);
-                $addDefaultGroups = true;
-
-                // create the user
-                if(($user = UserEditor::create($username, $email, $password, $groups, $activeOptions, $additionalFields, $visibleLanguages, $addDefaultGroups))) {
-
-                        // notify admin
-                        if (REGISTER_ADMIN_NOTIFICATION) {
-                                // get default language
-                                $language = (WCF::getLanguage()->getLanguageID() != Language::getDefaultLanguageID()
-                                        ? new Language(Language::getDefaultLanguageID())
-                                        : WCF::getLanguage());
-                                $language->setLocale();
-
-                                // send mail
-                                require_once(WCF_DIR.'lib/data/mail/Mail.class.php');
-                                $mail = new Mail(
-                                        MAIL_ADMIN_ADDRESS,
-                                        $language->get('wcf.user.register.notification.mail.subject', array(
-                                                'PAGE_TITLE' => $language->get(PAGE_TITLE)
-                                        )),
-                                        $language->get('wcf.user.register.notification.mail', array(
-                                                'PAGE_TITLE' => $language->get(PAGE_TITLE),
-                                                '$username' => $user->username
-                                        ))
-                                );
-                                $mail->send();
-
-                                WCF::getLanguage()->setLocale();
-                        }
-                }
-
-                return $user;
-        }
-
-        /**
-         * Returns a list of all available languages.
-         *
-         * @return      array
-         */
-        protected function getAvailableLanguages() {
-                $availableLanguages = array();
-                foreach (Language::getAvailableLanguages(PACKAGE_ID) as $language) {
-                        $availableLanguages[$language['languageID']] = WCF::getLanguage()->get('wcf.global.language.'.$language['languageCode']);
-                }
-
-                // sort languages
-                StringUtil::sort($availableLanguages);
-
-                return $availableLanguages;
-        }
-
-        /**
-         * downloads facebook image and saves as avatar
-         *
-         * @param       string          $avatarURL
-         * @param       User            $user
-         * @return      boolean
-         */
-        protected function updateAvatar($avatarURL, $user) {
-                // existing avatar? skip facebook download
-                if ($user->avatarID || empty($avatarURL)) {
-                        return false;
-                }
-
-                try {
-                        $avatarID = 0;
-                        $tmpName = FileUtil::downloadFileFromHttp($avatarURL, 'avatar');
-                        $avatarID = AvatarEditor::create($tmpName, $avatarURL, 'avatarURL', $user->userID);
-                }
-                catch (Exception $e) {
-
-                        // skip, download is not that important
-                        return false;
-                }
-
-                if($avatarID) {
-
-                        // update user
-                        $sql = "UPDATE  wcf".WCF_N."_user
-                                SET     avatarID = ".$avatarID."
-                                WHERE   userID = ".$user->userID;
-                        return WCF::getDB()->sendQuery($sql);
+                                        // bypass password query with a little hack
+                                        $password = UserRegistrationUtil::getNewPassword((REGISTER_PASSWORD_MIN_LENGTH > 9 ? REGISTER_PASSWORD_MIN_LENGTH : 9));
+                                        WCF::getUser()->password = StringUtil::getDoubleSaltedHash($password, WCF::getUser()->salt);
+                                        $eventObj->password = $password;
+                                }
+                        break;
                 }
         }

facebook/files/lib/util/FacebookUtil.class.php

@@ -4 +4 @@
 require_once(WCF_DIR.'lib/data/user/avatar/AvatarEditor.class.php');
 require_once(WCF_DIR.'lib/data/user/UserEditor.class.php');
+require_once(WCF_DIR.'lib/util/UserRegistrationUtil.class.php');
 
 /**
  * login will display facebook login button and manage all the login stuff
  * 
- * @author      Tim Wittenberg, Torben Brodt
+ * @author      Torben Brodt
  * @url         http://trac.easy-coding.de/trac/wcf/wiki/facebook
  * @license     GNU General Public License <http://opensource.org/licenses/gpl-3.0.html>
  */
-class UserLoginFacebookListener implements EventListener {
-        /**
-         * from eventlistener
-         *
-         * @var UserLoginForm
-         */
-        protected $eventObj;
-        
-        /**
-         * from eventlistener
-         *
-         * @var string
-         */
-        protected $className;
+class FacebookUtil {
 
         /**
@@ -32 +20 @@
          * @var Facebok
          */
-        public $facebook;
-
-        /**
-         * @see EventListener::execute()
-         */
-        public function execute($eventObj, $className, $eventName) {
-                if (!MODULE_FACEBOOK || !FACEBOOK_APPID || !FACEBOOK_SECRET) {
-                        return;
-                }
-
-                $this->eventObj = $eventObj;
-                $this->className = $className;
-
-                if(method_exists($this, $eventName)) {
-                        $this->$eventName();
-                }
-        }
+        public static $facebook;
 
         /**
@@ -56 +28 @@
          * @return      User
          */
-        protected function getFacebookEnabledUser($me) {
+        protected static function getFacebookEnabledUser($me) {
                 $sql = "SELECT          utb.userID
                         FROM            wcf".WCF_N."_user_to_facebook utb
@@ -67 +39 @@
 
         /**
+         * is there an existing user with given facebook id?
+         *
+         * @param       integer         $userID
+         * @return      boolean
+         */
+        protected static function hasFacebookAccount($userID) {
+                $sql = "SELECT          utb.facebookID
+                        FROM            wcf".WCF_N."_user_to_facebook utb
+                        WHERE           utb.userID = ".intval($userID);
+                $row = WCF::getDB()->getFirstRow($sql);
+
+                return $row && $row['facebookID'] > 0;
+        }
+
+        /**
          * adds facebook link to user
          *
@@ -73 +60 @@
          * @return      boolean
          */
-        protected function addFacebookUser($facebookID, $user) {
+        protected static function addFacebookUser($facebookID, $user) {
                 $sql = "REPLACE INTO    wcf".WCF_N."_user_to_facebook
                                         (facebookID, userID)
@@ -87 +74 @@
          * @return      User
          */
-        protected function getEmailUser($me) {
+        protected static function getEmailUser($me) {
                 $user = new User(null, null, null, $me['email']);
                 return $user->userID ? $user : null;
         }
-
-        /**
-         * @see UserLoginForm::readData
-         */
-        public function readData() {
-
+        
+        protected static function getSesssion() {
                 // Create our Application instance.
-                $this->facebook = new Facebook(array(
+                self::$facebook = new Facebook(array(
                         'appId'  => FACEBOOK_APPID,
                         'secret' => FACEBOOK_SECRET,
@@ -111 +94 @@
                 // can become invalid if it has already expired (should not be getting the
                 // session back in this case) or if the user logged out of Facebook.
-                $session = $this->facebook->getSession();
+                $session = self::$facebook->getSession();
+                
+                return $session;
+        }
+
+        /**
+         *
+         */
+        public static function isValidFacebookUser() {
+        
+                // did connect?
+                if(!self::hasFacebookAccount(WCF::getUser()->userID)) {
+                        return false;
+                }
+
+                // We may or may not have this data based on a $_GET or $_COOKIE based session.
+                $session = self::getSession();
 
                 $me = null;
@@ -119 +118 @@
                 if ($session) {
                         try {
-                                $uid = $this->facebook->getUser();
-                                $me = $this->facebook->api('/me');
+                                $uid = self::$facebook->getUser();
+                                $me = self::$facebook->api('/me');
                         } catch (FacebookApiException $e) {
                                 error_log($e);
@@ -128 +127 @@
                 // no permissions granted, ask for login
                 if(!$me) {
-                        $loginUrl = $this->facebook->getLoginUrl(array(
+                        $loginUrl = self::$facebook->getLoginUrl(array(
                                 'req_perms' => 'email',
                                 'display' => 'popup'
@@ -139 +138 @@
 
                         WCF::getTPL()->append('additionalFields', WCF::getTPL()->fetch('facebookLogin'));
+                        return false;
+                }
+
+                // facebook permissions granted, does an login exist?
+                $user = self::getFacebookEnabledUser($me);
+
+                // facebook permissions granted and login is linked with current user
+                return $user && $user->userID == WCF::getUser()->userID;
+        }
+
+        /**
+         * @see UserLoginForm::readData
+         */
+        public static function updateCurrentUser() {
+
+                // We may or may not have this data based on a $_GET or $_COOKIE based session.
+                $session = self::getSession();
+
+                $me = null;
+                $uid = array();
+
+                // Session based API call.
+                if ($session) {
+                        try {
+                                $uid = self::$facebook->getUser();
+                                $me = self::$facebook->api('/me');
+                        } catch (FacebookApiException $e) {
+                                error_log($e);
+                        }
+                }
+
+                // no permissions granted, ask for login
+                if(!$me) {
+                        $loginUrl = self::$facebook->getLoginUrl(array(
+                                'req_perms' => 'email',
+                                'display' => 'popup'
+                        ));
+
+                        WCF::getTPL()->assign(array(
+                                'session' => $session,
+                                'loginUrl' => $loginUrl,
+                        ));
+
+                        WCF::getTPL()->append('additionalFields', '<fieldset>
+                                <legend>'.WCF::getLanguage()->get('wcf.facebook.title').'</legend>
+                                '.WCF::getTPL()->fetch('facebookLogin').'
+                        </fieldset>');
                         return;
                 }
 
                 // facebook permissions granted, does an login exist?
-                $user = $this->getFacebookEnabledUser($me);
+                $user = self::getFacebookEnabledUser($me);
+
+                // facebook login not used yet, facebook permissions granted, update account info
+                if(!$user) {
+
+                        // update avatar (only if avatar is not given)
+                        self::updateAvatar('https://graph.facebook.com/'.$me['id'].'/picture', $user);
+
+                        // either user is new, oder just got a link, but add a facebook link
+                        self::addFacebookUser($me['id'], $user);
+
+                        return true;
+                }
+
+                // user already exists, and login is linked to the current account
+                else if($user && $user->userID == WCF::getUser()) {
+                        WCF::getTPL()->append('additionalFields', '<fieldset>
+                                <legend>'.WCF::getLanguage()->get('wcf.facebook.title').'</legend>
+                                '.WCF::getLanguage()->get('wcf.facebook.status.connected').'
+                        </fieldset>');
+                }
+
+                // user already exists, but the login is linked to another account
+                else {
+                        WCF::getTPL()->append('additionalFields', '<fieldset>
+                                <legend>'.WCF::getLanguage()->get('wcf.facebook.title').'</legend>
+                                '.WCF::getLanguage()->getDynamicVariable('wcf.facebook.status.alreadyAssigned', array(
+                                        'username' => $user->username
+                                )).'
+                        </fieldset>');
+                }
+        }
+
+        /**
+         * @see UserLoginForm::readData
+         */
+        public static function loginOrRegister($eventObj) {
+
+                $session = self::getSession();
+
+                $me = null;
+                $uid = array();
+
+                // Session based API call.
+                if ($session) {
+                        try {
+                                $uid = self::$facebook->getUser();
+                                $me = self::$facebook->api('/me');
+                        } catch (FacebookApiException $e) {
+                                error_log($e);
+                        }
+                }
+
+                // no permissions granted, ask for login
+                if(!$me) {
+                        $loginUrl = self::$facebook->getLoginUrl(array(
+                                'req_perms' => 'email',
+                                'display' => 'popup'
+                        ));
+
+                        WCF::getTPL()->assign(array(
+                                'session' => $session,
+                                'loginUrl' => $loginUrl,
+                        ));
+
+                        WCF::getTPL()->append('additionalFields', WCF::getTPL()->fetch('facebookLogin'));
+                        return;
+                }
+
+                // facebook permissions granted, does an login exist?
+                $user = self::getFacebookEnabledUser($me);
 
                 // facebook permissions granted but no login exists
@@ -150 +266 @@
                         // facebook is ultimativly trusted, if you get an account there,
                         // you can get the account with the same email here!
-                        $user = $this->getEmailUser($me);
+                        $user = self::getEmailUser($me);
 
                         // totally unknown, add a new user
                         if(!$user) {
-                                $user = $this->registerUser($me);
+                                $user = self::registerUser($me);
                         }
 
                         // update avatar
-                        $this->updateAvatar('https://graph.facebook.com/'.$me['id'].'/picture', $user);
+                        self::updateAvatar('https://graph.facebook.com/'.$me['id'].'/picture', $user);
 
                         // either user is new, oder just got a link, but add a facebook link
-                        $this->addFacebookUser($me['id'], $user);
+                        self::addFacebookUser($me['id'], $user);
                 }
 
@@ -167 +283 @@
 
                         // UserLoginForm should not write cookie, since interfaces only support unhashed password
-                        $this->eventObj->useCookies = 0;
+                        $eventObj->useCookies = 0;
 
                         // set cookies
@@ -174 +290 @@
 
                         // save cookie and redirect
-                        $this->eventObj->user = $user;
-                        $this->eventObj->save();
+                        $eventObj->user = $user;
+                        $eventObj->save();
 
                         exit;
@@ -187 +303 @@
          * @return      string
          */
-        protected function findUsername($username) {
+        protected static function findUsername($username) {
                 if(!UserUtil::isValidUsername($username)) {
                         return null;
@@ -198 +314 @@
                 // try to increase last digit
                 if(preg_match('/(\d+)$/', $username, $res)) {
-                        return $this->findUsername(preg_replace('/(\d+)/', ($res[1] + 1), $username));
+                        return self::findUsername(preg_replace('/(\d+)/', ($res[1] + 1), $username));
                 } else {
-                        return $this->findUsername($username.'2');
+                        return self::findUsername($username.'2');
                 }
         }
@@ -210 +326 @@
          * @return      User
          */
-        protected function registerUser($me) {
+        protected static function registerUser($me) {
                 $user = null;
                 // get a valid username
-                $username = $this->findUsername($me['name']);
+                $username = self::findUsername($me['name']);
 
                 // create new user
                 if($username) {
-                        $user = $this->createNewUser(
+                        $user = self::createNewUser(
                                 $username,
                                 $me['email'],
@@ -236 +352 @@
          * @return      User
          */
-        protected function createNewUser($username, $email, $facebookLink) {
+        protected static function createNewUser($username, $email, $facebookLink) {
 
                 $password = UserRegistrationUtil::getNewPassword((REGISTER_PASSWORD_MIN_LENGTH > 9 ? REGISTER_PASSWORD_MIN_LENGTH : 9));
@@ -246 +362 @@
                 $additionalFields['registrationIpAddress'] = WCF::getSession()->ipAddress;
 
-                $visibleLanguages = $this->getAvailableLanguages();
+                $visibleLanguages = self::getAvailableLanguages();
                 $visibleLanguages = array_keys($visibleLanguages);
                 $addDefaultGroups = true;
@@ -287 +403 @@
          * @return      array
          */
-        protected function getAvailableLanguages() {
+        protected static function getAvailableLanguages() {
                 $availableLanguages = array();
                 foreach (Language::getAvailableLanguages(PACKAGE_ID) as $language) {
@@ -306 +422 @@
          * @return      boolean
          */
-        protected function updateAvatar($avatarURL, $user) {
+        protected static function updateAvatar($avatarURL, $user) {
                 // existing avatar? skip facebook download
                 if ($user->avatarID || empty($avatarURL)) {

facebook/package.xml

@@ -6 +6 @@
                 <packagedescription language="de"><![CDATA[Dieses Plugin verbindet Facebook mit dem WCF. So ist z.B. ein Direktlogin via Facebook möglich.]]></packagedescription>
                 <packagedescription><![CDATA[This enables all users to login with their facebook account.]]></packagedescription>
-                <version>2.0.0 RC 1</version>
+                <version>2.0.0 RC 2</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -21 +21 @@
         </requiredpackages>
 <!--
-        <optionalpackages>              
-                <optionalpackage file="optionals/org.gnex.facebook.auth.wbb.tar.gz">org.gnex.facebook.auth.wbb</optionalpackage>
+        <optionalpackages>
                 <optionalpackage file="optionals/org.gnex.facebook.auth.profile.tar.gz">org.gnex.facebook.auth.profile</optionalpackage>
         </optionalpackages>
@@ -34 +33 @@
                 <eventlistener>eventlistener.xml</eventlistener>
                 <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
         </instructions>
+
+        <instructions type="update" fromversion="2.0.0 RC 1">
+                <files>files.tar</files>
+                <eventlistener>eventlistener.xml</eventlistener>
+                <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
+                <languages languagecode="en">en.xml</languages>
+        </instructions>
+
         <instructions type="update" fromversion="1.1.3">
                 <files>files.tar</files>
@@ -45 +54 @@
                 <eventlistener>eventlistener.xml</eventlistener>
                 <languages languagecode="de">de.xml</languages>
+                <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
                 <usercpmenu>usercpmenu.xml</usercpmenu>