Changeset 5194

Timestamp:

02/02/08 16:38:05 (8 months ago)

Author:

inureyes

Message:

#819

• 로그인 비밀번호로도 API를 사용할 수 있도록 함.
  
• RSS 주소 변경 사항을 반영
  

Location:

trunk

Files:

• components/Textcube.Core.php (modified) (1 diff)
• interface/owner/data/remove/index.php (modified) (1 diff)
• lib/auth.php (modified) (1 diff)
• lib/model/blog.blogSetting.php (modified) (1 diff)
• lib/model/blog.rss.php (modified) (1 diff)
• lib/piece/blog/end.php (modified) (1 diff)
• lib/piece/blog/entries.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)

trunk/components/Textcube.Core.php

@@ -148 +148 @@
     
     /*@static@*/
-    function confirmPassword($password) {
-        global $database;
+    function confirmPassword($userid = null, $password) {
+        global $database;
+        if(empty($userid)) $userid = getUserId(); 
         $password = md5($password);
-        return POD::queryExistence("SELECT userid FROM {$database['prefix']}Users WHERE userid = ".User::getBlogOwner(getBlogId())." AND password = '$password'");
+        return POD::queryExistence("SELECT userid FROM {$database['prefix']}Users WHERE userid = $userid AND password = '$password'");
     }
 

trunk/interface/owner/data/remove/index.php

@@ -12 +12 @@
 requireStrictRoute();
 requireComponent('Textcube.Data.DataMaintenance');
-if (empty($_POST['confirmativePassword']) || !User::confirmPassword($_POST['confirmativePassword']))
+if (empty($_POST['confirmativePassword']) || !User::confirmPassword(User::getBlogOwner(getBlogId()), $_POST['confirmativePassword']))
     respond::ResultPage(1);
 DataMaintenance::removeAll(Validator::getBool(@$_POST['removeAttachments']));

trunk/lib/auth.php

@@ -109 +109 @@
 }
 
+function validateAPIKey($blogid, $loginid, $key) {
+    requireComponent('Textcube.Function.Setting');
+    global $service;
+    $loginid = POD::escapeString($loginid);
+    $key = POD::escapeString($key);
+    $userid = getUserIdByEmail($loginid);
+    if( $userid === false ) { return false; }
+    $currentAPIKey = setting::getUserSettingGlobal('APIKey',null,$userid);
+    if($currentAPIKey == null) {
+        if(!User::confirmPassword($userid, $key)) {
+            header('HTTP/1.1 403 Forbidden');
+            exit;
+        }
+    } else if($currentAPIKey != $key) {
+        header('HTTP/1.1 403 Forbidden');
+        exit;
+    }
+    return true;
+}
+
 function isLoginId($blogid, $loginid) {
     global $database;

trunk/lib/model/blog.blogSetting.php

@@ -459 +459 @@
     $sql = "UPDATE `{$database['prefix']}Users` SET password = '$pwd' WHERE `userid` = $userid";
     return POD::execute($sql);
+}
+
+function changeAPIKey($userid, $key) {
+    requireComponent('Textcube.Function.Setting');
+    if($key) return setting::setUserSettingGlobal('APIKey',$key,$userid);
+    else return false;
 }
 

trunk/lib/model/blog.rss.php

@@ -315 +315 @@
 }
 
+function getCommentNotifiedRSSTotal($blogid) {
+    global $database, $serviceURL, $defaultURL, $blogURL, $blog, $service;
+
+    if(empty($blogid)) $blogid = getBlogId();
+
+    $channel = array();
+    $channel['title'] = $blog['title']. ': '._text('최근 댓글 알리미 목록');
+    $channel['link'] = "$defaultURL/";
+    $channel['description'] = $blog['description'];
+    $channel['language'] = $blog['language'];
+    $channel['pubDate'] = Timestamp::getRFC1123();
+    $channel['generator'] = TEXTCUBE_NAME . ' ' . TEXTCUBE_VERSION;
+
+    if (!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);
+    for ($i = 0; $i < count($comments); $i++) {
+        array_push($mergedComments, $comments[$i]);
+        $result = getCommentCommentsNotified($comments[$i]['id']);
+        for ($j = 0; $j < count($result); $j++) {
+            array_push($mergedComments, $result[$j]);
+        }
+    }   
+    
+    if (!$mergedComments)
+        $mergedComments = array();
+
+    $channel['items'] = array();
+    foreach($mergedComments as $row) {
+        $item = array(
+            'id' => $row['id'], 
+            'title' => $row['entryTitle'], 
+            'link' => $row['url'], 
+            'categories' => array(), 
+            'description' => htmlspecialchars($row['comment']), 
+            'author' => '('.htmlspecialchars($row['name']).')', 
+            'pubDate' => Timestamp::getRFC1123($row['written']),
+            'comments' => $row['entryUrl'],
+            'guid' => $row['url']
+        );
+        array_push($channel['items'], $item);
+    }
+    $rss = array('channel' => $channel);
+    return publishRSS($blogid, $rss);
+}
+
 function publishRSS($blogid, $data) {
     global $blog;

trunk/lib/piece/blog/end.php

@@ -82 +82 @@
 }
 dress('rss_url', "$blogURL/rss", $view);
-dress('comment_rss_url', "$blogURL/comment/rss", $view);
-dress('trackback_rss_url', "$blogURL/trackback/rss", $view);
+dress('comment_rss_url', "$blogURL/rss/comment", $view);
+dress('trackback_rss_url', "$blogURL/rss/trackback", $view);
 dress('owner_url', "$blogURL/owner", $view);
 dress('textcube_name', TEXTCUBE_NAME, $view);

trunk/lib/piece/blog/entries.php

@@ -103 +103 @@
             dress('article_rep_id', $entry['id'], $entryView);
             dress('article_rep_link', $permalink, $entryView);
-            dress('article_rep_rp_rssurl', $defaultURL.'/comment/rss/'.$entry['id'], $entryView);
-            dress('article_rep_tb_rssurl', $defaultURL.'/trackback/rss/'.$entry['id'], $entryView);
+            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_title', htmlspecialchars(fireEvent('ViewPostTitle', $entry['title'], $entry['id'])), $entryView);
             // 사용자가 작성한 본문은 lib/piece/blog/end.php의 removeAllTags() 다음에 처리하기 위한 조치.

trunk/rewrite.php

@@ -39 +39 @@
     $interfacePath = null;
     if(in_array($pathPart, array('favicon.ico','index.gif'))) {require_once 'interface/'.$pathPart.'.php';exit;}
-    if(!empty($accessInfo['URLfragment']) && in_array($accessInfo['URLfragment'][0],array('api','archive','attachment','author','category','checkup','cover','entry','feeder','guestbook','keylog','location','logout','notice','page','plugin','pluginForOwner','rss','search','suggest','sync','tag'))) {
+    if(!empty($accessInfo['URLfragment']) && in_array($accessInfo['URLfragment'][0],array('api','archive','attachment','author','category','checkup','cover','entry','feeder','guestbook','keylog','location','logout','notice','page','plugin','pluginForOwner','search','suggest','sync','tag'))) {
         $pathPart = $accessInfo['URLfragment'][0];
         $interfacePath = 'interface/blog/'.$pathPart.'.php';