Changeset 4615

Timestamp:

10/24/07 23:06:21 (13 months ago)

Author:

inureyes

Message:

#719

• draft를 핸들링하도록 소스 수정
  
• 테스트와 인터페이스가 남았음~
  

Location:

trunk

Files:

• blog/owner/entry/add/index.php (modified) (3 diffs)
• blog/owner/entry/edit/item.php (modified) (3 diffs)
• blog/owner/entry/update/item.php (modified) (3 diffs)
• lib/config.php (modified) (1 diff)
• lib/model/blog.entry.php (modified) (11 diffs)

trunk/blog/owner/entry/add/index.php

@@ -17 +17 @@
         'acceptComment' => array(array('0', '1'), 'default' => '0'),
         'acceptTrackback' => array(array('0', '1'), 'default' => '0'),
-        'published' => array('int', 0, 'default' => 1)
+        'published' => array('int', 0, 'default' => 1),
+        'draft' => array(array('0', '1'), 'default' => '0')
         )
     );
@@ -24 +25 @@
 
 requireStrictRoute();
+$entry = array();
 $entry['visibility'] = $_POST['visibility'];
 $entry['category'] = empty($_POST['category']) ? 0 : $_POST['category'];
@@ -38 +40 @@
 $entry['acceptTrackback'] = empty($_POST['acceptTrackback']) ? 0 : 1;
 $entry['published'] = empty($_POST['published']) ? 1 : $_POST['published'];
+$entry['draft'] = empty($_POST['draft']) ? 0 : $_POST['draft'];
 if ($id = addEntry($blogid, $entry)) {
     fireEvent('AddPost', $id, $entry);

trunk/blog/owner/entry/edit/item.php

@@ -29 +29 @@
     $suri['id'] = 0;
 
-$entry = getEntry(getBlogId(), $suri['id'], false);
+if($_GET['draft']) {
+    $entry = getEntry(getBlogId(), $suri['id'], true);
+} else {
+    $entry = getEntry(getBlogId(), $suri['id'], false);
+}
 if (!$entry) {
     respondErrorPage(_t('포스트 정보가 존재하지 않습니다.'));
@@ -295 +299 @@
                                             return false;
                                         }
+                                        data = data+"&draft=1";
                                         if(entryManager.isSaved == true) {
                                             var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/entry/update/"+entryManager.entryId);
@@ -354 +359 @@
                                         if (data == null)
                                             return false;
-
+                                        data = data+"&draft=0";
                                         if(entryManager.isSaved == true) {
                                             var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/entry/update/"+entryManager.entryId);

trunk/blog/owner/entry/update/item.php

@@ -17 +17 @@
         'acceptComment' => array(array('0', '1'), 'default' => '0'),
         'acceptTrackback' => array(array('0', '1'), 'default' => '0'),
-        'published' => array('int', 0, 'default' => 1)
+        'published' => array('int', 0, 'default' => 1),
+        'draft' => array(array('0', '1'), 'default' => '0')
     )
 );
@@ -24 +25 @@
 
 requireStrictRoute();
-if ($entry = getEntry($blogid, $suri['id'])) {
+$entry = array();
+$isDraft = empty($_POST['draft']) ? 0 : $_POST['draft'];
+if($isDraft) { // Prepare for draft saving.
+    $entry['id'] = $suri['id'];
     $entry['visibility'] = $_POST['visibility'];
     $entry['category'] = $_POST['category'];
@@ -37 +41 @@
     $entry['acceptTrackback'] = empty($_POST['acceptTrackback']) ? 0 : 1;
     $entry['published'] = empty($_POST['published']) ? 0 : $_POST['published'];
+    $entry['draft'] = empty($_POST['draft']) ? 0 : $_POST['draft'];
+} else if ($entry = getEntry($blogid, $suri['id'], $isDraft)) { // Non-draft saving.
+    $entry['visibility'] = $_POST['visibility'];
+    $entry['category'] = $_POST['category'];
+    $entry['location'] = empty($_POST['location']) ? '/' : $_POST['location'];
+    $entry['tag'] = empty($_POST['tag']) ? '' : $_POST['tag'];
+    $entry['title'] = $_POST['title'];
+    $entry['content'] = $_POST['content'];
+    $entry['contentFormatter'] = $_POST['contentFormatter'];
+    $entry['contentEditor'] = $_POST['contentEditor'];
+    $entry['slogan'] = $_POST['permalink'];
+    $entry['acceptComment'] = empty($_POST['acceptComment']) ? 0 : 1;
+    $entry['acceptTrackback'] = empty($_POST['acceptTrackback']) ? 0 : 1;
+    $entry['published'] = empty($_POST['published']) ? 0 : $_POST['published'];
+    $entry['draft'] = empty($_POST['draft']) ? 0 : $_POST['draft'];
+}
+if(!empty($entry)) {
     setBlogSetting('LatestEditedEntry_user'.getUserId(),$suri['id']);
     if($id = updateEntry($blogid, $entry)) {

trunk/lib/config.php

@@ -18 +18 @@
 }
 // Define global variable.
-global $database, $service;
+global $database, $service, $blog;
 $database['server'] = 'localhost';
 $database['database'] = '';

trunk/lib/model/blog.entry.php

@@ -421 +421 @@
     $entry['location'] = UTF8::lessenAsEncoding(trim($entry['location']), 255);
     $entry['slogan'] = array_key_exists('slogan', $entry) ? trim($entry['slogan']) : '';
+    
+    $isDraft = empty($entry['draft']) ? 0 : $entry['draft'];
+    
     if((empty($entry['slogan']))||($entry['category'] == -1)) {
         $slogan = $slogan0 = getSlogan($entry['title']);
@@ -445 +448 @@
     }
 
-    $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' LIMIT 1");
+    $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' AND draft = $isDraft LIMIT 1");
     for ($i = 1; $result > 0; $i++) {
         if ($i > 1000)
             return false;
         $slogan = tc_escape_string(UTF8::lessenAsEncoding($slogan0, 245) . '-' . $i);
-        $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' LIMIT 1");
+        $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' AND draft = $isDraft LIMIT 1");
     }
     $userid = $entry['userid'];
@@ -464 +467 @@
         $published = 'UNIX_TIMESTAMP()';
     }
-    $currentMaxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE blogid = $blogid and draft = 0");
-    if(!empty($currentMaxId) && $currentMaxId > 0) {
-        $id = $currentMaxId + 1;
+    
+    if(isset($entry['id'])) { // entry id가 있는 경우 (주로 updateEntry에 의하여 draft를 생성하는 경우가 될 것이다)
+        if(DBQuery::queryCell("SELECT count(*) FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = {$entry['id']} AND draft = $isDraft") != 0) { // 이미 원하는 draft에 같은 id가 다 존재한다. 이 경우 저장할 수 없음.
+            return false;
+        } else {
+            $id = $entry['id'];
+        }
     } else {
-        $id = 1;
+        $currentMaxId = DBQuery::queryCell("SELECT MAX(id) FROM {$database['prefix']}Entries WHERE blogid = $blogid AND draft = 0");
+        if(!empty($currentMaxId) && $currentMaxId > 0) {
+            $id = $currentMaxId + 1;
+        } else {
+            $id = 1;
+        }
     }
     $result = DBQuery::query("INSERT INTO {$database['prefix']}Entries 
@@ -478 +490 @@
             $userid,
             $id,
-            0,
+            $isDraft,
             {$entry['visibility']},
             {$entry['category']},
@@ -497 +509 @@
     if (!$result)
         return false;
-    DBQuery::query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = $id AND draft = 1");
     DBQuery::query("UPDATE {$database['prefix']}Attachments SET parent = $id WHERE blogid = $blogid AND parent = 0");
-    updateEntriesOfCategory($blogid, $entry['category']);
-    if ($entry['visibility'] == 3)
-        syndicateEntry($id, 'create');
-    if ($entry['visibility'] >= 2)
-        clearRSS();
-    if (!empty($entry['tag'])) {
-        $tags = getTagsWithEntryString($entry['tag']);
-        addTagsWithEntryId($blogid, $id, $tags);
+    if(!$isDraft) {
+        DBQuery::query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = $id AND draft = 1");
+        updateEntriesOfCategory($blogid, $entry['category']);
+        if ($entry['visibility'] == 3)
+            syndicateEntry($id, 'create');
+        if ($entry['visibility'] >= 2)
+            clearRSS();
+        if (!empty($entry['tag'])) {
+            $tags = getTagsWithEntryString($entry['tag']);
+            addTagsWithEntryId($blogid, $id, $tags);
+        }
     }
     return $id;
@@ -521 +535 @@
 
     if($entry['id'] == 0) return false;
-
+    $isDraft = empty($entry['draft']) ? 0 : $entry['draft'];
+
+    // entry가 draft가 없으면서(draft = 1인 글이 없는 경우) 저장하려는 요구사항이 draft인 경우는 addEntry로 글을 더한다.
+    $draftCount = DBQuery::queryCell("SELECT count(*) FROM {$database['prefix']}Entries
+        WHERE blogid = $blogid
+            AND id = ".$entry['id']."
+            AND draft = 1");
+    if(($draftCount == 0) && ($isDraft == 1)) {
+        return addEntry($blogid, $entry);
+    }
+    // draft가 없으면서 정상적인 글을 저장하려는 경우, (이 경우는 현재 글을 update한다.)
+    // draft가 있으면서 정상적인 글을 저장하려는 경우, (이 경우는 draft를 update한다.)
+    // draft가 있으면서 draft를 저장하려는 경우가 남음. (이 경우도 draft를 update한다.)
+    
     if(empty($entry['userid'])) $entry['userid'] = getUserId(); 
     $entry['title'] = UTF8::lessenAsEncoding(trim($entry['title']));
@@ -537 +564 @@
         if($entry['visibility'] == 1 || $entry['visibility'] == 3)
             return false;
-        if(DBQuery::queryCell("SELECT count(*) FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id <> {$entry['id']} AND draft = 0 AND title = '$title' AND category = -1") > 0)
+        if(DBQuery::queryCell("SELECT count(*) 
+            FROM {$database['prefix']}Entries 
+            WHERE blogid = $blogid 
+                AND id <> {$entry['id']} 
+                AND draft = 0 
+                AND title = '$title' 
+                AND category = -1") > 0)
             return false;
     }
@@ -549 +582 @@
     }
     
-    $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' AND id = {$entry['id']} LIMIT 1");
+    $result = DBQuery::queryCount("SELECT slogan 
+        FROM {$database['prefix']}Entries 
+        WHERE blogid = $blogid 
+        AND slogan = '$slogan' 
+        AND id = {$entry['id']} 
+        AND draft = $isDraft LIMIT 1");
     if ($result == 0) { // if changed
-        $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' LIMIT 1");
+        $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' AND draft = $isDraft LIMIT 1");
         for ($i = 1; $result > 0; $i++) {
             if ($i > 1000)
                 return false;
             $slogan = tc_escape_string(UTF8::lessenAsEncoding($slogan0, 245) . '-' . $i);
-            $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' LIMIT 1");
+            $result = DBQuery::queryCount("SELECT slogan FROM {$database['prefix']}Entries WHERE blogid = $blogid AND slogan = '$slogan' AND draft = $isDraft LIMIT 1");
         }
     }
@@ -578 +616 @@
             break;
     }
+    
+    // draft가 없으면서 정상적인 글을 저장하려는 경우, (이 경우는 현재 글을 update한다.)
+    if(($draftCount == 0) && ($isDraft == 0)) $draftSign = 0;
+    else $draftSign = 1;
+
     $result = DBQuery::query("UPDATE {$database['prefix']}Entries
             SET
@@ -583 +626 @@
                 visibility         = {$entry['visibility']},
                 category           = {$entry['category']},
+                draft              = $isDraft,
                 location           = '$location',
                 title              = '$title',
@@ -593 +637 @@
                 published          = $published,
                 modified           = UNIX_TIMESTAMP()
-            WHERE blogid = $blogid AND id = {$entry['id']} AND draft = 0");
-    if ($result)
-        DBQuery::query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = {$entry['id']} AND draft = 1");
-    updateEntriesOfCategory($blogid, $entry['category']);
-    if ($entry['visibility'] == 3)
-        syndicateEntry($entry['id'], 'modify');
-    DBQuery::query("UPDATE {$database['prefix']}Attachments SET parent = {$entry['id']} WHERE blogid = $blogid AND parent = 0");
-    if ($entry['visibility'] >= 2)
-        clearRSS();
+            WHERE blogid = $blogid AND id = {$entry['id']} AND draft = $draftSign");
+    if($isDraft == 0) {  // Publishing phase.
+        if ($result) // 정상적인 글을 저장하려는 경우 draft는 날린다.
+            DBQuery::query("DELETE FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = {$entry['id']} AND draft = 1");
+        updateEntriesOfCategory($blogid, $entry['category']);
+        if ($entry['visibility'] == 3)
+            syndicateEntry($entry['id'], 'modify');
+        DBQuery::query("UPDATE {$database['prefix']}Attachments SET parent = {$entry['id']} WHERE blogid = $blogid AND parent = 0");
+        if ($entry['visibility'] >= 2)
+            clearRSS();
+    }
     return $result ? $entry['id'] : false;
 }