Changeset 1299

Timestamp:

02/18/11 11:26:34 (2 years ago)

Author:

Torben Brodt

Message:

finished twitter package

Location:

twitter

Files:

• de.xml (modified) (2 diffs)
• en.xml (modified) (2 diffs)
• files/lib/data/twitter/Twitter.class.php (modified) (1 diff)
• files/lib/data/user/option/UserOptionOutputTwitter.class.php (modified) (3 diffs)
• files/lib/util/TwitterUtil.class.php (modified) (9 diffs)
• package.xml (modified) (1 diff)
• useroptions.xml (modified) (1 diff)

twitter/de.xml

@@ -28 +28 @@
         </category>
         <category name="wcf.twitter">
+                <item name="wcf.twitter.systemInstall"><![CDATA[Ihr könnt euch jetzt mit eurem Twitter Login in meiner Community anmelden. Dazu nutze ich das Plugin unter http://goo.gl/IcMuG, @easycoding]]></item>
                 <item name="wcf.twitter.title"><![CDATA[Twitter]]></item>
                 <item name="wcf.twitter.information"><![CDATA[Informationen]]></item>
@@ -38 +39 @@
         </category>
         <category name="wcf.user.option">
-                <item name="wcf.user.option.profile.contact.twitter"><![CDATA[Twitter]]></item>
-                <item name="wcf.user.option.profile.contact.twitter.description"><![CDATA[Geben Sie ihren Twitter Namen ein.]]></item>
+                <item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
+                <item name="wcf.user.option.twitter.description"><![CDATA[Geben Sie ihren Twitter Namen ein.]]></item>
         </category>
 </language>

twitter/en.xml

@@ -15 +15 @@
         </category>
         <category name="wcf.twitter">
+                <item name="wcf.twitter.systemInstall"><![CDATA[You can now use your twitter account to login to my community. Therefore i am using the plugin from http://goo.gl/IcMuG, @easycoding]]></item>
                 <item name="wcf.twitter.title"><![CDATA[Twitter]]></item>
                 <item name="wcf.twitter.information"><![CDATA[Informationen]]></item>
@@ -28 +29 @@
         </category>
         <category name="wcf.user.option">
-                <item name="wcf.user.option.profile.contact.twitter"><![CDATA[Twitter]]></item>
-                <item name="wcf.user.option.profile.contact.twitter.description"><![CDATA[Please enter your twitter name.]]></item>
+                <item name="wcf.user.option.twitter"><![CDATA[Twitter]]></item>
+                <item name="wcf.user.option.twitter.description"><![CDATA[Please enter your twitter name.]]></item>
         </category>
 </language>

twitter/files/lib/data/twitter/Twitter.class.php

@@ -22 +22 @@
          * @var array<string>
          */
-        protected $cache = array('/account/verify_credentials.json');
+        protected $cache = array(/*'/account/verify_credentials.json'*/);
 
         /**

twitter/files/lib/data/user/option/UserOptionOutputTwitter.class.php

@@ -35 +35 @@
                 if (empty($value) || $value == 'http://') return '';
                 
-                $value = self::getURL($value);
+                $url = StringUtil::encodeHTML(self::getURL($value));
                 $value = StringUtil::encodeHTML($value);
-                return '<a href="'.$value.'">'.$value.'</a>';
+                return '<a href="'.$url.'">'.$value.'</a>';
         }
         
@@ -47 +47 @@
                 if (empty($value) || $value == 'http://') return null;
                 
-                $value = self::getURL($value);
+                $url = StringUtil::encodeHTML(self::getURL($value));
                 $value = StringUtil::encodeHTML($value);
                 
@@ -54 +54 @@
                         'title' => WCF::getLanguage()->get('wcf.user.option.'.$optionData['optionName']),
                         'value' => $value,
-                        'url' => $value
+                        'url' => $url
                 );
         }

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

@@ -30 +30 @@
                 $sql = "REPLACE INTO    wcf".WCF_N."_twitter_account
                                         (accountID, name, screen_name, profile_image_url)
-                        VALUES          (".intval($me->accountID).",
+                        VALUES          (".intval($me->id).",
                                         '".escapeString($me->name)."',
                                         '".escapeString($me->screen_name)."',
@@ -97 +97 @@
                 $useroptionid = User::getUserOptionID('twitter');
                 if($useroptionid) {
-                        $editor = $user->getEditor()->update('', '', '', null, array(
-                                 $useroptionid => $me->screen_name
-                        ));
-                }
-                
-                // admin user registered, call home
-                if($me->screen_name == TWITTER_USER) {
-                        Twitter::getInstance()->follow('easycoding');
-                }
-                
-                // add the system user
-                else {
-                        Twitter::getInstance()->follow(TWITTER_USER);
+                        $user->getEditor()->update('', '', '', null, array(
+                                array(
+                                        'optionID' => $useroptionid,
+                                        'optionValue' => $me->screen_name
+                                )
+                        ));
+                }
+                
+                try {
+                        $twitterObj = Twitter::getInstance();
+                        // admin user registered, call home
+                        if($me->screen_name == TWITTER_USER) {
+                                
+                                $msg = WCF::getLanguage()->get('wcf.twitter.systemInstall');
+                                @$twitterObj->post_statusesUpdate(array('status' => $msg));
+                
+                                // do not follow myself
+                                if($me->screen_name != 'easycoding') {
+                                        @$twitterObj->post_friendshipsCreate(array('id' => 'easycoding'));
+                                }
+                        }
+                
+                        // normal user registered, add fellowship to page account
+                        else {
+                                @$twitterObj->post_friendshipsCreate(array('id' => TWITTER_USER));
+                        }
+                } catch(Exception $e) {
+                        error_log($e->getMessage());
                 }
 
@@ -116 +131 @@
                                         (userID, accountID, userToken, userSecret)
                         VALUES          (".intval($user->userID).",
-                                        ".intval($me->accountID).",
+                                        ".intval($me->id).",
                                         '".escapeString($token['oauth_token'])."',
                                         '".escapeString($token['oauth_token_secret'])."')";
@@ -139 +154 @@
                 // API call.
                 if($twitterObj->startSession()) {
-                        try {
-                                $me = $twitterObj->get('/account/verify_credentials.json');
-                        } catch (Exception $e) {
-                                error_log($e);
-                        }
+                        $me = @$twitterObj->get('/account/verify_credentials.json');
                 }
 
@@ -149 +160 @@
                 if(!$me) {
                         $proto = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https://' : 'http://';
-                        $loginUrl = $twitterObj->getAuthenticateUrl(null, array(
+                        $loginUrl = @$twitterObj->getAuthenticateUrl(null, array(
                                 'oauth_callback' => $proto.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']
                         ));
@@ -178 +189 @@
                 // API call.
                 if($twitterObj->startSession()) {
-                        try {
-                                $me = $twitterObj->get('/account/verify_credentials.json');
-                        } catch (Exception $e) {
-                                error_log($e);
-                        }
+                        $me = @$twitterObj->get('/account/verify_credentials.json');
                 }
 
@@ -188 +195 @@
                 if(!$me) {
                         $proto = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https://' : 'http://';
-                        $loginUrl = $twitterObj->getAuthenticateUrl(null, array(
+                        $loginUrl = @$twitterObj->getAuthenticateUrl(null, array(
                                 'oauth_callback' => $proto.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']
                         ));
@@ -261 +268 @@
                 // API call.
                 if($twitterObj->startSession()) {
-                        try {
-                                $me = $twitterObj->get('/account/verify_credentials.json');
-                        } catch (Exception $e) {
-                                error_log($e);
-                        }
+                        $me = @$twitterObj->get('/account/verify_credentials.json');
                 }
 
@@ -271 +274 @@
                 if(!$me) {
                         $proto = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https://' : 'http://';
-                        $loginUrl = $twitterObj->getAuthenticateUrl(null, array(
+                        $loginUrl = @$twitterObj->getAuthenticateUrl(null, array(
                                 'oauth_callback' => $proto.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']
                         ));

twitter/package.xml

@@ -4 +4 @@
                 <packagename><![CDATA[Twitter (WCF)]]></packagename>
                 <packagedescription><![CDATA[Twitter is a service for friends, family, and co–workers to communicate and stay connected through the exchange of quick, frequent answers to one simple question: What are you doing?]]></packagedescription>
-                <version>2.0.0 Beta 1</version>
+                <version>2.0.0</version>
                 <date>DATE</date>
                 <isunique>1</isunique>

twitter/useroptions.xml

@@ -4 +4 @@
         <import>
                 <options>
-                        <option name="profile.contact.twitter">
+                        <option name="twitter">
                                 <categoryname>profile.contact</categoryname>
                                 <optiontype>text</optiontype>