Changeset 5376

Timestamp:

02/23/08 19:12:02 (11 months ago)

Author:

inureyes

Message:

#774

• 댓글-트랙백 통합 RSS 지원
  
  • suggested by coolengineer / creorix (at Tattercamp)
    

Location:

trunk

Files:

• lib/model/blog.rss.php (modified) (11 diffs)
• lib/piece/blog/end.php (modified) (1 diff)
• lib/piece/blog/entries.php (modified) (2 diffs)
• skin/coolant/skin.html (modified) (5 diffs)
• skin/standard/skin.html (modified) (3 diffs)

trunk/lib/model/blog.rss.php

@@ -123 +123 @@
 }
 
-function getCommentRSSTotal($blogid) {
-    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+function initializeRSSchannel($blogid = null) {
+    global $serviceURL, $defaultURL, $blogURL, $blog;
 
     if(empty($blogid)) $blogid = getBlogId();
 
     $channel = array();
-    $channel['title'] = RSSMessage($blog['title']. ': '._text('최근 댓글 목록'));
     $channel['link'] = "$defaultURL/";
     $channel['description'] = RSSMessage($blog['description']);
@@ -142 +141 @@
         $channel['height'] = $logoInfo[1];
     }
+    return $channel;
+}
+function getResponseRSSTotal($blogid) {
+    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+    if(empty($blogid)) $blogid = getBlogId();
+    $channel = initializeRSSchannel($blogid);
+    $channel['title'] = $blog['title']. ': '._text('최근 댓글/트랙백 목록');
+
+    $recentComment = getCommentRSSTotal($blogid,true);
+    $recentTrackback = getTrackbackRSSTotal($blogid,true);
+    $merged = array_merge($recentComment, $recentTrackback);
+    $channel['items'] = $merged;
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
+function getResponseRSSByEntryId($blogid, $entryId) {
+    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);
+    $merged = array_merge($recentComment, $recentTrackback);
+    $channel['items'] = $merged;
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
+function getCommentRSSTotal($blogid, $rawMode = false) {
+    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+    $channel = initializeRSSchannel($blogid);
+    $channel['title'] = $blog['title']. ': '._text('최근 댓글 목록');
+    
     $result = getRecentComments($blogid, 20, false, true);
     if (!$result)
@@ -163 +197 @@
         array_push($channel['items'], $item);
     }
-    $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getCommentRSSByEntryId($blogid, $entryId) {
-    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
-
+    if($rawMode == true) return $channel['items'];
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
+function getCommentRSSByEntryId($blogid = null, $entryId, $rawMode = false) {
+    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+    
     if(empty($blogid)) $blogid = getBlogId();
 
@@ -176 +211 @@
     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['title']));
     if($blog['useSlogan']) {
@@ -182 +218 @@
     } else {
         $channel['link'] = $defaultURL."/".$entryId;
-    }
-    $channel['description'] = RSSMessage($blog['description']);
-    $channel['language'] = $blog['language'];
-    $channel['pubDate'] = Timestamp::getRFC1123();
-    $channel['generator'] = TEXTCUBE_NAME . ' ' . TEXTCUBE_VERSION;
-
-    if ((getBlogSetting('visibility',2) == 2) && !empty($blog['logo']) && file_exists(ROOT."/attach/$blogid/{$blog['logo']}")) {
-        $logoInfo = getimagesize(ROOT."/attach/$blogid/{$blog['logo']}");
-        $channel['url'] = $serviceURL."/attach/".$blogid."/".$blog['logo'];
-        $channel['width'] = $logoInfo[0];
-        $channel['height'] = $logoInfo[1];
     }
     $result = POD::queryAll("SELECT *
@@ -219 +244 @@
         array_push($channel['items'], $item);
     }
-    $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-
-function getTrackbackRSSTotal($blogid) {
-    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
-
-    if(empty($blogid)) $blogid = getBlogId();
-    $isPublic = (getBlogSetting('visibility',2) == 2 ? true : false);
-
-    $channel = array();
+    if($rawMode == true) return $channel['items'];
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
+
+function getTrackbackRSSTotal($blogid, $rawMode = false) {
+    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+
+    if(empty($blogid)) $blogid = getBlogId();
+    $channel = initializeRSSchannel($blogid);
     $channel['title'] = RSSMessage($blog['title']. ': '._text('최근 트랙백 목록'));
-    $channel['link'] = "$defaultURL/";
-    $channel['description'] = RSSMessage($blog['description']);
-    $channel['language'] = $blog['language'];
-    $channel['pubDate'] = Timestamp::getRFC1123();
-    $channel['generator'] = TEXTCUBE_NAME . ' ' . TEXTCUBE_VERSION;
-
-    if ((getBlogSetting('visibility',2) == 2) && !empty($blog['logo']) && file_exists(ROOT."/attach/$blogid/{$blog['logo']}")) {
-        $logoInfo = getimagesize(ROOT."/attach/$blogid/{$blog['logo']}");
-        $channel['url'] = $serviceURL."/attach/".$blogid."/".$blog['logo'];
-        $channel['width'] = $logoInfo[0];
-        $channel['height'] = $logoInfo[1];
-    }
     $result = getRecentTrackbacks($blogid, 20, true);
     if (!$result)
@@ -264 +276 @@
         array_push($channel['items'], $item);
     }
-    $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getTrackbackRSSByEntryId($blogid, $entryId) {
+    if($rawMode == true) return $channel['items'];
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
+function getTrackbackRSSByEntryId($blogid = null, $entryId, $rawMode = false) {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
 
@@ -278 +291 @@
     if(in_array($entry['category'], getCategoryVisibilityList($blogid, 'private'))) return false;
     $channel = array();
+
+    $channel = initializeRSSchannel($blogid);
     $channel['title'] = RSSMessage($blog['title']. ': '._textf('%1 에 달린 트랙백',$entry['slogan']));
     if($blog['useSlogan']) {
@@ -283 +298 @@
     } else {
         $channel['link'] = $defaultURL."/".$entryId;
-    }
-    $channel['description'] = RSSMessage($blog['description']);
-    $channel['language'] = $blog['language'];
-    $channel['pubDate'] = Timestamp::getRFC1123();
-    $channel['generator'] = TEXTCUBE_NAME . ' ' . TEXTCUBE_VERSION;
-
-    if ((getBlogSetting('visibility',2) == 2) && !empty($blog['logo']) && file_exists(ROOT."/attach/$blogid/{$blog['logo']}")) {
-        $logoInfo = getimagesize(ROOT."/attach/$blogid/{$blog['logo']}");
-        $channel['url'] = $serviceURL."/attach/".$blogid."/".$blog['logo'];
-        $channel['width'] = $logoInfo[0];
-        $channel['height'] = $logoInfo[1];
     }
     $result = POD::queryAll("SELECT * 
@@ -320 +324 @@
         array_push($channel['items'], $item);
     }
+    if($rawMode == true) return $channel['items'];
     $rss = array('channel' => $channel);
     return publishRSS($blogid, $rss);
@@ -328 +333 @@
 
     if(empty($blogid)) $blogid = getBlogId();
-    $isPublic = (getBlogSetting('visibility',2) == 2 ? true : false);
-
-    $channel = array();
+    $channel = initializeRSSchannel($blogid);
     $channel['title'] = RSSMessage($blog['title']. ': '._text('최근 댓글 알리미 목록'));
-    $channel['link'] = "$defaultURL/";
-    $channel['description'] = RSSMessage($blog['description']);
-    $channel['language'] = $blog['language'];
-    $channel['pubDate'] = Timestamp::getRFC1123();
-    $channel['generator'] = TEXTCUBE_NAME . ' ' . TEXTCUBE_VERSION;
-
-    if ((getBlogSetting('visibility',2) == 2) && !empty($blog['logo']) && file_exists(ROOT."/attach/$blogid/{$blog['logo']}")) {
-        $logoInfo = getimagesize(ROOT."/attach/$blogid/{$blog['logo']}");
-        $channel['url'] = $serviceURL."/attach/".$blogid."/".$blog['logo'];
-        $channel['width'] = $logoInfo[0];
-        $channel['height'] = $logoInfo[1];
-    }
     $mergedComments = array();
     list($comments, $paging) = getCommentsNotifiedWithPagingForOwner($blogid, '', '', '', '', 1, 20);

trunk/lib/piece/blog/end.php

@@ -75 +75 @@
 dress('link_rep', getLinksView(getLinks( $blogid ), $skin->s_link_rep), $view);
 dress('rss_url', "$defaultURL/rss", $view);
+dress('response_rss_url', "$defaultURL/rss/response", $view);
 dress('comment_rss_url', "$defaultURL/rss/comment", $view);
 dress('trackback_rss_url', "$defaultURL/rss/trackback", $view);

trunk/lib/piece/blog/entries.php

@@ -13 +13 @@
     $entryRsses = '';
     foreach ($entries as $entry) {
+//      $entryRsses .= '<link rel="alternate" type="application/rss+xml" '.
+//          'title="Trackback: '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
+//          'href="'.$defaultURL.'/rss/trackback/'.$entry['id'].'" />'.CRLF;
+//      $entryRsses .= '<link rel="alternate" type="application/rss+xml" '.
+//          'title="Comment: '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
+//          'href="'.$defaultURL.'/rss/comment/'.$entry['id'].'" />'.CRLF;
         $entryRsses .= '<link rel="alternate" type="application/rss+xml" '.
-            'title="Trackback: '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
-            'href="'.$defaultURL.'/rss/trackback/'.$entry['id'].'" />'.CRLF;
-        $entryRsses .= '<link rel="alternate" type="application/rss+xml" '.
-            'title="Comment: '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
-            'href="'.$defaultURL.'/rss/comment/'.$entry['id'].'" />'.CRLF;
+            'title="Responses : '.htmlspecialchars($entry['title']).' - '.htmlspecialchars($blog['title']).'" '.
+            'href="'.$defaultURL.'/rss/response/'.$entry['id'].'" />'.CRLF;
     }
     if( getBlogSetting('useFOAF',1) && rtrim( $suri['url'], '/' ) == $pathURL ) {
@@ -114 +117 @@
             dress('article_rep_rp_rssurl', $defaultURL.'/rss/comment/'.$entry['id'], $entryView);
             dress('article_rep_tb_rssurl', $defaultURL.'/rss/trackback/'.$entry['id'], $entryView);
+            dress('article_rep_response_rssurl', $defaultURL.'/rss/response/'.$entry['id'], $entryView);
             dress('article_rep_title', htmlspecialchars(fireEvent('ViewPostTitle', $entry['title'], $entry['id'])), $entryView);
             // 사용자가 작성한 본문은 lib/piece/blog/end.php의 removeAllTags() 다음에 처리하기 위한 조치.

trunk/skin/coolant/skin.html

@@ -6 +6 @@
 <meta http-equiv="Keywords" content="[##_meta_http_equiv_keywords_##]" />
 <link rel="alternate" type="application/rss+xml" title="[##_title_##]" href="[##_rss_url_##]" />
-<link rel="alternate" type="application/rss+xml" title="[##_title_##] : comment" href="[##_comment_rss_url_##]" />
-<link rel="alternate" type="application/rss+xml" title="[##_title_##] : trackback" href="[##_trackback_rss_url_##]" />
+<link rel="alternate" type="application/rss+xml" title="[##_title_##] : responses" href="[##_response_rss_url_##]" />
 <link rel="stylesheet" media="screen" type="text/css" href="./style.css" />
 <link rel="stylesheet" media="print" type="text/css" href="./styles/print.css" />
@@ -302 +301 @@
                                 </a>
                             </dd>
+                            <dt class="response"><abbr title="Really Simple Syndication">RSS</dbbr> : </dt>
+                            <dd>
+                                [##_article_rep_response_rssurl_##]
+                            </dd>
                         </dl>
                     </div>
@@ -310 +313 @@
                 <div class="trackback">
                     <p class="url"><dfn>Trackback <abbr title="Uniform Resource Locator">URL</abbr></dfn> : [##_tb_address_##]</p>
-                    <p class="url"><dfn>Trackback <abbr title="Really Simple Syndication">RSS</abbr></dfn> : [##_article_rep_tb_rssurl_##]</p>
+<!--                    <p class="url"><dfn>Trackback <abbr title="Really Simple Syndication">RSS</abbr></dfn> : [##_article_rep_tb_rssurl_##]</p>-->
                     <s_tb_container>
                     
@@ -336 +339 @@
                     <h3>Comments List</h3>
                     <ol>
-                        <li><span class="rssurl">Comment RSS : [##_article_rep_rp_rssurl_##]</span></li>
+                        <!--<li><span class="rssurl">Comment RSS : [##_article_rep_rp_rssurl_##]</span></li>-->
                         <s_rp_rep>
                         <li id="[##_rp_rep_id_##]" class="[##_rp_rep_class_##]">
@@ -602 +605 @@
                 <a href="[##_rss_url_##]" class="rss" rel="alternate" type="application/rss+xml">
                     Subscribe to <abbr title="Really Simple Syndication">RSS</abbr> articles</a><br />
-                <a href="[##_comment_rss_url_##]" class="rss" rel="alternate" type="application/rss+xml">Subscribe to RSS comments</a>
-                <a href="[##_trackback_rss_url_##]" class="rss" rel="alternate" type="application/rss+xml">Subscribe to RSS trackbacks</a>
-                    </div>
+                <a href="[##_response_rss_url_##]" class="rss" rel="alternate" type="application/rss+xml">Subscribe to RSS responses</a>
+            </div>
             </s_sidebar_element>
         </s_sidebar>

trunk/skin/standard/skin.html

@@ -6 +6 @@
 <meta http-equiv="Keywords" content="[##_meta_http_equiv_keywords_##]" />
 <link rel="alternate" type="application/rss+xml" title="[##_title_##]" href="[##_rss_url_##]" />
-<link rel="alternate" type="application/rss+xml" title="[##_title_##]" href="[##_comment_rss_url_##]" />
+<link rel="alternate" type="application/rss+xml" title="[##_title_##] : comments" href="[##_comment_rss_url_##]" />
+<link rel="alternate" type="application/rss+xml" title="[##_title_##] : trackbacks" href="[##_trackback_rss_url_##]" />
+<link rel="alternate" type="application/rss+xml" title="[##_title_##] :  comments + trackbacks" href="[##_response_rss_url_##]" />
 <link rel="stylesheet" media="screen" type="text/css" href="./style.css" />
 <link rel="stylesheet" media="print" type="text/css" href="./images/print.css" />
@@ -275 +277 @@
                         <a id="[##_article_rep_tb_cnt_id_##]" href="#tb" onclick="[##_article_rep_tb_link_##]"><s_tb_count> 트랙백 <span class="cnt">[##_article_rep_tb_cnt_##]</span>개</s_tb_count></a>, 
                         <a id="[##_article_rep_rp_cnt_id_##]" href="#rp" onclick="[##_article_rep_rp_link_##]"><s_rp_count> 댓글 <span class="cnt">[##_article_rep_rp_cnt_##]</span>개가 달렸습니다.</s_rp_count></a>
+                        <h3>댓글+트랙백 RSS :: [##_article_rep_response_rssurl_##]</h3>
                     </div>
 
@@ -598 +601 @@
                         <img src="./images/rss.gif" alt="rss"/>트랙백</a>
                     </div>
+                    <div class="botton">
+                        <a href="[##_response_rss_url_##]" onclick="window.open(this.href); return false">
+                        <img src="./images/rss.gif" alt="rss"/>댓글+트랙백</a>
+                    </div>
                 </s_sidebar_element>
             </s_sidebar>