Changeset 6823

Timestamp:

10/13/08 11:58:00 (3 months ago)

Author:

inureyes

Message:

refs #1110

• 에러 수정
  
• TODO : 30초 이상이 걸리는 경우 ajax가 에러를 밷어낼텐데 이 경우 어떻게 처리할 것인가?
  

Location:

trunk

Files:

• interface/owner/reader/index.php (modified) (1 diff)
• library/model/reader.common.php (modified) (1 diff)
• resources/script/reader.js (modified) (1 diff)

trunk/interface/owner/reader/index.php

@@ -41 +41 @@
                     var s_saved = "<?php echo _t('저장되었습니다');?>";
                     var s_markedAsUnread = "<?php echo _t('읽지 않은 상태로 변경하였습니다.');?>";
+                    var s_markedAsReadAll = "<?php echo _t('모두 읽은 상태로 변경하였습니다.');?>";
                     var s_loadingList = "<?php echo _t('글 목록을 불러오고 있습니다.');?>";
                     var s_opmlImportComplete = "<?php echo _t('OPML 파일을 가져왔습니다.');?>";

trunk/library/model/reader.common.php

@@ -43 +43 @@
         WHERE blogid = $blogid");
     if(isset($registeredFeeds)) {
-        $readFeeds = POD::queryColumn("SELECT item FROM {$database['prefix']}FeedReads
-                WHERE blogid = $blogid");
-        $unreadFeeds = array_diff($readFeeds, $readFeeds);
-        if(!empty($unreadFeeds)) {
-            foreach($unreadFeeds as $feed) {
-                POD::execute("INSERT INTO {$database['prefix']}FeedReads (blogid, item) VALUES ($blogid, $feed)");
+        foreach($registeredFeeds as $feed) {
+            $feedItems = POD::queryColumn("SELECT id from {$database['prefix']}FeedItems WHERE feed = $feed");
+            if(!empty($feedItems)) {
+                $readFeedItems = POD::queryColumn("SELECT item FROM {$database['prefix']}FeedReads
+                    WHERE blogid = $blogid");
+                $unreadFeedItems = array_diff($readFeedItems, $feedItems);
+                if(!empty($unreadFeedItems)) {
+                    foreach($unreadFeedItems as $item) {
+                        POD::execute("INSERT INTO {$database['prefix']}FeedReads (blogid, item) VALUES ($blogid, $item)");
+                    }
+            
+                }
             }
         }

trunk/resources/script/reader.js

@@ -623 +623 @@
 {
     var request = new HTTPRequest("POST", this.blogURL + "/owner/reader/action/mark/allread/");
-    request.presetProperty(getObject("entryTitleList" + id), "className", "unread active-class");
-    request.onSuccess = function () {
-        this.showUnreadOnly();
-        PM.showMessage(s_markedAsUnread, "center", "bottom");
+    request.onSuccess = function () {
+        Reader.showUnreadOnly();
+        PM.showMessage(s_markedAsReadAll, "center", "bottom");
     }
     request.send();