Changeset 812

Timestamp:

02/21/09 15:27:06 (4 years ago)

Author:

d0nut

Message:

maybe solved sitemaps requirements chaos

Location:

sitemaps

Files:

• files/lib/page/SitemapsPage.class.php (modified) (3 diffs)
• optionals/de.easy-coding.wbb.sitemaps/files/lib/system/event/listener/SitemapsPageWBBListener.class.php (modified) (9 diffs)
• requirements (deleted)

sitemaps/files/lib/page/SitemapsPage.class.php

@@ -2 +2 @@
 // wcf imports
 require_once(WCF_DIR.'lib/page/AbstractPage.class.php');
-
-// rewriter util
-require_once(WBB_DIR.'lib/page/PublicSEORewriter.class.php');
 
 /**
@@ -17 +14 @@
 
         public $index = false;
-        public $rewriter;
 
         /**
@@ -28 +24 @@
                         $this->index = true;
                 }
-
-                $this->rewriter = new PublicSEORewriter();
         }
         

sitemaps/optionals/de.easy-coding.wbb.sitemaps/files/lib/system/event/listener/SitemapsPageWBBListener.class.php

@@ -6 +6 @@
 require_once(WBB_DIR.'lib/data/board/SitemapsBoard.class.php');
 require_once(WBB_DIR.'lib/data/thread/SitemapsThread.class.php');
+
+// rewriter util
+require_once(WBB_DIR.'lib/page/PublicSEORewriterWBB.class.php');
 
 /**
@@ -23 +26 @@
         protected $eventObj;
         protected $className;
+        
+        protected $rewriter;
 
         /**
@@ -30 +35 @@
                 $this->eventObj = $eventObj;
                 $this->className = $className;
+
+                $this->rewriter = new PublicSEORewriterWBB();
 
                 switch ($eventName) {
@@ -110 +117 @@
                                 $tmp = new SitemapsThread($row);
 
-                                if($this->eventObj->rewriter === null) {
+                                if($this->rewriter === null) {
                                         $tmp->url = sprintf('index.php?page=Thread&threadID=%d', $row['threadID']);
                                 } else {
-                                        $this->eventObj->rewriter->publicCacheThreads($row['threadID'], $row);
-                                        $tmp->url = $this->eventObj->rewriter->publicParseThreadURLs($row['threadID'], '');
+                                        $this->rewriter->publicCacheThreads($row['threadID'], $row);
+                                        $tmp->url = $this->rewriter->publicParseThreadURLs($row['threadID'], '');
                                 }
 
@@ -123 +130 @@
                                         $tmp = new SitemapsThread($row['threadID'], $row);
 
-                                        if($this->eventObj->rewriter === null) {
+                                        if($this->rewriter === null) {
                                                         $tmp->url = sprintf('index.php?page=Thread&threadID=%d&pageNo=%d', $row['threadID'], $j);
                                         } else {
-                                                        $tmp->url = $this->eventObj->rewriter->publicParseMultipleThreadURLs($row['threadID'], $j, '');
+                                                        $tmp->url = $this->rewriter->publicParseMultipleThreadURLs($row['threadID'], $j, '');
                                         }
 
@@ -134 +141 @@
 
                                 // titles are not used again.. clear cache
-                                if($this->eventObj->rewriter !== null) $this->eventObj->rewriter->clearCache();
+                                if($this->rewriter !== null) $this->rewriter->clearCache();
                         }
                 }
@@ -175 +182 @@
                                 }
 
-                                if($this->eventObj->rewriter === null) {
+                                if($this->rewriter === null) {
                                         $this->boards[$i]->url = sprintf('index.php?page=Board&boardID=%d', $row['boardID']);
                                 } else {
-                                        $this->boards[$i]->url = $this->eventObj->rewriter->publicParseBoardURLs($row['boardID'], '');
+                                        $this->boards[$i]->url = $this->rewriter->publicParseBoardURLs($row['boardID'], '');
                                 }
 
@@ -189 +196 @@
                                         $this->boards[$i]->time = $row['lastPostTime'];
 
-                                        if($this->eventObj->rewriter === null) {
+                                        if($this->rewriter === null) {
                                                 $this->boards[$i]->url = sprintf('index.php?page=Board&boardID=%d&pageNo=%d', $row['boardID'], $j);
                                         } else {
-                                                $this->boards[$i]->url = $this->eventObj->rewriter->publicParseMultipleBoardURLs($row['boardID'], $j, '');
+                                                $this->boards[$i]->url = $this->rewriter->publicParseMultipleBoardURLs($row['boardID'], $j, '');
                                         }
                                 }
@@ -200 +207 @@
 
                                 // titles are not used again.. clear cache
-                                if($this->eventObj->rewriter !== null) $this->eventObj->rewriter->clearCache();
+                                if($this->rewriter !== null) $this->rewriter->clearCache();
                         }
                 }