Changeset 1219

Timestamp:

09/11/10 19:12:29 (3 years ago)

Author:

d0nut

Message:

twitter 1.1.2

Location:

twitter/requirements/de.easy-coding.wcf.twitter

Files:

• files/lib/system/cache/CacheBuilderTwitter.class.php (modified) (4 diffs)
• package.xml (modified) (3 diffs)
• templates/twitter.tpl (modified) (3 diffs)

twitter/requirements/de.easy-coding.wcf.twitter/files/lib/system/cache/CacheBuilderTwitter.class.php

@@ -2 +2 @@
 // WCF include
 require_once(WCF_DIR.'lib/system/cache/CacheBuilder.class.php');
+require_once(WCF_DIR.'lib/data/message/bbcode/URLParser.class.php');
+require_once(WCF_DIR.'lib/data/message/bbcode/MessageParser.class.php');
+
 
 // Utils
@@ -15 +18 @@
 class CacheBuilderTwitter implements CacheBuilder {
 
+                var $message;
+
         /**
          * @see CacheBuilder::getData()
@@ -21 +26 @@
                 $twitter = TwitterUtil::getInstance();
                 $store = array();
+                                /* HTML Parser */
+                                $parser = MessageParser::getInstance();
+                                $parser->setOutputType('text/html');
 
-                /* usertimeline */
+               /* usertimeline inclusive URL Parser */
                 $result = $twitter->getUserTimeline('xml');
                 $dom = simplexml_load_string($result);
                 if(!isset($dom->error)) foreach($dom->status as $status) {
-                        $store['usertimeline'][intval($status->id)] = array(
+                                $message=$parser->parse(URLParser::parse($status->text), false, true);
+
+                        $store['usertimeline'][(string)$status->id] = array(
                                 'created_at' => strtotime($status->created_at),
-                                'text' => (string)$status->text,
+                                'text' =>(string)$message,
                                 'favorited' => (boolean)$status->favorited,
                                 'user' => array(
@@ -38 +48 @@
                         );
                 }
-
                 return $store;
         }

twitter/requirements/de.easy-coding.wcf.twitter/package.xml

@@ -8 +8 @@
                 <packagedescription language="de"><![CDATA[Twitter ist ein soziales Netzwerk und ein Mikro-Blogging-Dienst.]]></packagedescription>
                 <packagedescription language="de-informal"><![CDATA[Twitter ist ein soziales Netzwerk und ein Mikro-Blogging-Dienst.]]></packagedescription>
-                <version>1.1.0</version> <!-- codename: Twitter (WCF) -->
+                <version>1.1.2</version> <!-- codename: Twitter (WCF) -->
                 <packageurl><![CDATA[http://community.woltlab.com/db/index.php?page=Project&projectID=673]]></packageurl>
                 <date>DATE</date>
@@ -23 +23 @@
         </licenseinformation>
         <authorinformation>
-                <author><![CDATA[Torben Brodt]]></author>
+                <author><![CDATA[Torben Brodt, Technikboard.net]]></author>
                 <authorURL><![CDATA[http://trac.easy-coding.de/trac/wcf]]></authorURL>
         </authorinformation>
@@ -49 +49 @@
                 <languages languagecode="de-informal">de-informal.xml</languages>
                 <languages languagecode="en">en.xml</languages>
+        </instructions>
+        <instructions type="update" fromversion="1.1.0">
+                <!-- files -->
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
+        </instructions>
+        <instructions type="update" fromversion="1.1.1">
+                <!-- files -->
+                <files>files.tar</files>
+                <templates>templates.tar</templates>
         </instructions>
         <instructions type="update" fromversion="1.0.1">

twitter/requirements/de.easy-coding.wcf.twitter/templates/twitter.tpl

@@ -3 +3 @@
         <title>{lang}wcf.twitter.title{/lang} - {lang}{PAGE_TITLE}{/lang}</title>
         {include file='headInclude' sandbox=false}
+<style type="text/css">
+ <!--
+.twitterContainer ul li {
+ list-style: none;
+ border-bottom: dashed 1px #8da4b7;
+ font-size: 1em;
+ padding: 7px;
+}
+
+.twitterContainer ul li:hover {
+ background: #f8fafb;
+}
+-->
+</style>
 </head>
 <body{if $templateName|isset} id="tpl{$templateName|ucfirst}"{/if}>
@@ -8 +22 @@
 
 <div id="main">
-        
+
         <ul class="breadCrumbs">
                 <li><a href="index.php?page=Index{@SID_ARG_2ND}"><img src="{icon}indexS.png{/icon}" alt="" /> <span>{lang}{PAGE_TITLE}{/lang}</span></a> &raquo;</li>
         </ul>
-        
+
         <div class="mainHeadline">
                 <img src="{icon}twitterL.png{/icon}" alt="" />
@@ -20 +34 @@
                 </div>
         </div>
-        
+
         {if $userMessages|isset}{@$userMessages}{/if}
-        
+
         <div class="border content">
                 <div class="container-1">
-                        <a href="http://twitter.com/{TWITTER_USER}"><img src="{icon}twitter_logo_s.png{/icon}" alt="" /></a>
+                        <div class="twitterContainer">
+                        <a href="http://twitter.com/{TWITTER_USER}"><img src="{icon}twitter_logo_s.png{/icon}" alt="Follow Technikboard on Twitter" /></a>
 
                         <fieldset>
                                 <legend>{lang}wcf.twitter.usertimeline{/lang}</legend>
-                                
+
                                 <ul>
                                 {if $twitters.usertimeline|isset}{foreach from=$twitters.usertimeline item=post}
-                                        <li>{@$post.created_at|time} - {$post.text}</li>
+                                        <li>{@$post.created_at|time} - {@$post.text}</li>
                                 {/foreach}{/if}
                                 </ul>
                         </fieldset>
-                        
+
                         {if $additionalBoxes|isset}{@$additionalBoxes}{/if}
+                        </div>
                 </div>
         </div>