Changeset 1290

Timestamp:

02/12/11 19:41:00 (2 years ago)

Author:

Torben Brodt

Message:

facebook api is so close to oath, based on the facebook plugin i could implement the twitter api integration within less than 1 hour

Location:

twitter

Files:

• LICENSE (moved) (moved from twitter/LICENSE.txt)
• de.xml (modified) (2 diffs)
• en.xml (modified) (2 diffs)
• eventlistener.xml (modified) (1 diff)
• files/lib/data/twitter/Twitter.class.php (modified) (1 diff)
• files/lib/data/twitter/TwitterSearch.class.php (added)
• files/lib/data/twitter/TwitterSearchResult.class.php (added)
• files/lib/data/twitter/ViewableTwitter.class.php (added)
• files/lib/util (added)
• files/lib/util/TwitterUtil.class.php (added)
• install.sql (modified) (1 diff)
• package.xml (modified) (1 diff)
• pagemenu.xml (modified) (1 diff)
• smt.xml (modified) (1 diff)
• templates/searchResultTwitter.tpl (added)
• templates/twitterLogin.tpl (added)

twitter/de.xml

@@ -7 +7 @@
                 <item name="wcf.acp.option.category.twitter"><![CDATA[Twitter]]></item>
                 <item name="wcf.acp.option.category.twitter.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.twitter_appid"><![CDATA[Applicaton Id]]></item>
-                <item name="wcf.acp.option.twitter_appid.description"><![CDATA[Geben Sie hier die Anwendungs-ID ein, die Sie auf <a href="http://wiki.developers.twitter.com/index.php/Connect/Setting_Up_Your_Site">Twitter</a> erhalten haben.]]></item>
-                <item name="wcf.acp.option.twitter_secret"><![CDATA[Geheimcode]]></item>
-                <item name="wcf.acp.option.twitter_secret.description"><![CDATA[Geben Sie hier den Anwendungs-Geheimcode ein, den Sie auf <a href="http://wiki.developers.twitter.com/index.php/Connect/Setting_Up_Your_Site">Twitter</a> erhalten haben.]]></item>
+                <item name="wcf.acp.option.twitter_consumer_key"><![CDATA[Consumer Key]]></item>
+                <item name="wcf.acp.option.twitter_consumer_key.description"><![CDATA[Geben Sie hier den Consumer Key ein, die Sie auf <a href="http://dev.twitter.com/apps">Twitter</a> erhalten haben.]]></item>
+                <item name="wcf.acp.option.twitter_consumer_secret"><![CDATA[Consumer Secret]]></item>
+                <item name="wcf.acp.option.twitter_consumer_secret.description"><![CDATA[Geben Sie hier das Consumer Secret ein, das Sie auf <a href="http://dev.twitter.com/apps">Twitter</a> erhalten haben.]]></item>
         </category>
         <category name="wcf.twitter">
@@ -17 +17 @@
                 <item name="wcf.twitter.status.alreadyAssigned"><![CDATA[Der Benutzer &laquo;{$username}&raquo; benutzt ihren Twitter Login bereits.]]></item>
                 <item name="wcf.twitter.status.alreadyEmail"><![CDATA[Der Benutzer &laquo;{$username}&raquo; benutzt ihre bei Twitter hinterlegte E-Mail Adresse bereits.]]></item>
+                <item name="wcf.twitter.search.query"><![CDATA[Twitter durchsuchen]]></item>
+        </category>
+        <category name="wcf.search">
+                <item name="wcf.search.type.twitterEntry"><![CDATA[Twitter]]></item>
         </category>
 </language>

twitter/en.xml

@@ -7 +7 @@
                 <item name="wcf.acp.option.category.twitter"><![CDATA[Twitter]]></item>
                 <item name="wcf.acp.option.category.twitter.description"><![CDATA[]]></item>
-                <item name="wcf.acp.option.twitter_appid"><![CDATA[Applicaton Id]]></item>
-                <item name="wcf.acp.option.twitter_appid.description"><![CDATA[Enter your AppID.]]></item>
-                <item name="wcf.acp.option.twitter_secret"><![CDATA[Secret Key]]></item>
-                <item name="wcf.acp.option.twitter_secret.description"><![CDATA[Enter your SecretKey.]]></item>
+                <item name="wcf.acp.option.twitter_consumer_key"><![CDATA[Consumer key]]></item>
+                <item name="wcf.acp.option.twitter_consumer_key.description"><![CDATA[Enter your Consumer key.]]></item>
+                <item name="wcf.acp.option.twitter_consumer_secret"><![CDATA[Consumer secret]]></item>
+                <item name="wcf.acp.option.twitter_consumer_secret.description"><![CDATA[Enter your Consumer secret.]]></item>
         </category>
         <category name="wcf.twitter">
@@ -17 +17 @@
                 <item name="wcf.twitter.status.alreadyAssigned"><![CDATA[Your twitter login was already linked with the user &laquo;{$username}&raquo;.]]></item>
                 <item name="wcf.twitter.status.alreadyEmail"><![CDATA[The email address you use in twitter is already assigned to the user &laquo;{$username}&raquo;.]]></item>
+                <item name="wcf.twitter.search.query"><![CDATA[Search Twitter]]></item>
+        </category>
+        <category name="wcf.search">
+                <item name="wcf.search.type.twitterEntry"><![CDATA[Twitter]]></item>
         </category>
 </language>

twitter/eventlistener.xml

@@ -3 +3 @@
 <data>
         <import>
+                <eventlistener>
+                        <eventclassname>UserLoginForm</eventclassname>
+                        <eventname>readData</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginTwitterListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>AccountManagementForm</eventclassname>
+                        <eventname>validate</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginTwitterListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>AccountManagementForm</eventclassname>
+                        <eventname>assignVariables</eventname>
+                        <listenerclassfile>lib/system/event/listener/UserLoginTwitterListener.class.php</listenerclassfile>
+                </eventlistener>
                 <eventlistener>
                         <eventclassname>UserProfileEditForm</eventclassname>

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

@@ -10 +10 @@
 class Twitter extends EpiTwitter {
 
+        /**
+         * @var Twitter
+         */
+        protected $instance = null;
+
+        /**
+         * @return Twitter
+         */
+        public static function getInstance() {
+                if(self::$instance === null) {
+                        self::$instance = new self(TWITTER_CONSUMER_KEY, TWITTER_CONSUMER_SECRET);
+                }
+                return self::$instance;
+        }
 }

twitter/install.sql

@@ -11 +11 @@
         userID INT(10) NOT NULL,
         groupID INT(10) NOT NULL DEFAULT 0,
-        subject VARCHAR(255) NOT NULL DEFAULT '',
         message TEXT NULL,
         time INT(10) NOT NULL DE
+        FULLTEXT KEY (message),
         KEY (userID),
-        KEY (groupID),
-        KEY (state)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS wcf1_retweet_user;
-CREATE TABLE wcf1_retweet_user (
-        twitterUserID INT(10) NOT NULL PRIMARY KEY,
-        name VARCHAR(255) NOT NULL DEFAULT '',
-        screen_name VARCHAR(255) NOT NULL DEFAULT '',
-        profile_image_url VARCHAR(255) NOT NULL DEFAULT ''
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-

twitter/package.xml

@@ -33 +33 @@
                 <!-- languages -->
                 <languages languagecode="de">de.xml</languages>
-                <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
         </instructions>

twitter/pagemenu.xml

@@ -7 +7 @@
                         <iconsmall>twitterS.png</iconsmall>
                         <position>header</position>
-                        <permissions>user.twitter.canViewTwitterPage</permissions>
                         <link>index.php?page=Twitter</link>
                         <options>module_twitter</options>

twitter/smt.xml

@@ -3 +3 @@
 <data>  
         <import>
-                <smt name="contestEntry">
-                        <classpath>lib/data/contest/ContestSearch.class.php</classpath>
+                <smt name="twitterEntry">
+                        <classpath>lib/data/twitter/TwitterSearch.class.php</classpath>
                 </smt>
         </import>