Changeset 6167

Timestamp:

06/04/08 20:33:44 (6 months ago)

Author:

inureyes

Message:

#193

• 관련 기반 작업.
  

Location:

trunk/lib/model

Files:

• blog.attachment.php (modified) (5 diffs)
• blog.blogSetting.php (modified) (11 diffs)
• blog.category.php (modified) (2 diffs)
• blog.entry.php (modified) (6 diffs)
• blog.rss.php (modified) (13 diffs)

trunk/lib/model/blog.attachment.php

@@ -156 +156 @@
 function deleteAttachment($blogid, $parent, $name) {
     global $database;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if (!Validator::filename($name)) 
         return false;
@@ -212 +212 @@
 }
 function deleteTotalAttachment($blogid) {
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $d = dir(ROOT."/attach/$blogid");
     while($file = $d->read()) {
@@ -225 +225 @@
 function deleteAttachmentMulti($blogid, $parent, $names) {
     global $database;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $files = explode('!^|', $names);
     foreach ($files as $name) {
@@ -252 +252 @@
 
 function downloadAttachment($name) {
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     global $database;
     $name = POD::escapeString($name);
@@ -260 +260 @@
 function setEnclosure($name, $order) {
     global $database;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     requireModel('blog.attachment');
     $name = POD::escapeString($name);

trunk/lib/model/blog.blogSetting.php

@@ -6 +6 @@
 function setBlogTitle($blogid, $title) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if ($title == $blog['title'])
         return true;
@@ -17 +17 @@
 function setBlogDescription($blogid, $description) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if ($description == $blog['description'])
         return true;
@@ -77 +77 @@
 function setPrimaryDomain($blogid, $name) {
     global $database, $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $name = UTF8::lessenAsEncoding(strtolower(trim($name)), 32);
     if ($name == $blog['name'])
@@ -97 +97 @@
 function setSecondaryDomain($blogid, $domain) {
     global $database, $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $domain = UTF8::lessenAsEncoding(strtolower(trim($domain)), 64);
     if ($domain == $blog['secondaryDomain'])
@@ -120 +120 @@
 function setDefaultDomain($blogid, $default) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $default = $default == 1 ? 1 : 0;
     if (empty($blog['secondaryDomain']) && $default == 1)
@@ -136 +136 @@
 function useBlogSlogan($blogid, $useSloganOnPost, $useSloganOnCategory, $useSloganOnTag) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     requireComponent('Needlworks.Cache.PageCache');
     $useSloganOnPost     = $useSloganOnPost     ? 1 : 0;
@@ -168 +168 @@
 function publishPostEolinSyncOnRSS($blogid, $publishEolinSyncOnRSS) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $publishEolinSyncOnRSS = $publishEolinSyncOnRSS ? 1 : 0;
     if ($publishEolinSyncOnRSS == $blog['publishEolinSyncOnRSS'])
@@ -181 +181 @@
 function setEntriesOnRSS($blogid, $entriesOnRSS) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if ($entriesOnRSS == $blog['entriesOnRSS'])
         return true;
@@ -192 +192 @@
 function setCommentsOnRSS($blogid, $commentsOnRSS) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if ($commentsOnRSS == $blog['commentsOnRSS'])
         return true;
@@ -205 +205 @@
 function setPublishWholeOnRSS($blogid, $publishWholeOnRSS) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     $publishWholeOnRSS = $publishWholeOnRSS ? 1 : 0;
     if ($publishWholeOnRSS == $blog['publishWholeOnRSS'])
@@ -217 +217 @@
 function setBlogLanguage($blogid, $language, $blogLanguage) {
     global $blog;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if (($language == $blog['language']) && ($blogLanguage == $blog['blogLanguage']))
         return true;

trunk/lib/model/blog.category.php

@@ -294 +294 @@
 function modifyCategory($blogid, $id, $name, $bodyid) {
     global $database;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if($id==0) checkRootCategoryExistence($blogid);
     if ((empty($name)) && (empty($bodyid)))
@@ -578 +578 @@
 function setCategoryVisibility($blogid, $id, $visibility) {
     global $database;
-    requireModel('blog.rss');
+    requireModel('blog.feed');
     if($id == 0) return false;
     $parentVisibility = getParentCategoryVisibility($blogid, $id);

trunk/lib/model/blog.entry.php

@@ -512 +512 @@
     global $database, $blog, $gCacheStorage;
     requireModel("blog.attachment");
-    requireModel("blog.rss");
+    requireModel("blog.feed");
     requireModel("blog.category");
     requireModel("blog.tag");
@@ -631 +631 @@
     requireModel('blog.attachment');
     requireModel('blog.category');
-    requireModel('blog.rss');
+    requireModel('blog.feed');
 
     if($entry['id'] == 0) return false;
@@ -757 +757 @@
     requireModel('blog.attachment');
     requireModel('blog.category');
-    requireModel('blog.rss');
+    requireModel('blog.feed');
 
     if($entry['id'] == 0) return -11;
@@ -912 +912 @@
 function deleteEntry($blogid, $id) {
     global $database, $gCacheStorage;
-    requireModel("blog.rss");
+    requireModel("blog.feed");
     requireModel("blog.category");
     requireModel("blog.attachment");
@@ -945 +945 @@
     global $database;
     requireModel("blog.category");
-    requireModel("blog.rss");
+    requireModel("blog.feed");
 
     $targets = array_unique(preg_split('/,/', $entries, -1, PREG_SPLIT_NO_EMPTY));
@@ -984 +984 @@
 function setEntryVisibility($id, $visibility) {
     global $database;
-    requireModel("blog.rss");
+    requireModel("blog.feed");
     requireModel("blog.category");
     requireComponent('Needlworks.Cache.PageCache');

trunk/lib/model/blog.rss.php

@@ -9 +9 @@
 }
 
-function refreshRSS($blogid) {
+function refreshFeed($blogid, $mode = 'both') {
     global $database, $serviceURL, $defaultURL, $blog, $service;
     $channel = array();
@@ -65 +65 @@
             $content .= "<p><strong><a href=\"" . htmlspecialchars($entryURL) . "\">" . _t('글 전체보기') . "</a></strong></p>";
         }
-
+        $row['repliesCount'] = $row['comments'] + $row['trackbacks'];
         $item = array(
             'id' => $row['id'], 
@@ -73 +73 @@
             'author' => '('.RSSMessage($row['author']).')', 
             'pubDate' => Timestamp::getRFC1123($row['published']),
+            'updDate' => Timestamp::getRFC1123($row['modified']),
             'comments' => $entryURL . '#entry' . $row['id'] . 'comment',
-            'guid' => "$defaultURL/" . $row['id']
+            'guid' => "$defaultURL/" . $row['id'],
+            'replies' => array(
+                'count' => $row['repliesCount'])
         );
         if (isset($service['useNumericURLonRSS'])) {
@@ -101 +104 @@
         array_push($channel['items'], $item);
     }
-    $path = ROOT . '/cache/rss';
-    if (file_exists($path)) {
-        if (!is_dir($path))
-            return false;
-    } else {
-        if (!mkdir($path))
-            return false;
-        @chmod($path, 0777);
-    }
-    $path .= "/$blogid.xml";
-    $fileHandle = fopen($path, 'w');
-    $rss = array('channel' => $channel);
-    if (fwrite($fileHandle, publishRSS($blogid, $rss))) {
+    // RSS
+    if($mode == 'both' || $mode == 'rss') {
+        $path = ROOT . '/cache/rss';
+        if (file_exists($path)) {
+            if (!is_dir($path))
+                return false;
+        } else {
+            if (!mkdir($path))
+                return false;
+            @chmod($path, 0777);
+        }
+        $path .= "/$blogid.xml";
+        $fileHandle = fopen($path, 'w');
+        $rss = array('channel' => $channel);
+        if (fwrite($fileHandle, publishRSS($blogid, $rss))) {
+            @chmod($path, 0666);
+            fireEvent('refreshRSS',$rss);
+            $result = true;
+        } else $result = false;
         fclose($fileHandle);
-        @chmod($path, 0666);
-        fireEvent('refreshRSS',$rss);
-        return true;
-    }
-    fclose($fileHandle);
-    return false;
+    }
+    // ATOM
+    if($mode == 'both' || $mode == 'atom') {
+        $path = ROOT . '/cache/atom';
+        if (file_exists($path)) {
+            if (!is_dir($path))
+                return false;
+        } else {
+            if (!mkdir($path))
+                return false;
+            @chmod($path, 0777);
+        }
+        $path .= "/$blogid.xml";
+        $fileHandle = fopen($path, 'w');
+        $rss = array('channel' => $channel);
+        if (fwrite($fileHandle, publishATOM($blogid, $rss))) {
+            @chmod($path, 0666);
+            fireEvent('refreshATOM',$rss);
+            $result = true;
+        } else $result = false;
+        fclose($fileHandle);
+    }
+    if($result) return true;
+    else return false;
 }
 
@@ -143 +170 @@
     return $channel;
 }
-function getResponseRSSTotal($blogid) {
+function getResponseFeedTotal($blogid, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
     if(empty($blogid)) $blogid = getBlogId();
@@ -154 +181 @@
     $channel['items'] = $merged;
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getResponseRSSByEntryId($blogid, $entryId) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+function getResponseFeedByEntryId($blogid, $entryId, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
     if(empty($blogid)) $blogid = getBlogId();
@@ -168 +197 @@
     $channel['items'] = $merged;
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getCommentRSSTotal($blogid, $rawMode = false) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+function getCommentFeedTotal($blogid, $rawMode = false, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
     $channel = initializeRSSchannel($blogid);
@@ -199 +230 @@
     if($rawMode == true) return $channel['items'];
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getCommentRSSByEntryId($blogid = null, $entryId, $rawMode = false) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+function getCommentFeedByEntryId($blogid = null, $entryId, $rawMode = false, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
     
@@ -246 +279 @@
     if($rawMode == true) return $channel['items'];
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-
-function getTrackbackRSSTotal($blogid, $rawMode = false) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+
+function getTrackbackFeedTotal($blogid, $rawMode = false, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
 
@@ -278 +313 @@
     if($rawMode == true) return $channel['items'];
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getTrackbackRSSByEntryId($blogid = null, $entryId, $rawMode = false) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+function getTrackbackFeedByEntryId($blogid = null, $entryId, $rawMode = false, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
 
@@ -326 +363 @@
     if($rawMode == true) return $channel['items'];
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
-}
-
-function getCommentNotifiedRSSTotal($blogid) {
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
+}
+
+function getCommentNotifiedFeedTotal($blogid, $mode = 'rss') {
     global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
 
@@ -364 +403 @@
     }
     $rss = array('channel' => $channel);
-    return publishRSS($blogid, $rss);
+    if($mode == 'rss') return publishRSS($blogid, $rss);
+    else if($mode == 'atom') return publishATOM($blogid, $rss);
+    return false;
 }
 
@@ -421 +462 @@
         @unlink(ROOT . "/cache/rss/".getBlogId().".xml");
 }
+
+
+function publishATOM($blogid, $data) {
+    global $blog;
+    $blogid = getBlogId();
+    ob_start();
+    echo '<?xml version="1.0" encoding="UTF-8"?>', CRLF;
+    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 '  <subtitle type="html">', htmlspecialchars($data['channel']['description'], ENT_QUOTES), '</subtitle>', CRLF;
+    echo '  <updated>', $data['channel']['pubDate'], '</updated>', CRLF;
+    echo '  <generator>', $data['channel']['generator'], '</generator>', CRLF;
+
+    foreach ($data['channel']['items'] as $item) {
+        echo '  <entry>', CRLF;
+        echo '    <title type="html">', htmlspecialchars($item['title'], ENT_QUOTES), '</title>', CRLF;
+        echo '    <link rel="alternate" type="text/html" href="', $item['link'], '" />', CRLF;
+        if(isset($item['replies'])) {
+            echo '    <link rel="replies" type="application/atom+xml" href="', $data['channel']['link'], '/atom/response/', $item['id'], '" thr:count="', $item['replies']['count'] ,'"/>', CRLF;
+        }
+        foreach ($item['categories'] as $category) {
+            if ($category = trim($category))
+                echo '    <category term="', htmlspecialchars($category, ENT_QUOTES), '" />', CRLF; 
+        }
+        echo '    <author>', CRLF;
+        echo '      <name>', htmlspecialchars($item['author'], ENT_QUOTES), '</name>', CRLF;
+        echo '    </author>', CRLF;
+        echo '    <id>', $item['link'] ,'</id>', CRLF;
+        if(isset($item['updDate']))
+            echo '    <updated>', $item['updDate'], '</updated>', CRLF;
+        echo '    <published>', $item['pubDate'], '</published>', CRLF;
+/*      if (!empty($item['enclosure'])) {
+            echo '          <enclosure url="', $item['enclosure']['url'], '" length="', $item['enclosure']['length'], '" type="', $item['enclosure']['type'], '" />', CRLF;
+        }*/
+        echo '    <summary type="html">', htmlspecialchars($item['description'], ENT_QUOTES), '</summary>', CRLF;
+
+        echo '  </entry>', CRLF;
+    }
+    echo '</feed>', CRLF;
+    $atom = ob_get_contents();
+    ob_end_clean();
+    return $atom;
+}
 ?>