Changeset 50

Timestamp:

10/06/07 18:05:49 (6 years ago)

Author:

d0nut

Message:

runnable tagging version with userprofile integration and page integration.

Location:

taggingreloaded

Files:

• de.xml (modified) (1 diff)
• en.xml (modified) (1 diff)
• eventlistener.xml (added)
• files/lib/page/TaggingPage.class.php (modified) (2 diffs)
• files/lib/system/event/listener/TaggingReloadedPageListener.class.php (added)
• files/style/taggingreloaded.css (modified) (2 diffs)
• optionals/de.easy-coding.wbb.taggingreloaded/eventlistener.xml (modified) (1 diff)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/data/thread (added)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/data/thread/ViewableThreadTagging.class.php (added)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBMessageFormListener.class.php (modified) (1 diff)
• optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBPageListener.class.php (moved) (moved from taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedPageListener.class.php) (7 diffs)
• optionals/de.easy-coding.wbb.taggingreloaded/install.sql (modified) (1 diff)
• optionals/de.easy-coding.wbb.taggingreloaded/package.xml (modified) (2 diffs)
• package.xml (modified) (2 diffs)
• templates/messageFormTaggingReloaded.tpl (modified) (1 diff)
• templates/taggingCloud.tpl (modified) (1 diff)
• templates/taggingCloudContainer.tpl (modified) (1 diff)
• templates/taggingReloaded.tpl (modified) (2 diffs)

taggingreloaded/de.xml

@@ -5 +5 @@
                 <item name="wcf.taggingreloaded.tagging"><![CDATA[Tagging]]></item>
                 <item name="wcf.taggingreloaded.description"><![CDATA[Hier finden Sie unsere Tags. Das Ergebnis gemeinschaftlicher Indexierung.]]></item>
+                <item name="wcf.taggingreloaded.notags"><![CDATA[Es sind noch keine Tags verfÃŒgbar.]]></item>
+                <item name="wcf.taggingreloaded.copyright"><![CDATA[Powered by WCF::TaggingReloaded]]></item>
+                <item name="wcf.taggingreloaded.weight"><![CDATA[Gewichtung]]></item>
                 <item name="wcf.taggingreloaded.add"><![CDATA[HinzufÃŒgen]]></item>
                 <item name="wcf.taggingreloaded.fetch"><![CDATA[Auto]]></item>
+        </category>
+        
+        <category name="wcf.user.option">
+                <item name="wcf.user.option.category.tagging"><![CDATA[Tagging]]></item>
+                <item name="wcf.user.option.tagging"><![CDATA[Tagging]]></item>
         </category>
         

taggingreloaded/en.xml

@@ -5 +5 @@
                 <item name="wcf.taggingreloaded.tagging"><![CDATA[Tagging]]></item>
                 <item name="wcf.taggingreloaded.description"><![CDATA[Here you can find our tags. The results of collaborative indexing.]]></item>
+                <item name="wcf.taggingreloaded.notags"><![CDATA[There aren't any tags at the moment.]]></item>
+                <item name="wcf.taggingreloaded.copyright"><![CDATA[Powered by WCF::TaggingReloaded]]></item>
+                <item name="wcf.taggingreloaded.weight"><![CDATA[Weight]]></item>
                 <item name="wcf.taggingreloaded.add"><![CDATA[Add]]></item>
                 <item name="wcf.taggingreloaded.fetch"><![CDATA[Auto]]></item>
+        </category>
+        
+        <category name="wcf.user.option">
+                <item name="wcf.user.option.category.tagging"><![CDATA[Tagging]]></item>
+                <item name="wcf.user.option.tagging"><![CDATA[Tagging]]></item>
         </category>
 

taggingreloaded/files/lib/page/TaggingPage.class.php

@@ -50 +50 @@
                                                 'size'=> 0
                                         );
+                                $i++;
                         }
                         
@@ -61 +62 @@
         public function assignVariables() {
                 parent::assignVariables();
+                
+                if(empty($this->tag)) {
+                        $title = WCF::getLanguage()->get('wcf.header.menu.tagging');
+                        $headline = WCF::getLanguage()->get('wcf.taggingreloaded.tagging');
+                        $desc = WCF::getLanguage()->get('wcf.taggingreloaded.description');
+                } else {
+                        $title = $this->tag . ' - ' . WCF::getLanguage()->get('wcf.header.menu.tagging');
+                        $headline = $this->tag;
+                        $desc = WCF::getLanguage()->get('wcf.taggingreloaded.tagging');
+                }
 
-                WCF::getTPL()->assign('tags', $this->tags);
-                WCF::getTPL()->append('additionalTaggingContents', WCF::getTPL()->fetch('taggingCloud'));               
-                WCF::getTPL()->assign('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
+                WCF::getTPL()->assign(array(
+                        'title' => $title,
+                        'headline' => $headline,
+                        'desc' => $desc,
+                        'tags' => $this->tags,
+                        'specialStyles' => '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />',
+                        'allowSpidersToIndexThisPage' => true
+                        ));
+                
+                WCF::getTPL()->append('additionalTaggingContents', WCF::getTPL()->fetch('taggingCloud'));
         }
         

taggingreloaded/files/style/taggingreloaded.css

@@ -1 @@
-.taggingCloud ul {
+ul.taggingCloud {
  margin:0px;
  padding:0px;
 }
 
-.taggingCloud li {
+ul.taggingCloud li {
   display:inline;
   list-style-type:none;
@@ -10 +10 @@
 }
 
-.taggingCloud li a {
+ul.taggingCloud li a {
   text-decoration:none;
 }
 
-.taggingCloud li a:hover {
+ul.taggingCloud li a:hover {
   text-decoration:underline;
 }

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/eventlistener.xml

@@ -3 +3 @@
 <data>  
         <import>
+                <eventlistener><!-- wcf: tagging page //-->
+                        <eventclassname>TaggingPage</eventclassname>
+                        <eventname>assignVariables</eventname>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>TaggingPage</eventclassname>
+                        <eventname>readData</eventname>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
+                </eventlistener>
+                <eventlistener>
+                        <eventclassname>TaggingPage</eventclassname>
+                        <eventname>readParameters</eventname>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
+                </eventlistener>
                 <eventlistener><!-- wbb: board page //-->
                         <eventclassname>BoardPage</eventclassname>
                         <eventname>assignVariables</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener>
                         <eventclassname>BoardPage</eventclassname>
                         <eventname>readData</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener>
                         <eventclassname>BoardPage</eventclassname>
                         <eventname>readParameters</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener><!-- wbb: thread page //-->
                         <eventclassname>ThreadPage</eventclassname>
                         <eventname>assignVariables</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener>
                         <eventclassname>ThreadPage</eventclassname>
                         <eventname>readData</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 <eventlistener>
                         <eventclassname>ThreadPage</eventclassname>
                         <eventname>readParameters</eventname>
-                        <listenerclassfile>lib/system/event/listener/TaggingReloadedPageListener.class.php</listenerclassfile>
+                        <listenerclassfile>lib/system/event/listener/TaggingReloadedWBBPageListener.class.php</listenerclassfile>
                 </eventlistener>
                 

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBMessageFormListener.class.php

@@ -98 +98 @@
                 
                 // CLEANUP
-                $sql = "DELETE FROM     wbb".WBB_N."_taggingreloaded 
+                $sql = "DELETE FROM     wbb".WBB_N."_taggingreloaded, 
+                                        wcf".WCF_N."_taggingreloaded
+                        USING           wbb".WBB_N."_taggingreloaded
+                        NATURAL JOIN    wcf".WCF_N."_taggingreloaded
                         WHERE           userID = ".WCF::getUser()->userID." 
                         AND             postID = {$postID};";
-
-                // TODO: cleanup WCF_taggingreloaded!!!
 
                 WBBCore::getDB()->sendQuery($sql);

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/files/lib/system/event/listener/TaggingReloadedWBBPageListener.class.php

@@ -2 +2 @@
 // wcf imports
 require_once(WCF_DIR.'lib/system/event/EventListener.class.php');
+
+// wbb imports
+require_once(WBB_DIR.'lib/data/thread/ViewableThreadTagging.class.php');
+require_once(WBB_DIR.'lib/data/board/Board.class.php');
 
 // tagging imports
@@ -14 +18 @@
  * @license     GNU General Public License <http://opensource.org/licenses/gpl-license.php>
  */
-class TaggingReloadedPageListener implements EventListener {
-        protected $threadID=0, $boards=array();
+class TaggingReloadedWBBPageListener implements EventListener {
+        protected $threadID=0, $boards=array(), $tag; // params
+        
+        // data
         protected $tags = array();
+        protected $threadList = array();
 
         protected $eventObj;
@@ -42 +49 @@
         
         /**
+         * reads similar tags
+         */
+        protected function queryTagsByTag() {
+                // order by weight and cut
+                $sql = "SELECT          wcf2.tag,
+                                        SUM(wcf2.weight) AS weight
+                        FROM            wcf".WCF_N."_taggingreloaded wcf
+                        NATURAL JOIN    wbb".WBB_N."_taggingreloaded wbb
+                        NATURAL JOIN    wbb".WBB_N."_post p
+                        JOIN            wbb".WBB_N."_taggingreloaded wbb2
+                        ON              p.postID = wbb2.postID
+                        JOIN            wcf".WCF_N."_taggingreloaded wcf2
+                        ON              wbb2.taggingID = wcf2.taggingID
+                        WHERE           wcf.tag = '".escapeString($this->tag)."'
+                        GROUP BY        wcf2.tag
+                        ORDER BY        weight DESC
+                        LIMIT           50";
+
+                return $sql;
+        }
+        
+        /**
+         * reads by board
+         */
+        protected function queryTagsByBoard() {
+                // order by weight and cut
+                $sql = "SELECT          tag,
+                                        SUM(weight) AS weight
+                        FROM            wcf".WCF_N."_taggingreloaded wcf
+                        NATURAL JOIN    wbb".WBB_N."_taggingreloaded wbb
+                        NATURAL JOIN    wbb".WBB_N."_thread t
+                        NATURAL JOIN    wbb".WBB_N."_post p
+                        WHERE           t.boardID IN (".implode(',', $this->boards).")
+                        GROUP BY        tag
+                        ORDER BY        weight DESC
+                        LIMIT           50";
+
+                return $sql;
+        }
+        
+        /**
+         * reads by thread
+         */
+        protected function queryTagsByThread() {
+                // order by weight and cut
+                $sql = "SELECT          tag,
+                                        SUM(weight) AS weight
+                        FROM            wcf".WCF_N."_taggingreloaded wcf
+                        NATURAL JOIN    wbb".WBB_N."_taggingreloaded wbb
+                        NATURAL JOIN    wbb".WBB_N."_post p
+                        WHERE           p.threadID = {$this->threadID}
+                        GROUP BY        tag
+                        ORDER BY        weight DESC
+                        LIMIT           50";
+                //      SUM( weight ) * IF(COUNT(tag), 1.2, 1 )
+
+                return $sql;
+        }
+        
+        /**
+         * reads threads by tag
+         */
+        protected function readThreadsByTag() {
+                $sql = "SELECT          t.*,
+                                        tag,
+                                        SUM(weight) AS weight
+                        FROM            wcf".WCF_N."_taggingreloaded wcf
+                        NATURAL JOIN    wbb".WBB_N."_taggingreloaded wbb
+                        NATURAL JOIN    wbb".WBB_N."_post p
+                        NATURAL JOIN    wbb".WBB_N."_thread t
+                        WHERE           tag = '".escapeString($this->tag)."'
+                        GROUP BY        p.threadID
+                        ORDER BY        weight DESC
+                        LIMIT           15";
+
+                $result = WCF::getDB()->sendQuery($sql);
+                while ($row = WCF::getDB()->fetchArray($result)) {
+                        $row['permission'] = Board::getBoard($row['boardID'])->getPermission('canReadThread');
+                        $this->threadList[] = new ViewableThreadTagging(null, $row);
+                }
+        }
+        
+        /**
          * @see Page::readData()
          */
         protected function readData () {
-                $joins = "";
-                $conditions = "";
-
                 if($this->threadID) {
-                        $conditions = "p.threadID = {$this->threadID}";
+                        $sql = $this->queryTagsByThread();
                 } else if(count($this->boards)>0) {
-                        $joins = "NATURAL JOIN wbb".WBB_N."_thread t";
-                        $conditions = "t.boardID IN (".implode(',', $this->boards).")";
-                } else {
-                        return;
-                }
-
-                // order by weight and cut
-                $sql = "SELECT          tag,
-                                        SUM(weight) AS weight
-                        FROM            wcf".WCF_N."_taggingreloaded wcf
-                        NATURAL JOIN    wbb".WBB_N."_taggingreloaded wbb
-                        ".$joins."
-                        NATURAL JOIN    wbb".WBB_N."_post p
-                        WHERE           ".$conditions."
-                        GROUP BY        tag
-                        ORDER BY        weight DESC
-                        LIMIT           50";
-                //      SUM( weight ) * IF(COUNT(tag), 1.2, 1 )
+                        $sql = $this->queryTagsByBoard();
+                } else if($this->tag) {
+                        $check = true;
+                        $this->readThreadsByTag();
+                        $sql = $this->queryTagsByTag();
+                }
+                
+                // break
+                if(!isset($sql)) return;
 
                 // order by tag
@@ -84 +162 @@
                 
                 $this->tags = TaggingReloadedUtil::beautify($this->tags);
+                
+                if(isset($check) && count($this->tags) == 0) {
+                        require_once(WCF_DIR.'lib/system/exception/IllegalLinkException.class.php');
+                        throw new IllegalLinkException();
+                }
         }
 
@@ -90 +173 @@
          */
         protected function readParameters () {
-                if (isset($_GET['threadID'])) $this->threadID = intval($_GET['threadID']);
-                if (isset($_GET['boardID'])) {
+                if (isset($_GET['threadID'])) {
+                        $this->threadID = intval($_GET['threadID']);
+                }
+                else if (isset($_GET['boardID'])) {
                         $boardID = intval($_GET['boardID']);
                         $boardList = new BoardListTaggingReloaded($boardID);
@@ -98 +183 @@
                         $this->boards[] = $boardID;
                 }
+                else if(isset($_GET['tag'])) {
+                        $this->tag = $_GET['tag'];
+                }
         }
         
@@ -117 +205 @@
                 WCF::getTPL()->assign('tags', $this->tags);
                 WCF::getTPL()->assign('specialStyles', '<link rel="stylesheet" type="text/css" href="'.RELATIVE_WCF_DIR.'style/taggingreloaded.css" />');
-                WCF::getTPL()->append('additionalBoxes', WCF::getTPL()->fetch('taggingCloudContainer'));
+                
+                if($this->threadID || count($this->boards)>0) {
+                        WCF::getTPL()->append('additionalBoxes', WCF::getTPL()->fetch('taggingCloudContainer'));
+                } else if($this->tag) {
+                        WCF::getTPL()->assign('threads', $this->threadList);
+                        WCF::getTPL()->append('additionalTaggingContents', WCF::getTPL()->fetch('taggingCloud'));
+                        WCF::getTPL()->append('additionalTaggingContents', WCF::getTPL()->fetch('threadListTagging'));
+                }
         }
 }

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/install.sql

@@ -1 +1 @@
 -- WBB
 CREATE TABLE wbb1_1_taggingreloaded (
-  taggingID int(10) unsigned NOT NULL,
+  taggingID int(10) unsigned NOT NULL auto_increment,
   postID int(10) unsigned NOT NULL,
   PRIMARY KEY (taggingID)

taggingreloaded/optionals/de.easy-coding.wbb.taggingreloaded/package.xml

@@ -5 +5 @@
                 <packagename>Tagging Reloaded for WBB</packagename>
                 <packagedescription>Tagging Reloaded does not mean just tagging. It's much more!</packagedescription>
-                <version>0.2.0</version>
+                <version>0.3.0</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wbb</plugin>
@@ -22 +22 @@
         <instructions type="install">
                 <files>files.tar</files>
+                <templates>templates.tar</templates>
                 <sql>install.sql</sql>
                 <eventlistener>eventlistener.xml</eventlistener>

taggingreloaded/package.xml

@@ -5 +5 @@
                 <packagename>Tagging Reloaded</packagename>
                 <packagedescription>Tagging Reloaded does not mean just tagging. It's much more!</packagedescription>
-                <version>0.2.0</version>
+                <version>0.3.0</version>
                 <date>DATE</date>
                 <plugin>com.woltlab.wcf</plugin>
@@ -27 +27 @@
         <instructions type="install">
                 <files>files.tar</files>
+                <eventlistener>eventlistener.xml</eventlistener>
                 <templates>templates.tar</templates>
                 <sql>install.sql</sql>

taggingreloaded/templates/messageFormTaggingReloaded.tpl

@@ -20 +20 @@
         </script>
 
-        <input type="button" value="fetch" onclick="tagging.formfetch(this.form.text.value);" />
+        <!--<input type="button" value="fetch" onclick="tagging.formfetch(this.form.text.value);" />//-->
         <input type="button" value="add" onclick="tagging.formadd(this.form.inputTagging);" />
 </div>

taggingreloaded/templates/taggingCloud.tpl

@@ -1 @@
-<ul>
+<ul class="taggingCloud" name="taggingCloud">
 {foreach from=$tags key=tag item=i}
-        <li style="font-size:{$i.size}%;color:rgb({$i.color},{$i.color},{$i.color})"><!--<a href="index.php?page=Tagging&amp;tag={$tag|urlencode}">//-->{@$tag}</li>
+        <li style="font-size:{$i.size}%;color:rgb({$i.color},{$i.color},{$i.color})"><a href="index.php?page=Tagging&amp;tag={$tag|urlencode}">{@$tag}</a></li>
 {/foreach}
 </ul>

taggingreloaded/templates/taggingCloudContainer.tpl

@@ -1 +1 @@
 {if $tags|count}
-<div class="container-1 taggingCloud">
+<div class="container-1">
         <div class="containerIcon"><img src="{@RELATIVE_WCF_DIR}icon/tagging24.png" alt="" /></div>
         <div class="containerContent">

taggingreloaded/templates/taggingReloaded.tpl

@@ -1 +1 @@
 {include file="documentHeader"}
 <head>
-        <title>{lang}wcf.header.menu.map{/lang} - {PAGE_TITLE}</title>
+        <title>{$title} - {PAGE_TITLE}</title>
 
         {include file='headInclude' sandbox=false}
@@ -15 +15 @@
                 <img src="{@RELATIVE_WCF_DIR}icon/tagging48.png" alt="" />
                 <div class="headlineContainer">
-                        <h2> {lang}wcf.taggingreloaded.tagging{/lang}</h2>
-                        <p>{lang}wcf.taggingreloaded.description{/lang}</p>
+                        <h2> {$headline}</h2>
+                        <p>{$desc}</p>
                 </div>
         </div>
         <div class="border">
-                <div class="container-1">
-                        {if $additionalTaggingContents|isset}{@$additionalTaggingContents}{/if}
-                        {if $additionalTaggingBoxes|isset}{@$additionalTaggingBoxes}{/if}
+                <div class="container-1" style="padding:10px">
+                        {if $additionalTaggingContents|isset || $additionalTaggingBoxes|isset}
+                                {if $additionalTaggingContents|isset}{@$additionalTaggingContents}{/if}
+                                {if $additionalTaggingBoxes|isset}{@$additionalTaggingBoxes}{/if}
+                        {else}
+                                 {lang}wcf.taggingreloaded.notags{/lang}
+                        {/if}
+
+                        <div style="text-align:right"><a href="http://www.easy-coding.de/trac/wcf/wiki/taggingreloaded" class="externalURL">{lang}wcf.taggingreloaded.copyright{/lang}</a></div>
                 </div>
         </div>