Changeset 5557

Timestamp:

03/07/08 22:36:19 (10 months ago)

Author:

inureyes

Message:

#863

• 카테고리 / 태그의 글 주소/숫자 사용을 결정할 수 있도록 함.
  
• 관련 설정 전부 반영
  
• 영어 리소스 번역 약간 추가
  

Location:

trunk

Files:

• components/Textcube.Data.BlogSetting.php (modified) (3 diffs)
• components/Textcube.Function.Setting.php (modified) (1 diff)
• interface/blog/sync.php (modified) (1 diff)
• interface/blog/tag.php (modified) (1 diff)
• interface/comment/add/index.php (modified) (1 diff)
• interface/comment/comment/index.php (modified) (1 diff)
• interface/owner/data/export/index.php (modified) (1 diff)
• interface/owner/data/import/index.php (modified) (1 diff)
• interface/owner/setting/blog/index.php (modified) (2 diffs)
• interface/owner/setting/blog/slogan/index.php (modified) (1 diff)
• interface/trackback/index.php (modified) (1 diff)
• language/en.php (modified) (4 diffs)
• lib/model/blog.blogSetting.php (modified) (2 diffs)
• lib/model/blog.comment.php (modified) (1 diff)
• lib/model/blog.entry.php (modified) (5 diffs)
• lib/model/blog.rss.php (modified) (3 diffs)
• lib/model/blog.tag.php (modified) (7 diffs)
• lib/piece/blog/commentList.php (modified) (1 diff)
• lib/piece/blog/entries.php (modified) (1 diff)
• lib/piece/blog/list.php (modified) (1 diff)
• lib/piece/blog/locatives.php (modified) (1 diff)
• lib/piece/blog/siteTags.php (modified) (1 diff)
• lib/piece/blog/trackbackList.php (modified) (1 diff)
• lib/view/view.php (modified) (9 diffs)

trunk/components/Textcube.Data.BlogSetting.php

@@ -16 +16 @@
         $this->description =
         $this->banner =
-        $this->useSlogan =
+        $this->useSloganOnPost =
         $this->entriesOnPage =
         $this->entriesOnList =
@@ -63 +63 @@
                             break;
                         case 'defaultDomain':
-                        case 'useSlogan':
+                        case 'useSloganOnPost':
                         case 'acceptGuestComment':
                         case 'acceptCommentOnGuestComment':
@@ -108 +108 @@
             setBlogSetting('logo', $this->banner);
         }
-        if (isset($this->useSlogan))
-            setBlogSetting('useSlogan', Validator::getBit($this->useSlogan));
+        if (isset($this->useSloganOnPost))
+            setBlogSetting('useSloganOnPost', Validator::getBit($this->useSloganOnPost));
         if (isset($this->postsOnPage)) {
             if (!Validator::number($this->postsOnPage, 1))

trunk/components/Textcube.Function.Setting.php

@@ -74 +74 @@
                     'logoWidth'                => 0,
                     'logoHeight'               => 0,
-                    'useSlogan'                => 1,
+                    'useSloganOnPost'          => 1,
+                    'useSloganOnCategory'      => 1,
+                    'useSloganOnTag'           => 1,
                     'entriesOnPage'            => 10, 
                     'entriesOnList'            => 10, 

trunk/interface/blog/sync.php

@@ -26 +26 @@
     echo '</blog>', "\r\n";
     echo '<entry>', "\r\n";
-    echo '<permalink>', htmlspecialchars("$defaultURL/".($blog['useSlogan'] ? "entry/{$entry['slogan']}": $entry['id'])), '</permalink>', "\r\n";
+    echo '<permalink>', htmlspecialchars("$defaultURL/".($blog['useSloganOnPost'] ? "entry/{$entry['slogan']}": $entry['id'])), '</permalink>', "\r\n";
     echo '<title>', htmlspecialchars($entry['title']), '</title>', "\r\n";
     echo '<content>', htmlspecialchars(getEntryContentView($blogid, $suri['id'], $entry['content'], $entry['contentFormatter'])), '</content>', "\r\n";

trunk/interface/blog/tag.php

@@ -9 +9 @@
 $cache = new pageCache;
 if (strlen($suri['value'])) {
-    $tag = getTagId($blogid, $suri['value']);
+    if(!isset($suri['id'])) {
+        $tag = getTagId($blogid, $suri['value']);
+    } else {
+        $tag = $suri['id'];
+        $suri['value'] = getTagById($blogid, $suri['id']);
+    }
 
     $preservedEntries =

trunk/interface/comment/add/index.php

@@ -95 +95 @@
         if(!$comment['secret']) {
             if($row = POD::queryRow("SELECT * FROM {$database['prefix']}Entries WHERE blogid = $blogid AND id = $entryId AND draft = 0 AND visibility = 3 AND acceptComment = 1"))
-                sendCommentPing($entryId, "$defaultURL/".($blog['useSlogan'] ? "entry/{$row['slogan']}": $entryId), is_null($user) ? $comment['name'] : $user['name'], is_null($user) ? $comment['homepage'] : $user['homepage']);
+                sendCommentPing($entryId, "$defaultURL/".($blog['useSloganOnPost'] ? "entry/{$row['slogan']}": $entryId), is_null($user) ? $comment['name'] : $user['name'], is_null($user) ? $comment['homepage'] : $user['homepage']);
         }
         $skin = new Skin($skinSetting['skin']);

trunk/interface/comment/comment/index.php

@@ -60 +60 @@
             if($row = POD::queryRow("SELECT * FROM {$database['prefix']}Entries 
                 WHERE blogid = $blogid AND id = {$comment['entry']} AND draft = 0 AND visibility = 3 AND acceptComment = 1"))
-                sendCommentPing($comment['entry'], "$defaultURL/".($blog['useSlogan'] ? "entry/{$row['slogan']}": $comment['entry']), is_null($user) ? $comment['name'] : $user['name'], is_null($user) ? $comment['homepage'] : $user['homepage']);
+                sendCommentPing($comment['entry'], "$defaultURL/".($blog['useSloganOnPost'] ? "entry/{$row['slogan']}": $comment['entry']), is_null($user) ? $comment['name'] : $user['name'], is_null($user) ? $comment['homepage'] : $user['homepage']);
         }
         $skin = new Skin($skinSetting['skin']);

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

@@ -67 +67 @@
         $writer->write('</content>');
     }
-    $writer->write('</banner>' . '<useSlogan>' . Validator::getBit($setting->useSlogan) . '</useSlogan>' . '<postsOnPage>' . $setting->postsOnPage . '</postsOnPage>' . '<postsOnList>' . $setting->postsOnList . '</postsOnList>' . '<postsOnFeed>' . $setting->postsOnFeed . '</postsOnFeed>' . '<publishWholeOnFeed>' . Validator::getBit($setting->publishWholeOnFeed) . '</publishWholeOnFeed>' . '<acceptGuestComment>' . Validator::getBit($setting->acceptGuestComment) . '</acceptGuestComment>' . '<acceptCommentOnGuestComment>' . Validator::getBit($setting->acceptCommentOnGuestComment) . '</acceptCommentOnGuestComment>' . '<language>' . $setting->language . '</language>' . '<timezone>' . $setting->timezone . '</timezone>' . '</setting>');
+    $writer->write('</banner>' . '<useSloganOnPost>' . Validator::getBit($setting->useSloganOnPost) . '</useSloganOnPost>' . '<postsOnPage>' . $setting->postsOnPage . '</postsOnPage>' . '<postsOnList>' . $setting->postsOnList . '</postsOnList>' . '<postsOnFeed>' . $setting->postsOnFeed . '</postsOnFeed>' . '<publishWholeOnFeed>' . Validator::getBit($setting->publishWholeOnFeed) . '</publishWholeOnFeed>' . '<acceptGuestComment>' . Validator::getBit($setting->acceptGuestComment) . '</acceptGuestComment>' . '<acceptCommentOnGuestComment>' . Validator::getBit($setting->acceptCommentOnGuestComment) . '</acceptCommentOnGuestComment>' . '<language>' . $setting->language . '</language>' . '<timezone>' . $setting->timezone . '</timezone>' . '</setting>');
     $writer->write(CRLF);
 }

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

@@ -250 +250 @@
             if (isset($node['banner'][0]['name'][0]['.value']))
                 $setting->banner = $node['banner'][0]['name'][0]['.value'];
-            if (isset($node['useSlogan'][0]['.value']))
-                $setting->useSlogan = $node['useSlogan'][0]['.value'];
+            if (isset($node['useSloganOnPost'][0]['.value']))
+                $setting->useSloganOnPost = $node['useSloganOnPost'][0]['.value'];
             if (isset($node['postsOnPage'][0]['.value']))
                 $setting->postsOnPage = $node['postsOnPage'][0]['.value'];

trunk/interface/owner/setting/blog/index.php

@@ -234 +234 @@
                                 }
                                 
-                                var useSlogan = "<?php echo $blog['useSlogan'];?>";
+                                var useSlogan             = "<?php echo $blog['useSloganOnPost'];?>";
+                                var useCSlogan            = "<?php echo $blog['useSloganOnCategory'];?>";
+                                var useTSlogan            = "<?php echo $blog['useSloganOnTag'];?>";
                                 var publishEolinSyncOnRSS = "<?php echo $blog['publishEolinSyncOnRSS'];?>";
-                                var entriesOnRSS = "<?php echo $blog['entriesOnRSS'];?>";
-                                var publishWholeOnRSS = "<?php echo $blog['publishWholeOnRSS'];?>";
+                                var entriesOnRSS          = "<?php echo $blog['entriesOnRSS'];?>";
+                                var publishWholeOnRSS     = "<?php echo $blog['publishWholeOnRSS'];?>";
                                 var allowCommentGuestbook = <?php echo $blog['allowWriteDblCommentOnGuestbook'];?>;
-                                var blogVisibility = <?php echo $blog['visibility'];?>;
+                                var blogVisibility        = <?php echo $blog['visibility'];?>;
 
                                 //var allowWriteGuestbook = <?php echo $blog['allowWriteOnGuestbook'];?>;
                                 function setRSS() {
-                                    if (document.getElementById('rss-form').useSlogan[useSlogan].checked == true) {
-                                        if (document.getElementById('rss-form').useSlogan.value != useSlogan) {
-                                            var request = new HTTPRequest("GET", "<?php echo $blogURL;?>/owner/setting/blog/slogan/" + (document.getElementById('rss-form').useSlogan[0].checked ? 1 : 0));
-                                            request.onSuccess = function() {
-                                                useSlogan = document.getElementById('rss-form').useSlogan[0].checked ? 1 : 0;
+                                    if (document.getElementById('rss-form').useSlogan[useSlogan].checked == true
+                                        || document.getElementById('rss-form').useCSlogan[useCSlogan].checked == true
+                                        || document.getElementById('rss-form').useTSlogan[useTSlogan].checked == true) {
+                                        var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/setting/blog/slogan/");
+                                        
+                                        request.onSuccess = function() {
+                                            useSlogan = document.getElementById('rss-form').useSlogan[0].checked ? 1 : 0;
+                                            useCSlogan = document.getElementById('rss-form').useCSlogan[0].checked ? 1 : 0;
+                                            useTSlogan = document.getElementById('rss-form').useTSlogan[0].checked ? 1 : 0;
                                                 PM.showMessage("<?php echo _t('저장되었습니다.');?>", "center", "bottom");
                                             }
-                                            request.onError = function() {
-                                                alert("<?php echo _t('글 주소 표기법을 변경할 수 없습니다.');?>");
-                                            }
-                                            request.send();
-                                        }
-                                    }
-                                    
+                                        request.onError = function() {
+                                            alert("<?php echo _t('글 주소 표기법을 변경할 수 없습니다.');?>");
+                                        }
+                                        request.send("useSloganOnPost="+(document.getElementById('rss-form').useSlogan[0].checked ? 1 : 0)
+                                            +"&useSloganOnCategory="+(document.getElementById('rss-form').useCSlogan[0].checked ? 1 : 0)
+                                            +"&useSloganOnTag="+(document.getElementById('rss-form').useTSlogan[0].checked ? 1 : 0)
+                                        );
+//                                      }
+                                    } 
                                     
                                     var request = new HTTPRequest("POST", "<?php echo $blogURL;?>/owner/setting/blog/rss/");
@@ -643 +651 @@
                                             <dt><span class="label"><?php echo _t('글 주소');?></span></dt>
                                             <dd>
-                                                <input type="radio" id="useSlogan1" class="radio" name="useSlogan"<?php echo ($blog['useSlogan'] ? ' checked="checked"' : '');?> /><label for="useSlogan1"><span class="text"><?php echo _t('문자를 사용합니다.');?> <samp><?php echo _f('(예: %1/entry/텍스트큐브로-오신-것을-환영합니다)',link_cut(getBlogURL()));?></samp></span></label><br />
-                                                <input type="radio" id="useSlogan0" class="radio" name="useSlogan"<?php echo ($blog['useSlogan'] ? '' : ' checked="checked"');?> /><label for="useSlogan0"><span class="text"><?php echo _t('숫자를 사용합니다.');?> <samp><?php echo _f('(예: %1/123)', link_cut(getBlogURL()));?></samp></span></label>
+                                                <input type="radio" id="useSlogan1" class="radio" name="useSlogan"<?php echo ($blog['useSloganOnPost'] ? ' checked="checked"' : '');?> /><label for="useSlogan1"><span class="text"><?php echo _t('문자를 사용합니다.');?> <samp><?php echo _f('(예: %1/entry/텍스트큐브로-오신-것을-환영합니다)',link_cut(getBlogURL()));?></samp></span></label><br />
+                                                <input type="radio" id="useSlogan0" class="radio" name="useSlogan"<?php echo ($blog['useSloganOnPost'] ? '' : ' checked="checked"');?> /><label for="useSlogan0"><span class="text"><?php echo _t('숫자를 사용합니다.');?> <samp><?php echo _f('(예: %1/123)', link_cut(getBlogURL()));?></samp></span></label>
+                                            </dd>
+                                        </dl>
+                                        <dl id="category-address-line" class="line">
+                                            <dt><span class="label"><?php echo _t('카테고리 주소');?></span></dt>
+                                            <dd>
+                                                <input type="radio" id="useCSlogan1" class="radio" name="useCSlogan"<?php echo ($blog['useSloganOnCategory'] ? ' checked="checked"' : '');?> /><label for="useCSlogan1"><span class="text"><?php echo _t('문자를 사용합니다.');?> <samp><?php echo _f('(예: %1/category/텍스트큐브)',link_cut(getBlogURL()));?></samp></span></label><br />
+                                                <input type="radio" id="useCSlogan0" class="radio" name="useCSlogan"<?php echo ($blog['useSloganOnCategory'] ? '' : ' checked="checked"');?> /><label for="useCSlogan0"><span class="text"><?php echo _t('숫자를 사용합니다.');?> <samp><?php echo _f('(예: %1/category/1)', link_cut(getBlogURL()));?></samp></span></label>
+                                            </dd>
+                                        </dl>
+                                        <dl id="tag-address-line" class="line">
+                                            <dt><span class="label"><?php echo _t('태그 주소');?></span></dt>
+                                            <dd>
+                                                <input type="radio" id="useTSlogan1" class="radio" name="useTSlogan"<?php echo ($blog['useSloganOnTag'] ? ' checked="checked"' : '');?> /><label for="useTSlogan1"><span class="text"><?php echo _t('문자를 사용합니다.');?> <samp><?php echo _f('(예: %1/tag/텍스트큐브)',link_cut(getBlogURL()));?></samp></span></label><br />
+                                                <input type="radio" id="useTSlogan0" class="radio" name="useTSlogan"<?php echo ($blog['useSloganOnTag'] ? '' : ' checked="checked"');?> /><label for="useTSlogan0"><span class="text"><?php echo _t('숫자를 사용합니다.');?> <samp><?php echo _f('(예: %1/tag/101)', link_cut(getBlogURL()));?></samp></span></label>
                                             </dd>
                                         </dl>

trunk/interface/owner/setting/blog/slogan/index.php

@@ -3 +3 @@
 /// All rights reserved. Licensed under the GPL.
 /// See the GNU General Public License for more details. (/doc/LICENSE, /doc/COPYRIGHT)
+$IV = array(
+    'POST' => array(
+        'useSloganOnPost' => array('int',0,1),
+        'useSloganOnCategory' => array('int',0,1),
+        'useSloganOnTag' => array('int',0,1)
+    )
+);
+
 require ROOT . '/lib/includeForBlogOwner.php';
 requireStrictRoute();
-if (useBlogSlogan($blogid, $suri['id']))
+if (useBlogSlogan($blogid, $_POST['useSloganOnPost'],$_POST['useSloganOnCategory'],$_POST['useSloganOnTag']))
     respond::ResultPage(0);
 respond::ResultPage( - 1);

trunk/interface/trackback/index.php

@@ -43 +43 @@
             AND visibility = 3 
             AND acceptComment = 1"))
-        sendTrackbackPing($suri['id'], "$defaultURL/".($blog['useSlogan'] ? "entry/{$row['slogan']}": $suri['id']), $url, $blog_name, $title);
+        sendTrackbackPing($suri['id'], "$defaultURL/".($blog['useSloganOnPost'] ? "entry/{$row['slogan']}": $suri['id']), $url, $blog_name, $title);
     respond::ResultPage(0);
 } else {

trunk/language/en.php

@@ -1042 +1042 @@
 $__text['오름차순'] = 'Ascending order';
 $__text['오직하나뿐인'] = 'Sweetheart';
-//$__text['오픈아이디 게스트 로그인'] = '';
-//$__text['오픈아이디 기억'] = '';
+$__text['오픈아이디 게스트 로그인'] = 'OpenID Guest login';
+$__text['오픈아이디 기억'] = 'Remember OpenID';
 //$__text['오픈아이디 댓글 테이블을 기존 댓글 테이블에 병합합니다'] = '';
 $__text['오픈아이디 로그인 목록'] = 'OpenID Login List';
 $__text['오픈아이디 로그인 사용자에게만 댓글을 허용하도록 설정하러 가기'] = 'Set to accept comment only to the OpenID users';
-//$__text['오픈아이디 발급하기'] = '';
-//$__text['오픈아이디 사용자 테이블을 만듭니다'] = '';
+$__text['오픈아이디 발급하기'] = 'Issue an OpenID';
+$__text['오픈아이디 사용자 테이블을 만듭니다'] = 'Creating OpenID User table';
 $__text['오픈아이디 연결'] = 'OpenID Connection';
-//$__text['오픈아이디 인증'] = '';
-//$__text['오픈아이디 저장'] = '';
+$__text['오픈아이디 인증'] = 'Authorize OpenID';
+$__text['오픈아이디 저장'] = 'Save OpenID';
 $__text['오픈아이디 주소(이름)'] = 'OpenID Address(Name)';
 $__text['오픈아이디 플러그인 설정 바로가기'] = 'Go to OpenID plugin setting';
 $__text['오픈아이디 플러그인을 사용하고 있지 않으므로, 오픈아이디는 설정할 수 없습니다. 관리자에게 문의 하십시오'] = 'OpenID plugin is inactivated, so you cannot set up OpenID. Contact Admin.';
 $__text['오픈아이디'] = 'OpenID';
-//$__text['오픈아이디란?'] = '';
-//$__text['오픈아이디로 글쓰기'] = '';
+$__text['오픈아이디란?'] = 'What is OpenID?';
+$__text['오픈아이디로 글쓰기'] = 'Write with OpenID';
 $__text['오픈아이디로 로그인을 해야만 댓글 및 방명록을 쓸 수 있습니다.'] = 'You can leave a comment or write in guestbook only when logged in with OpenID.';
 $__text['오픈아이디로 로그인하여 쓴 댓글/방명록에 오픈아이디 아이콘을 표시합니다.'] = 'Show OpenID icon in comments and guesbook written with OpenID.';
@@ -1068 +1068 @@
 $__text['올바른 스킨 디렉토리명이 아닙니다.\n디렉토리명에는 알파벳, 숫자, 언더바(_), 공백문자, 대쉬(-)만 사용하실 수 있습니다.'] = 'Invalid theme directory name.\\nYou can use only alphabet, numeric numbers, underbar(_), null character, or dash(-).';
 $__text['올바른 피드가 아닙니다.'] = 'Invalid Feed.';
-//$__text['완료'] = '';
+$__text['완료'] = 'Complete';
 $__text['완료.'] = 'Complete';
 $__text['완료되었습니다.'] = 'Completed';
@@ -1077 +1077 @@
 $__text['운영체제'] = 'OS';
 //$__text['움베르트 에코 -장미의 이름- 중'] = '';
-//$__text['원본 크기로 보기'] = '';
+$__text['원본 크기로 보기'] = 'View with original size';
 $__text['원하시는 스킨의 적용 버튼을 클릭하십시오.'] = 'Click "Apply" to use the theme.';
 //$__text['월요일'] = '';
@@ -1100 +1100 @@
 $__text['이 걸린글을 복원합니다.'] = 'Restore This Trackback.';
 $__text['이 걸린글을 삭제합니다.'] = 'Delete This Trackback';
-//$__text['이 계정은 %1에 생성되었습니다.'] = '';
+$__text['이 계정은 %1에 생성되었습니다.'] = 'This account is created at %1.';
 $__text['이 계정의 업로드 허용 용량은 <em>%1</em> 바이트로 백업파일의 크기가 이를 초과하는 경우 <acronym title="File Transfer Protocol">FTP</acronym> 등으로 원하시는 사이트에 업로드하신 후 이 파일의 웹 주소를 입력해서 진행하십시오. 이 경우, 보안을 위해 복원이 끝나면 반드시 그 백업파일을 웹 상에서 지우실 것을 권장합니다.'] = 'Upload file size limit for this account is %1 bytes. If backup file size exceeds this limit, try uploading the file to other web space via FTP, and enter the URL of the file location. After the restoration process is finished, deleting the backup file is recommended for the sake of security.';
 $__text['이 그룹 정보를 수정합니다.'] = 'Modify Group Information';

trunk/lib/model/blog.blogSetting.php

@@ -134 +134 @@
 }
 
-function useBlogSlogan($blogid, $useSlogan) {
+function useBlogSlogan($blogid, $useSloganOnPost, $useSloganOnCategory, $useSloganOnTag) {
     global $blog;
     requireModel('blog.rss');
     requireComponent('Needlworks.Cache.PageCache');
-    $useSlogan = $useSlogan ? 1 : 0;
-    if ($useSlogan == $blog['useSlogan'])
-        return true;
-    if(setBlogSetting('useSlogan',$useSlogan) === false) {
-        return false;
-    }
-    $blog['useSlogan'] = $useSlogan;
+    $useSloganOnPost     = $useSloganOnPost     ? 1 : 0;
+    $useSloganOnCategory = $useSloganOnCategory ? 1 : 0;
+    $useSloganOnTag      = $useSloganOnTag      ? 1 : 0;
+    if ($useSloganOnPost == $blog['useSloganOnPost'] 
+        && $useSloganOnCategory == $blog['useSloganOnCategory']
+        && $useSloganOnTag == $blog['useSloganOnTag'])
+        return true;
+/*  if(setBlogSetting('useSloganOnPost',$useSlogan) === false
+    || setBlogSetting('useSloganOnCategory',$useSlogan) === false
+    || setBlogSetting('useSloganOnTag',$useSlogan) === false
+        ) {
+        return false;
+    }*/
+    setBlogSetting('useSloganOnPost',$useSloganOnPost);
+    setBlogSetting('useSloganOnCategory',$useSloganOnCategory);
+    setBlogSetting('useSloganOnTag',$useSloganOnTag);
+
+    $blog['useSloganOnPost'] = $useSloganOnPost;
+    $blog['useSloganOnCategory'] = $useSloganOnCategory;
+    $blog['useSloganOnTag'] = $useSloganOnTag;
     CacheControl::flushCategory();
     CacheControl::flushEntry();
-    fireEvent('ToggleBlogSlogan',null,$blog['useSlogan']);
-    clearRSS();
-    return true;
+    CacheControl::flushTag();
+    fireEvent('ToggleBlogSlogan',null,$blog['useSloganOnPost']);
+    clearRSS();
+    return true; 
 }
 
@@ -277 +291 @@
             'logoWidth'                => 0,
             'logoHeight'               => 0,
-            'useSlogan'                => 1,
+            'useSloganOnPost'          => 1,
+            'useSloganOnCategory'      => 1,
+            'useSloganOnTag'           => 1,
             'entriesOnPage'            => 10,
             'entriesOnList'            => 10,

trunk/lib/model/blog.comment.php

@@ -819 +819 @@
         $r2_comment_check_url = rawurlencode("$defaultURL/guestbook#comment" . $comments['id']);
     }else{
-        $r1_comment_check_url = rawurlencode("$defaultURL/" . ($blog['useSlogan'] ? "entry/{$entry['slogan']}" : $entry['id']) . "#comment" . $parentComments['id']);
-        $r2_comment_check_url = rawurlencode("$defaultURL/" . ($blog['useSlogan'] ? "entry/{$entry['slogan']}" : $entry['id']) . "#comment" . $comments['id']);
+        $r1_comment_check_url = rawurlencode("$defaultURL/" . ($blog['useSloganOnPost'] ? "entry/{$entry['slogan']}" : $entry['id']) . "#comment" . $parentComments['id']);
+        $r2_comment_check_url = rawurlencode("$defaultURL/" . ($blog['useSloganOnPost'] ? "entry/{$entry['slogan']}" : $entry['id']) . "#comment" . $comments['id']);
     }
         
-    $data = "url=" . rawurlencode($defaultURL) . "&mode=fb" . "&s_home_title=" . rawurlencode($blog['title']) . "&s_post_title=" . rawurlencode($entry['title']) . "&s_name=" . rawurlencode($comments['name']) . "&s_no=" . rawurlencode($comments['entry']) . "&s_url=" . rawurlencode("$defaultURL/" . ($blog['useSlogan'] ? "entry/{$entry['slogan']}" : $entry['id'])) . "&r1_name=" . rawurlencode($parentComments['name']) . "&r1_no=" . rawurlencode($parentComments['id']) . "&r1_pno=" . rawurlencode($comments['entry']) . "&r1_rno=0" . "&r1_homepage=" . rawurlencode($parentComments['homepage']) . "&r1_regdate=" . rawurlencode($parentComments['written']) . "&r1_url=" . $r1_comment_check_url. "&r2_name=" . rawurlencode($comments['name']) . "&r2_no=" . rawurlencode($comments['id']) . "&r2_pno=" . rawurlencode($comments['entry']) . "&r2_rno=" . rawurlencode($comments['parent']) . "&r2_homepage=" . rawurlencode($comments['homepage']) . "&r2_regdate=" . rawurlencode($comments['written']) . "&r2_url=" . $r2_comment_check_url . "&r1_body=" . rawurlencode($parentComments['comment']) . "&r2_body=" . rawurlencode($comments['comment']);
+    $data = "url=" . rawurlencode($defaultURL) . "&mode=fb" . "&s_home_title=" . rawurlencode($blog['title']) . "&s_post_title=" . rawurlencode($entry['title']) . "&s_name=" . rawurlencode($comments['name']) . "&s_no=" . rawurlencode($comments['entry']) . "&s_url=" . rawurlencode("$defaultURL/" . ($blog['useSloganOnPost'] ? "entry/{$entry['slogan']}" : $entry['id'])) . "&r1_name=" . rawurlencode($parentComments['name']) . "&r1_no=" . rawurlencode($parentComments['id']) . "&r1_pno=" . rawurlencode($comments['entry']) . "&r1_rno=0" . "&r1_homepage=" . rawurlencode($parentComments['homepage']) . "&r1_regdate=" . rawurlencode($parentComments['written']) . "&r1_url=" . $r1_comment_check_url. "&r2_name=" . rawurlencode($comments['name']) . "&r2_no=" . rawurlencode($comments['id']) . "&r2_pno=" . rawurlencode($comments['entry']) . "&r2_rno=" . rawurlencode($comments['parent']) . "&r2_homepage=" . rawurlencode($comments['homepage']) . "&r2_regdate=" . rawurlencode($comments['written']) . "&r2_url=" . $r2_comment_check_url . "&r1_body=" . rawurlencode($parentComments['comment']) . "&r2_body=" . rawurlencode($comments['comment']);
     requireComponent('Eolin.PHP.HTTPRequest');
     if (strpos($parentComments['homepage'], "http://") === false) {

trunk/lib/model/blog.entry.php

@@ -133 +133 @@
             WHERE e.blogid = $blogid AND e.draft = 0 $visibility $cond 
             ORDER BY e.published DESC";
-    return fetchWithPaging($sql, $page, $count, "$folderURL/".((!getBlogSetting('useSlogan',true) && isset($suri['id'])) ? $suri['id'] : $suri['value']));
+    return fetchWithPaging($sql, $page, $count, "$folderURL/".((!getBlogSetting('useSloganOnCategory',true) && isset($suri['id'])) ? $suri['id'] : $suri['value']));
 }
 
@@ -162 +162 @@
         WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0 AND t.tag = '$tag' 
         ORDER BY published DESC";
-    return fetchWithPaging($sql, $page, $count, "$folderURL/{$suri['value']}");
+    return fetchWithPaging($sql, $page, $count, "$folderURL/".((!getBlogSetting('useSloganOnTag',true) && isset($suri['id'])) ? $suri['id'] : $suri['value']));
 }
 
@@ -218 +218 @@
         WHERE e.blogid = $blogid AND e.draft = 0 $visibility $cond 
         ORDER BY e.published DESC";
-    return fetchWithPaging($sql, $page, $count, "$folderURL/{$suri['value']}","?page=",$countItem);
+    return fetchWithPaging($sql, $page, $count, "$folderURL/".((!getBlogSetting('useSloganOnCategory',true) && isset($suri['id'])) ? $suri['id'] : $suri['value']),"?page=",$countItem);
 }
 
@@ -233 +233 @@
         WHERE e.blogid = $blogid AND e.draft = 0 $visibility AND e.category >= 0 AND t.tag = '$tag' 
         ORDER BY e.published DESC";
-    return fetchWithPaging($sql, $page, $count, "$folderURL/{$suri['value']}","?page=", $countItem);
+    return fetchWithPaging($sql, $page, $count, "$folderURL/".((!getBlogSetting('useSloganOnTag',true) && isset($suri['id'])) ? $suri['id'] : $suri['value']),"?page=", $countItem);
 }
 
@@ -993 +993 @@
         $summary['blogTitle'] = $blog['title'];
         $summary['language'] = $blog['language'];
-        $summary['permalink'] = "$defaultURL/".($blog['useSlogan'] ? "entry/{$entry['slogan']}": $entry['id']);
+        $summary['permalink'] = "$defaultURL/".($blog['useSloganOnPost'] ? "entry/{$entry['slogan']}": $entry['id']);
         $summary['title'] = $entry['title'];
         $summary['content'] = UTF8::lessenAsByte(stripHTML(getEntryContentView($blogid, $entry['id'], $entry['content'], $entry['contentFormatter'])), 1023, '');

trunk/lib/model/blog.rss.php

@@ -58 +58 @@
     $channel['items'] = array();
     foreach($result as $row) {
-        $entryURL = $defaultURL . '/' . ($blog['useSlogan'] ? 'entry/' . rawurlencode($row['slogan']) : $row['id']);
+        $entryURL = $defaultURL . '/' . ($blog['useSloganOnPost'] ? 'entry/' . rawurlencode($row['slogan']) : $row['id']);
 
         $content = getEntryContentView($blogid, $row['id'], $row['content'], $row['contentFormatter'], true, 'Post', true, true);
@@ -214 +214 @@
     $channel = initializeRSSchannel($blogid);
     $channel['title'] = RSSMessage($blog['title']. ': '._textf('%1 에 달린 댓글',$entry['title']));
-    if($blog['useSlogan']) {
+    if($blog['useSloganOnPost']) {
         $channel['link'] = $defaultURL."/entry/".URL::encode($entry['slogan'],true);
     } else {
@@ -294 +294 @@
     $channel = initializeRSSchannel($blogid);
     $channel['title'] = RSSMessage($blog['title']. ': '._textf('%1 에 달린 트랙백',$entry['slogan']));
-    if($blog['useSlogan']) {
+    if($blog['useSloganOnPost']) {
         $channel['link'] = $defaultURL."/entry/".URL::encode($entry['slogan'],true);
     } else {

trunk/lib/model/blog.tag.php

@@ -8 +8 @@
     $name = POD::escapeString($name);
     return POD::queryCell("SELECT id FROM {$database['prefix']}Tags WHERE name = '$name'");
+}
+
+function getTagById($blogid, $id) {
+    global $database;
+    return POD::queryCell("SELECT name FROM {$database['prefix']}Tags WHERE id = $id");
 }
 
@@ -37 +42 @@
     if ($skinSetting['tagboxAlign'] == 1) { // order by count
         if (doesHaveOwnership())
-            $tags = POD::queryAll("SELECT `name`, count(*) `cnt` FROM `{$database['prefix']}Tags` t 
+            $tags = POD::queryAll("SELECT `name`, count(*) `cnt`, `id` FROM `{$database['prefix']}Tags` t 
                 INNER JOIN `{$database['prefix']}TagRelations` r ON r.blogid = $blogid AND r.tag = t.id