Changeset 6169

Timestamp:

06/04/08 20:50:34 (6 months ago)

Author:

inureyes

Message:

#193

• Atom Feed 구현
  

Location:

trunk

Files:

• interface/atom (added)
• interface/atom/comment (added)
• interface/atom/comment/index.php (added)
• interface/atom/index.php (added)
• interface/atom/notifycomment (added)
• interface/atom/notifycomment/index.php (added)
• interface/atom/response (added)
• interface/atom/response/index.php (added)
• interface/atom/trackback (added)
• interface/atom/trackback/index.php (added)
• interface/owner/setting/blog/visibility/index.php (modified) (1 diff)
• interface/rss/comment/index.php (modified) (3 diffs)
• interface/rss/index.php (modified) (2 diffs)
• interface/rss/notifycomment/index.php (modified) (2 diffs)
• interface/rss/response/index.php (modified) (3 diffs)
• interface/rss/trackback/index.php (modified) (3 diffs)
• lib/model/blog.feed.php (modified) (3 diffs)
• lib/piece/blog/entries.php (modified) (1 diff)

trunk/interface/owner/setting/blog/visibility/index.php

@@ -10 +10 @@
 );
 require ROOT . '/lib/includeForBlogOwner.php';
-requireModel('blog.rss');
+requireModel('blog.feed');
 
 requireStrictRoute();

trunk/interface/rss/comment/index.php

@@ -7 +7 @@
 
 require ROOT . '/lib/includeForBlog.php';
-requireModel("blog.rss");
+requireModel("blog.feed");
 requireModel("blog.entry");
 
@@ -18 +18 @@
     $cache->name = 'commentRSS_'.$suri['id'];
     if(!$cache->load()) {
-        $result = getCommentRSSByEntryId(getBlogId(),$suri['id']);
+        $result = getCommentFeedByEntryId(getBlogId(),$suri['id']);
         if($result !== false) {
             $cache->contents = $result;
@@ -27 +27 @@
     $cache->name = 'commentRSS';
     if(!$cache->load()) {
-        $result = getCommentRSSTotal(getBlogId());
+        $result = getCommentFeedTotal(getBlogId());
         if($result !== false) {
             $cache->contents = $result;

trunk/interface/rss/index.php

@@ -7 +7 @@
 define('__TEXTCUBE_LOGIN__',true);
 require ROOT . '/lib/includeForBlog.php';
-requireModel("blog.rss");
+requireModel("blog.feed");
 requireModel("blog.entry");
 
@@ -16 +16 @@
 publishEntries();
 if (!file_exists(ROOT . "/cache/rss/$blogid.xml"))
-    refreshRSS($blogid);
+    refreshFeed($blogid,'rss');
 header('Content-Type: text/xml; charset=utf-8');
 $fileHandle = fopen(ROOT . "/cache/rss/$blogid.xml", 'r+');

trunk/interface/rss/notifycomment/index.php

@@ -15 +15 @@
 );
 require ROOT . '/lib/includeForBlog.php';
-requireModel("blog.rss");
+requireModel("blog.feed");
 requireModel("blog.entry");
 
@@ -27 +27 @@
 $cache->name = 'commentNotifiedRSS';
 if(!$cache->load()) {
-    $result = getCommentNotifiedRSSTotal(getBlogId());
+    $result = getCommentNotifiedFeedTotal(getBlogId());
     if($result !== false) {
         $cache->contents = $result;

trunk/interface/rss/response/index.php

@@ -6 +6 @@
 
 require ROOT . '/lib/includeForBlog.php';
-requireModel("blog.rss");
+requireModel("blog.feed");
 requireModel("blog.entry");
 
@@ -17 +17 @@
     $cache->name = 'responseRSS_'.$suri['id'];
     if(!$cache->load()) {
-        $result = getResponseRSSByEntryId(getBlogId(),$suri['id']);
+        $result = getResponseFeedByEntryId(getBlogId(),$suri['id']);
         if($result !== false) {
             $cache->contents = $result;
@@ -26 +26 @@
     $cache->name = 'responseRSS';
     if(!$cache->load()) {
-        $result = getResponseRSSTotal(getBlogId());
+        $result = getResponseFeedTotal(getBlogId());
         if($result !== false) {
             $cache->contents = $result;

trunk/interface/rss/trackback/index.php

@@ -7 +7 @@
 
 require ROOT . '/lib/includeForBlog.php';
-requireModel("blog.rss");
+requireModel("blog.feed");
 requireModel("blog.entry");
 
@@ -18 +18 @@
     $cache->name = 'trackbackRSS_'.$suri['id'];
     if(!$cache->load()) {
-        $result = getTrackbackRSSByEntryId(getBlogId(),$suri['id']);
+        $result = getTrackbackFeedByEntryId(getBlogId(),$suri['id']);
         if($result !== false) {
             $cache->contents = $result;
@@ -27 +27 @@
     $cache->name = 'trackbackRSS';
     if(!$cache->load()) {
-        $result = getTrackbackRSSTotal(getBlogId());
+        $result = getTrackbackFeedTotal(getBlogId());
         if($result !== false) {
             $cache->contents = $result;

trunk/lib/model/blog.feed.php

@@ -176 +176 @@
     $channel['title'] = $blog['title']. ': '._text('최근 댓글/트랙백 목록');
 
-    $recentComment = getCommentRSSTotal($blogid,true);
-    $recentTrackback = getTrackbackRSSTotal($blogid,true);
+    $recentComment = getCommentFeedTotal($blogid,true,$mode);
+    $recentTrackback = getTrackbackFeedTotal($blogid,true,$mode);
     $merged = array_merge($recentComment, $recentTrackback);
     $channel['items'] = $merged;
@@ -188 +188 @@
 function getResponseFeedByEntryId($blogid, $entryId, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
-    if(empty($blogid)) $blogid = getBlogId();
-    $channel = initializeRSSchannel($blogid);
-    $channel['title'] = $blog['title']. ': '._text('최근 댓글/트랙백 목록');
-
-    $recentComment = getCommentRSSByEntryId($blogid,$entryId,true);
-    $recentTrackback = getTrackbackRSSByEntryId($blogid,$entryId,true);
+    
+    if(empty($blogid)) $blogid = getBlogId();
+
+    $entry = POD::queryRow("SELECT slogan, visibility, category FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = $entryId");
+    if(empty($entry)) return false;
+    if($entry['visibility'] < 2) return false;
+    if(in_array($entry['category'], getCategoryVisibilityList($blogid, 'private'))) return false;
+    $channel = array();
+
+    $channel = initializeRSSchannel($blogid);
+    $channel['title'] = RSSMessage($blog['title']. ': '._textf('%1에 달린 최근 댓글/트랙백 목록',$entry['slogan']));
+
+    $recentComment = getCommentFeedByEntryId($blogid,$entryId,true,$mode);
+    $recentTrackback = getTrackbackFeedByEntryId($blogid,$entryId,true,$mode);
     $merged = array_merge($recentComment, $recentTrackback);
     $channel['items'] = $merged;
+    
     $rss = array('channel' => $channel);
     if($mode == 'rss') return publishRSS($blogid, $rss);
@@ -471 +480 @@
     echo '<feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0">', CRLF;
     echo '  <title type="html">', htmlspecialchars($data['channel']['title'], ENT_QUOTES), '</title>', CRLF;
-    echo '  <id>', $data['channel']['link'], '</id', CRLF;
-    echo '  <link rel="alternate" type="text/html" hreflang="', $data['channel']['language'] ,'" href="', $data['channel']['link'] , ' />', CRLF;
+    echo '  <id>', $data['channel']['link'], '</id>', CRLF;
+    echo '  <link rel="alternate" type="text/html" hreflang="', $data['channel']['language'] ,'" href="', $data['channel']['link'] , '" />', CRLF;
     echo '  <subtitle type="html">', htmlspecialchars($data['channel']['description'], ENT_QUOTES), '</subtitle>', CRLF;
     echo '  <updated>', $data['channel']['pubDate'], '</updated>', CRLF;

trunk/lib/piece/blog/entries.php

@@ -20 +20 @@
 //          'href="'.$defaultURL.'/rss/comment/'.$entry['id'].'" />'.CRLF;
         $entryRsses .= '<link rel="alternate" type="application/rss+xml" '.
-            'title="Responses : '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
-            'href="'.$defaultURL.'/rss/response/'.$entry['id'].'" />'.CRLF;
+            'title="Responses (RSS) : '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
+            'href="'.$defaultURL.'/rss/response/'.$entry['id'].'" />'.CRLF.
+            '<link rel="alternate" type="application/atom+xml" '.
+            'title="Responses (ATOM) : '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
+            'href="'.$defaultURL.'/atom/response/'.$entry['id'].'" />'.CRLF;
     }
     if( getBlogSetting('useFOAF',1) && rtrim( $suri['url'], '/' ) == $pathURL ) {