Changeset 1292

Timestamp:

02/13/11 19:51:43 (2 years ago)

Author:

Torben Brodt

Message:

Sie sind erfolgreich mit Twitter verbunden

Files:

• twitter/files/lib/util/TwitterUtil.class.php (modified) (5 diffs)

twitter/files/lib/util/TwitterUtil.class.php

@@ -28 +28 @@
          * @return      User
          */
-        protected static function getTwitterEnabledUser($me) {
+        protected static function getTwitterEnabledUser($me, $token) {
                 $sql = "SELECT          utt.userID
                         FROM            wcf".WCF_N."_user_to_twitter utt
-                        WHERE           utt.userToken = '".escapeString($me['oauth_token'])."'
-                        API             utt.userSecret = '".escapeString($me['oauth_token_secret'])."'";
+                        WHERE           utt.userToken = '".escapeString($token['oauth_token'])."'
+                        AND             utt.userSecret = '".escapeString($token['oauth_token_secret'])."'";
                 $row = WCF::getDB()->getFirstRow($sql);
 
@@ -63 +63 @@
                 $row = WCF::getDB()->getFirstRow($sql);
 
-                return $row && $row['twitterID'] > 0;
+                return $row;
         }
 
@@ -122 +122 @@
 
                 // twitter permissions granted, does an login exist?
-                $user = self::getTwitterEnabledUser($me);
+                $user = self::getTwitterEnabledUser($me, Twitter::getInstance()->getToken());
 
                 // twitter permissions granted and login is linked with current user
@@ -164 +164 @@
 
                 // twitter permissions granted, does an login exist?
-                $user = self::getTwitterEnabledUser($me);
+                $user = self::getTwitterEnabledUser($me, Twitter::getInstance()->getToken());
 
                 // twitter login not used yet, twitter permissions granted, update account info
@@ -238 +238 @@
 
                 // twitter permissions granted, does an login exist?
-                $user = self::getTwitterEnabledUser($me);
+                $user = self::getTwitterEnabledUser($me, Twitter::getInstance()->getToken());
 
                 // twitter permissions granted but no login exists