Changeset 32

Timestamp:

09/30/07 00:15:36 (6 years ago)

Author:

d0nut

Message:

updated trackback to 0.3.
new trackbacks are sent correctly, old trackbacks are not repeated.

Location:

trackback

Files:

• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• eventlistener.xml (modified) (1 diff)
• files/lib/system/event/listener/ThreadAddFormTrackbackListener.class.php (modified) (6 diffs)
• files/lib/system/event/listener/ThreadPageTrackbackListener.class.php (modified) (1 diff)
• files/lib/util/TrackbackUtil.class.php (modified) (3 diffs)
• install.sql (modified) (1 diff)
• package.xml (modified) (2 diffs)
• templates/postTrackbackSetting.tpl (modified) (1 diff)

trackback/de.xml

@@ -17 +17 @@
         <category name="wbb.threadAdd">
                 <item name="wbb.threadAdd.settings.hasTrackback"><![CDATA[Trackback aktivieren]]></item>
-                <item name="wbb.threadAdd.settings.hasTrackback.description"><![CDATA[]]></item>
+                <item name="wbb.threadAdd.settings.hasTrackback.description"><![CDATA[Trackbacks erlauben ihnen automatisch Nachrichten und Backlinks auszutauschen. Optional können Sie Trackbacks direkt versenden.]]></item>
                 <item name="wbb.threadAdd.settings.trackbackUrls"><![CDATA[Trackbacks senden an]]></item>
                 <item name="wbb.threadAdd.settings.trackbackUrls.description"><![CDATA[Mehrere URLs trennen Sie bitte mit einem Zeilenumbruch.]]></item>

trackback/en.xml

@@ -17 +17 @@
         <category name="wbb.threadAdd">
                 <item name="wbb.threadAdd.settings.hasTrackback"><![CDATA[activete trackbacks]]></item>
-                <item name="wbb.threadAdd.settings.hasTrackback.description"><![CDATA[]]></item>
+                <item name="wbb.threadAdd.settings.hasTrackback.description"><![CDATA[Trackbacks allow you to automatically receive messages and backlinks. Optionally you can send trackbacks directly.]]></item>
                 <item name="wbb.threadAdd.settings.trackbackUrls"><![CDATA[send trackbacks to]]></item>
                 <item name="wbb.threadAdd.settings.trackbackUrls.description"><![CDATA[Please divide multiple urls with a linebreak.]]></item>

trackback/eventlistener.xml

@@ -23 +23 @@
                         <eventclassname>ThreadAddForm</eventclassname>
                         <inherit>1</inherit>
-                        <eventname>saved</eventname>
+                        <eventname>readData</eventname>
                         <listenerclassfile>lib/system/event/listener/ThreadAddFormTrackbackListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener>
-                        <eventclassname>PostEditForm</eventclassname>
-                        <eventname>readData</eventname>
+                        <eventclassname>ThreadAddForm</eventclassname>
+                        <inherit>1</inherit>
+                        <eventname>saved</eventname>
                         <listenerclassfile>lib/system/event/listener/ThreadAddFormTrackbackListener.class.php</listenerclassfile>
                 </eventlistener>

trackback/files/lib/system/event/listener/ThreadAddFormTrackbackListener.class.php

@@ -20 +20 @@
         protected $trackbackUrls = "";
         protected $trackbackUrlsOld = "";
-        protected $trackbackData = "";
+
         protected $url, $title, $excerpt, $author;
 
@@ -50 +50 @@
          */
         protected function readData () {
-                if (!count($_POST)) {
-                        $this->hasTrackback = $this->eventObj->post->hasTrackback;
-                        $this->trackbackUrls = $this->eventObj->post->trackbackUrls;
-                        
-                        // remember old trackback urls
-                        $this->trackbackUrlsOld = $this->eventObj->post->trackbackUrls
-                }
+                $this->hasTrackback = $this->eventObj->post->hasTrackback;
+                $this->trackbackUrls = $this->eventObj->post->trackbackUrls;
+                $this->trackbackUrlsOld = $this->eventObj->post->trackbackUrls;
         }
 
@@ -65 +61 @@
                 if (isset($_REQUEST['hasTrackback'])) $this->hasTrackback = intval($_REQUEST['hasTrackback']);
                 if (isset($_REQUEST['trackbackUrls'])) $this->trackbackUrls = $_REQUEST['trackbackUrls'];
+                if (isset($_REQUEST['trackbackUrlsOld'])) $this->trackbackUrlsOld = $_REQUEST['trackbackUrlsOld'];
         }
         
@@ -73 +70 @@
                 WBBCore::getTPL()->assign(array(
                                 'hasTrackback' => $this->hasTrackback,
-                                'trackbackUrls', $this->trackbackUrls
+                                'trackbackUrls'=> $this->trackbackUrls
                         ));
                 WBBCore::getTPL()->append('additionalSettings', WBBCore::getTPL()->fetch('postTrackbackSetting'));
@@ -99 +96 @@
                 // send new trackbacks to given urls
                 $this->discoverNewTrackbacks();
-                
-                // prepare given urls for database usage
-                $urls = addslashes($this->trackbackUrls);
 
                 // UPDATE
                 $sql = "UPDATE          wbb".WBB_N."_post
                         SET             hasTrackback    = {$this->hasTrackback},
-                                        trackbackUrls   = '{$urls}'
+                                        trackbackUrls   = '".escapeString($this->trackbackUrls)."'
                         WHERE           postID          = {$postID};";
 
@@ -131 +125 @@
          */
         private function discoverNewTrackbacks() {
+                $newlist = explode(' ', $this->trackbackUrls);
                 $oldlist = explode(' ', $this->trackbackUrlsOld);
                 
                 // Trackback
                 $trackback = new TrackbackUtil(PAGE_TITLE, $this->author, CHARSET);
-                $tb_array = $trackback->auto_discovery($this->trackbackUrls);
+                //$tb_array = $trackback->auto_discovery($this->eventObj->post->message);
                 
                 // Found trackbacks in TEXT. Looping...
-                foreach($tb_array as $tb_key => $tb_url) {
-
-                        // skip existing trackbacks
-                        if(in_array($tb_url, $oldlist)) {
-                                continue;
-                        }
-                        
+                foreach(array_diff($newlist, $oldlist) as $tb_url) {
                         // Attempt to ping each new one...
                         $trackback->ping($tb_url, $this->url, $this->title, $this->excerpt);

trackback/files/lib/system/event/listener/ThreadPageTrackbackListener.class.php

@@ -39 +39 @@
                 $excerpt = StringUtil::substring($row['firstPostPreview'],0,255);
                 $author = $row['username'];
-                $date = date("r", $row['time']);
+                $date = date("r", intval($row['time']));
                 $trackbackUrl = sprintf('index.php?action=Trackback&threadID=%d', $row['threadID']);
                 $url = $row['url'];
 
                 // Trackback
-                $trackback = new TrackbackUtil(PAGE_TITLE, $this->author, CHARSET);
+                $trackback = new TrackbackUtil(PAGE_TITLE, WCF::getUser()->username, CHARSET);
                 $rdf = $trackback->rdf_autodiscover($date, $title, $excerpt, $url, $trackbackUrl, $author);
 

trackback/files/lib/util/TrackbackUtil.class.php

@@ -24 +24 @@
         
         /**
+         * Sends a trackback ping to a specified trackback URL.
+         * allowing clients to auto-discover the TrackBack Ping URL. 
+         * 
+         * @param string $tb 
+         * @param string $url 
+         * @param string $title 
+         * @param string $excerpt 
+         * @return boolean 
+         */
+        public function ping($tb, $url, $title = "", $excerpt = "") {
+                $target = parse_url($tb);
+                if(!array_key_exists('path', $target)) {
+                        $tb .= '/';
+                }
+                
+                @parent::ping($tb, $url, $title, $excerpt);
+        }
+        
+        /**
          * @param postIDs
-         * @return u
+         * @return array
          */
-        public getPost($postIDs) {
+        public function getPost($postIDs) {
                 if(!is_array($postIDs))
                         $postIDs = array($postIDs);
@@ -36 +55 @@
                         LEFT JOIN       wbb".WBB_N."_thread thread
                         ON              (thread.threadID=post.threadID)
-                        WHERE           postID IN (".$postIDs."); ";
+                        WHERE           postID IN (".implode(',', $postIDs)."); ";
 
                 $row = WCF::getDB()->getFirstRow($sql);
                                 
                 // build thread url
-                if($row && defined('SEO_REWRITE_THREAD') && SEO_REWRITE_THREAD && file_exists(WCF_DIR.'lib/page/PublicSEORewriter.class.php')) {
+                if($row && defined('SEO_ENABLED') && SEO_ENABLED && defined('SEO_REWRITE_THREAD') && SEO_REWRITE_THREAD && file_exists(WCF_DIR.'lib/page/PublicSEORewriter.class.php')) {
                         require_once(WCF_DIR.'lib/page/PublicSEORewriter.class.php');
                         $rewriter = new PublicSEORewriter();
@@ -49 +68 @@
                         
                         // public seo rewriter use
-                        return $rewriter->publicParseThreadURLs($row['threadID'], '');
+                        $row['url'] = $rewriter->publicParseThreadURLs($row['threadID'], '');
                 }
                 else if($row) {
-                        return sprintf('index.php?page=Thread&threadID=%d', $row['threadID']);
+                        $row['url'] = sprintf('index.php?page=Thread&threadID=%d', $row['threadID']);
                 }
                 

trackback/install.sql

@@ -12 +12 @@
   errorCount tinyint(1) unsigned NOT NULL,
   isSpam  tinyint(1) unsigned NOT NULL,
-  PRIMARY KEY (threadID, url)
+  PRIMARY KEY (postID, url)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 

trackback/package.xml

@@ -5 +5 @@
                 <packagename>Trackback</packagename>
                 <packagedescription>Allow trackback for posts</packagedescription>
-                <version>0.0.2</version>
+                <version>0.0.3</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wbb</plugin>
@@ -21 +21 @@
         
         <optionalpackages>
-                <optionalpackage file="optionals/de.easy-coding.wcf.data.page.publicseorewriter.tar.gz">de.easy-coding.wcf.data.page.publicseorewriter</optionalpackage>
+                <optionalpackage file="optionals/de.easy-coding.wcf.data.page.publicseorewriter.tar.gz" minversion="1.0.1">de.easy-coding.wcf.data.page.publicseorewriter</optionalpackage>
         </optionalpackages>
         

trackback/templates/postTrackbackSetting.tpl

@@ -1 +1 @@
 {if $this->user->getPermission('user.board.canTrackback')}
-        <div class="formCheckBox">
                 <div class="formField">
-                        <label><input type="checkbox" name="hasTrackback" value="1" {if $hasTrackback == 1}checked="checked" {/if}/> {lang}wbb.threadAdd.settings.hasTrackback{/lang}</label>
+                        <label><input type="checkbox" onchange="document.getElementById('trackbackSetting').style.display = (this.checked?'block':'none');" name="hasTrackback" value="1" {if $hasTrackback}checked="checked" {/if}/> {lang}wbb.threadAdd.settings.hasTrackback{/lang}</label>
+                        
                 </div>
                 <div class="formFieldDesc">
                         {lang}wbb.threadAdd.settings.hasTrackback.description{/lang}
                 </div>
-        </div>
 
-        <div class="formElement">
-                <div class="formFieldLabel">
-                        <label for="trackbackUrls">{lang}wbb.threadAdd.settings.trackbackUrls{/lang}</label>
+                <div id="trackbackSetting" {if !$hasTrackback}style="display:none"{/if}>
+                        <div class="formField">
+                                &nbsp;
+                        </div>
+                        <div class="formFieldDesc">
+                                <input type="hidden" name="trackbackUrls" value="{$trackbackUrls}" />
+                                <textarea name="trackbackUrls" id="trackbackUrls" rows="3" cols="20">{$trackbackUrls}</textarea><br />
+                                <p>{lang}wbb.threadAdd.settings.trackbackUrls{/lang} - {lang}wbb.threadAdd.settings.trackbackUrls.description{/lang}</p>
+                        </div>
                 </div>
-
-                <div class="formField">
-                        <textarea name="trackbackUrls" id="trackbackUrls" rows="3" cols="20">{@$trackbackUrls}</textarea>
-                </div>
-                <div class="formFieldDesc">
-                        <p>{lang}wbb.threadAdd.settings.trackbackUrls.description{/lang}</p>
-                </div>
-        </div>
 {/if}