Changeset 5908

Timestamp:

05/09/08 02:50:20 (8 months ago)

Author:

inureyes

Message:

#782

• 기본 구현
  
• TODO :
  
  • 카테고리 지우기 기능
    
  • 카테고리의 스킨 출력기능
    
  • 리스트에서 특정 카테고리에 해당되는 링크만 보기 기능
    

Location:

trunk

Files:

• interface/blog/checkup.php (modified) (1 diff)
• interface/owner/communication/link/add/exec/index.php (modified) (1 diff)
• interface/owner/communication/link/add/index.php (modified) (6 diffs)
• interface/owner/communication/link/categoryEdit (added)
• interface/owner/communication/link/categoryEdit/exec (added)
• interface/owner/communication/link/categoryEdit/exec/index.php (added)
• interface/owner/communication/link/categoryEdit/index.php (added)
• interface/owner/communication/link/edit/exec/index.php (modified) (1 diff)
• interface/owner/communication/link/edit/index.php (modified) (5 diffs)
• interface/owner/communication/link/index.php (modified) (3 diffs)
• interface/owner/communication/xfn/index.php (modified) (2 diffs)
• lib/config.php (modified) (1 diff)
• lib/model/blog.link.php (modified) (5 diffs)
• lib/model/common.setting.php (modified) (1 diff)
• lib/piece/owner/contentMenu.php (modified) (2 diffs)
• lib/piece/owner/linkTab.php (added)
• setup.php (modified) (5 diffs)
• style/admin/whitedream/communication.css (modified) (9 diffs)
• style/helper/moodalbox.css (modified) (2 diffs)

trunk/interface/blog/checkup.php

@@ -329 +329 @@
             else
                 showCheckupMessage(false);
+        } else {
+            showCheckupMessage(false);
+        }
+    }
+    if (!doesExistTable($database['prefix'] . 'LinkCategories')) {
+        $changed = true;
+        echo '<li>', _text('링크 카테고리 테이블을 만듭니다'), ': ';
+        $query = "
+        CREATE TABLE `{$database['prefix']}LinkCategories` (
+          pid int(11) NOT NULL default '0',
+          blogid int(11) NOT NULL default '0',
+          id int(11) NOT NULL default '0',
+          name varchar(128) NOT NULL,
+          priority int(11) NOT NULL default '0',
+          visibility tinyint(4) NOT NULL default '2',
+          PRIMARY KEY (pid),
+          UNIQUE KEY blogid (blogid, id)
+        ) TYPE=MyISAM
+        ";
+        if (POD::execute($query . ' DEFAULT CHARSET=utf8') || POD::execute($query)) {
+            if (POD::execute("ALTER TABLE {$database['prefix']}Links 
+                    ADD category int(11) NOT NULL DEFAULT 0 AFTER id,
+                    ADD pid int(11) NOT NULL DEFAULT 0 FIRST,
+                    CHANGE id id int(11) NOT NULL default '0'") &&
+                POD::execute("UPDATE {$database['prefix']}Links 
+                    SET pid = id") &&
+                POD::execute("ALTER TABLE {$database['prefix']}Links 
+                    DROP PRIMARY KEY,
+                    ADD PRIMARY KEY (pid)")) {
+                showCheckupMessage(true);
+            } else {
+                @POD::execute("DROP TABLE {$database['prefix']}LinkCategories");
+                showCheckupMessage(false);
+            }
         } else {
             showCheckupMessage(false);

trunk/interface/owner/communication/link/add/exec/index.php

@@ -7 +7 @@
         'name' => array('string'),
         'rss' => array('string', 'default' => ''),
-        'url' => array('string')
+        'url' => array('string'),
+        'category' => array('int','mandatory'=>false),
+        'newCategory' => array('string','mandatory'=>false)
     )
 );

trunk/interface/owner/communication/link/add/index.php

@@ -8 +8 @@
 require ROOT . '/lib/piece/owner/header.php';
 require ROOT . '/lib/piece/owner/contentMenu.php';
+
+$tabsClass['add'] = true;
 ?>
                         <script type="text/javascript">
@@ -17 +19 @@
                                         return false;       
                                     }
-                                    
+
                                     if(document.getElementById('addForm').rss.value.indexOf("http://")==-1) {
                                         uri = 'http://'+document.getElementById('addForm').rss.value;
@@ -25 +27 @@
                                     var request = new HTTPRequest("GET", "<?php echo $blogURL;?>/owner/communication/link/site/?rss=" + uri);
                                     request.onVerify = function() {
-                                        return (this.getText("/response/url") != "")
+                                        return (this.getText("/response/url") != "");
                                     }
                                     request.onSuccess = function () {
@@ -85 +87 @@
                                     }
                                     PM.addRequest(request, "<?php echo _t('링크를 추가하고 있습니다.');?>");
-                                    request.send("name=" + encodeURIComponent(oForm.name.value) + "&url=" + encodeURIComponent(oForm.url.value) + "&rss=" + encodeURIComponent(oForm.rss.value));
+
+                                    request.send("name=" + encodeURIComponent(oForm.name.value) + "&url=" + encodeURIComponent(oForm.url.value) +
+                                    "&rss=" + encodeURIComponent(oForm.rss.value) +
+                                    "&category=" + encodeURIComponent(oForm.category.value) +
+                                    "&newCategory=" + encodeURIComponent(oForm.newCategory.value)
+                                    );
                                 }   
                             //]]>
@@ -92 +99 @@
                         <div id="part-link-add" class="part">
                             <h2 class="caption"><span class="main-text"><?php echo _t('새로운 링크를 추가합니다');?></span></h2>
-
+<?php
+require ROOT . '/lib/piece/owner/linkTab.php';
+?>
                             <div class="main-explain-box">
                                 <p class="explain"><?php echo _t('RSS 주소를 입력해서 링크할 홈페이지의 정보를 읽어올 수 있습니다. 수동으로 제목과 주소를 입력하셔도 됩니다. RSS 주소를 입력해서 홈페이지의 정보를 읽어온 경우 링크를 추가할 때 바깥 글 읽기에 RSS 주소를 추가할지를 물어봅니다.');?></p>
@@ -111 +120 @@
                                         <dd><input type="text" id="url" class="input-text url" name="url" /></dd>
                                     </dl>
+                                    <dl id="category-line" class="line">
+                                        <dt><label for="url"><?php echo _t('분류');?></label></dt>
+                                        <dd>
+                                            <select id="category" name="category">
+                                            <option value="0"><?php echo _t('분류 없음');?></option>
+<?php
+$categories = array();
+$categories = getLinkCategories(getBlogId());
+foreach ($categories as $category) {
+?>
+                                            <option value="<?php echo $category['id'];?>"><?php echo htmlspecialchars($category['name']);?></option>
+<?php
+}
+?>
+                                            </select>
+                                        </dd>
+                                        <dd><?php echo _t('또는 새로운 분류를 추가합니다.').' :';?><input type="text" id="newCategory" class="input-text input-category" name="newCategory" /></dd>
+                                    </dl>
                                 </div>
                                 

trunk/interface/owner/communication/link/edit/exec/index.php

@@ -5 +5 @@
 $IV = array(  
     'POST' => array(
-        'id' => array( 'id' ),
-        'name' => array( 'string' , 'min' => 0 ,  'max' => 255),
-        'rss' => array( 'string' , 'min' => 0 ,  'max' => 255 , 'mandatory' => false),
-        'url' => array( 'string' , 'min' => 0 ,  'max' => 255)
+        'id'   => array('id'),
+        'name' => array('string','min' => 0,'max' => 255),
+        'rss'  => array('string','min' => 0,'max' => 255 , 'mandatory' => false),
+        'url'  => array('string','min' => 0,'max' => 255),
+        'category'    => array('int','mandatory'=>false),
+        'newCategory' => array('string','mandatory'=>false)
     )
 );

trunk/interface/owner/communication/link/edit/index.php

@@ -11 +11 @@
 require ROOT . '/lib/piece/owner/header.php';
 require ROOT . '/lib/piece/owner/contentMenu.php';
+
+$tabsClass['edit'] = true;
 ?>
                         <script type="text/javascript">
@@ -45 +47 @@
                                     if (!checkValue(oForm.name, "<?php echo _t('이름을 입력해 주십시오.');?>\t")) return false;
                                     if (!checkValue(oForm.url, "<?php echo _t('주소를 입력해 주십시오.');?>\t")) return false;
-                                        var request = new HTTPRequest("POST", blogURL + "/owner/communication/link/edit/exec/");
+                                    var request = new HTTPRequest("POST", blogURL + "/owner/communication/link/edit/exec/");
                                     request.onSuccess = function () {
                                         PM.removeRequest(this);
@@ -59 +61 @@
                                     }
                                     PM.addRequest(request, "<?php echo _t('링크를 수정하고 있습니다.');?>");
-                                    request.send("id=<?php echo $suri['value'];?>&name=" + encodeURIComponent(oForm.name.value) + "&url=" + encodeURIComponent(oForm.url.value) + "&rss=" + encodeURIComponent(oForm.rss.value));  
+                                    request.send("id=<?php echo $suri['value'];?>&name=" + encodeURIComponent(oForm.name.value) + 
+                                    "&url=" + encodeURIComponent(oForm.url.value) + 
+                                    "&rss=" + encodeURIComponent(oForm.rss.value) +
+                                    "&category=" + encodeURIComponent(oForm.category.value) +
+                                    "&newCategory=" + encodeURIComponent(oForm.newCategory.value)
+                                    );  
                                 }
                             //]]>
@@ -68 +75 @@
                         <div id="part-link-edit" class="part">
                             <h2 class="caption"><span class="main-text"><?php echo _t('링크 정보를 수정합니다');?></span></h2>
-                            
+<?php
+require ROOT . '/lib/piece/owner/linkTab.php';
+?>
                             <form id="editForm" method="post" action="<?php echo $blogURL;?>/owner/communication/link/edit/">
                                 <input type="hidden" name="id" value="<?php echo $suri['value'];?>" />
@@ -85 +94 @@
                                         <dd><input type="text" class="input-text" id="url" name="url" value="<?php echo htmlspecialchars($link['url']);?>" /></dd>
                                     </dl>
+                                    <dl id="category-line" class="line">
+                                        <dt><label for="url"><?php echo _t('분류');?></label></dt>
+                                        <dd>
+                                            <select id="category" name="category">
+                                            <option value="0"><?php echo _t('분류 없음');?></option>
+<?php
+$categories = array();
+$categories = getLinkCategories(getBlogId());
+foreach ($categories as $category) {
+?>
+                                            <option value="<?php echo $category['id'];?>"<?php echo ($link['category'] == $category['id'] ? ' selected="selected"' : '');?>><?php echo htmlspecialchars($category['name']);?></option>
+<?php
+}
+?>
+                                            </select>
+                                        </dd>
+                                        <dd><?php echo _t('또는 새로운 분류를 추가합니다.').' :';?><input type="text" id="newCategory" class="input-text input-category" name="newCategory" /></dd>
+                                    </dl>
                                 </div>
                                 

trunk/interface/owner/communication/link/index.php

@@ -9 +9 @@
 require ROOT . '/lib/piece/owner/header.php';
 require ROOT . '/lib/piece/owner/contentMenu.php';
+
+$tabsClass['list'] = true;
 ?>
                         <script type="text/javascript">
@@ -87 +89 @@
                         <div id="part-link-list" class="part">
                             <h2 class="caption"><span class="main-text"><?php echo _t('링크 목록입니다');?></span></h2>
-                            
+<?php
+require ROOT . '/lib/piece/owner/linkTab.php';
+?>
                             <table class="data-inbox" cellspacing="0" cellpadding="0">
                                 <thead>
                                     <tr>
+                                        <th class="category"><span class="text"><?php echo _t('분류');?></span></th>
                                         <th class="homepage"><span class="text"><?php echo _t('홈페이지 이름');?></span></th>
                                         <th class="address"><span class="text"><?php echo _t('사이트 주소');?></span></th>
@@ -109 +114 @@
 ?>
                                     <tr id="link_<?php echo $link['id'];?>" class="<?php echo $className;?> inactive-class" onmouseover="rolloverClass(this, 'over')" onmouseout="rolloverClass(this, 'out')">
+                                        <td class="category"><a href="<?php echo $blogURL;?>/owner/communication/link/categoryEdit/<?php echo $link['category'];?>" title="<?php echo _t('이 카테고리 정보를 수정합니다.');?>"><?php echo (isset($link['categoryName']) ? htmlspecialchars($link['categoryName']) : _t('분류 없음'));?></a></td>
                                         <td class="homepage"><a href="<?php echo $blogURL;?>/owner/communication/link/edit/<?php echo $link['id'];?>" title="<?php echo _t('이 링크 정보를 수정합니다.');?>"><?php echo htmlspecialchars($link['name']);?></a></td>
                                         <td class="address"><a href="<?php echo htmlspecialchars($link['url']);?>" onclick="window.open(this.href); return false;" title="<?php echo _t('이 링크에 연결합니다.');?>"><?php echo htmlspecialchars($link['url']);?></a></td>

trunk/interface/owner/communication/xfn/index.php

@@ -17 +17 @@
 }
 
+$tabsClass['xfn'] = true;
 list( $links, $paging ) = getLinksWithPagingForOwner($blogid, $page, 30);
 $service['admin_script'] = array( 'xfn.js' );
@@ -29 +30 @@
                         <div id="part-link-list" class="part">
                             <h2 class="caption"><span class="main-text"><?php echo _t('친구 관계를 설정합니다');?></span></h2>
-                            
+<?php
+require ROOT . '/lib/piece/owner/linkTab.php';
+?>
+                            <div class="main-explain-box">
+                                <p class="explain"><?php echo _t('각 링크의 관계를 설정합니다.').' '._t('여기서 지정한 링크들의 관계는 XFN (XHTML Friends Network) 규격에 맞추어 블로그의 링크 출력시 추가 데이터로 함께 출력됩니다.');?></p>
+                            </div>
                             <form method="post">
                             <input type="hidden" name="usexfn" id="usexfn" value="0" />

trunk/lib/config.php

@@ -6 +6 @@
 // Define basic signatures.
 define('TEXTCUBE_NAME', 'Textcube');
-define('TEXTCUBE_VERSION', '1.7 : pre-Beta 2');
+define('TEXTCUBE_VERSION', '1.7 : pre-Beta 2a1');
 define('TEXTCUBE_COPYRIGHT', 'Copyright © 2004-2008. Needlworks / Tatter Network Foundation. All rights reserved. Licensed under the GPL.');
 define('TEXTCUBE_HOMEPAGE', 'http://www.textcube.org/');

trunk/lib/model/blog.link.php

@@ -10 +10 @@
     global $database, $__gCacheLink;
     if(empty($__gCacheLink)) {
-        if ($result = POD::queryAll("SELECT * 
-            FROM {$database['prefix']}Links 
-            WHERE blogid = $blogid 
-            ORDER BY name")) {
+        if ($result = POD::queryAll("SELECT l.*, lc.name AS categoryName
+            FROM {$database['prefix']}Links l
+            LEFT JOIN {$database['prefix']}LinkCategories lc ON lc.blogid = l.blogid AND lc.id = l.category
+            WHERE l.blogid = $blogid 
+            ORDER BY l.name")) {
             $__gCacheLink = array();
             foreach($result as $link) {
@@ -25 +26 @@
 function getLinksWithPagingForOwner($blogid, $page, $count) {
     global $database;
-    return fetchWithPaging( "SELECT * FROM {$database['prefix']}Links WHERE blogid = $blogid ORDER BY name", $page, $count );
+    return fetchWithPaging("SELECT l.*, lc.name AS categoryName
+            FROM {$database['prefix']}Links l 
+            LEFT JOIN {$database['prefix']}LinkCategories lc ON lc.blogid = l.blogid AND lc.id = l.category
+            WHERE l.blogid = $blogid ORDER BY l.name", $page, $count );
 }
 
 function getLink($blogid, $id) {
     global $database, $__gCacheLink;
-    return POD::queryRow("SELECT * FROM {$database['prefix']}Links WHERE blogid = $blogid and id = $id");
+    return POD::queryRow("SELECT l.*, lc.name AS categoryName
+            FROM {$database['prefix']}Links l 
+            LEFT JOIN {$database['prefix']}LinkCategories lc ON lc.blogid = l.blogid AND lc.id = l.category
+            WHERE l.blogid = $blogid AND l.id = $id");
 }
 
@@ -49 +56 @@
     $name = UTF8::lessenAsEncoding(trim($link['name']), 255);
     $url = UTF8::lessenAsEncoding(trim($link['url']), 255);
+
     if (empty($name) || empty($url))
         return - 1;
+    $category = (isset($link['category'])) ? $link['category'] : 0;
     $name = POD::escapeString($name);
     $url = POD::escapeString($url);
+    if(isset($link['newCategory']) && !empty($link['newCategory'])) { // Add new category information
+        $newCategoryTitle = POD::escapeString(UTF8::lessenAsEncoding(trim($link['newCategory']), 255));
+        $newCategoryId = addLinkCategory($blogid, $newCategoryTitle);
+        if(!empty($newCategoryId)) $category = $newCategoryId;
+        else return false;
+    }
+    
+    $id = getMaxIdOfLink() + 1;
+    $pid = getMaxPidOfLink() + 1;
+
     $rss = isset($link['rss']) ? POD::escapeString(UTF8::lessenAsEncoding(trim($link['rss']), 255)) : '';
     if (POD::queryCell("SELECT id FROM {$database['prefix']}Links WHERE blogid = $blogid AND url = '$url'"))
         return 1;
-    if (POD::execute("INSERT INTO {$database['prefix']}Links (blogid,name,url,rss,written) VALUES ($blogid, '$name', '$url', '$rss', UNIX_TIMESTAMP())"))
+    if (POD::execute("INSERT INTO {$database['prefix']}Links (pid, blogid,id,category,name,url,rss,written) VALUES ($pid, $blogid, $id, $category, '$name', '$url', '$rss', UNIX_TIMESTAMP())"))
         return 0;
     else
@@ -69 +88 @@
     if (empty($name) || empty($url))
         return false;
+    $category = (isset($link['category'])) ? $link['category'] : 0;
     $name = POD::escapeString($name);
     $url = POD::escapeString($url);
+
+    if(isset($link['newCategory']) && !empty($link['newCategory'])) { // Add new category information
+        $newCategoryTitle = UTF8::lessenAsEncoding(trim($link['newCategory']), 255);
+        $newCategoryId = addLinkCategory($blogid, $newCategoryTitle);
+        if(!empty($newCategoryId)) $category = $newCategoryId;
+    }
+
     $rss = isset($link['rss']) ? POD::escapeString(UTF8::lessenAsEncoding(trim($link['rss']), 255)) : '';
-    return POD::execute("update {$database['prefix']}Links
-                set
+    return POD::execute("UPDATE {$database['prefix']}Links
+                SET
+                    category = $category,
                     name = '$name',
                     url = '$url',
                     rss = '$rss',
                     written = UNIX_TIMESTAMP()
-                where
+                WHERE
                     blogid = $blogid and id = {$link['id']}");
 }
@@ -98 +126 @@
     }
 }
+function getLinkCategories($blogid) {
+    global $database;
+    return POD::queryAll("SELECT * FROM {$database['prefix']}LinkCategories
+            WHERE blogid = $blogid");
+}
+
+function addLinkCategory($blogid, $categoryTitle) {
+    global $database;
+    $categoryTitle = POD::escapeString($categoryTitle);
+    $id = POD::queryCell("SELECT id FROM {$database['prefix']}LinkCategories
+        WHERE blogid = $blogid AND name = '".$categoryTitle."'");
+    if(!empty($id)) {
+        return $id;
+    } else {    // Add new Link Category
+        $pid = getMaxPidOfLinkCategory() + 1;
+        $id = getMaxIdOfLinkCategory($blogid) + 1;
+        $priority = 0;
+        $visibility = 2; // Default visibility
+        if(POD::query("INSERT INTO {$database['prefix']}LinkCategories
+            (pid, blogid, id, name, priority, visibility) VALUES
+            ($pid, $blogid, $id, '$categoryTitle', $priority, $visibility)")) {
+            return $id;
+        } else {
+            return false;
+        }
+    }
+}
+
+function updateLinkCategory($blogid, $category) {
+    global $database;
+    $categoryTitle = POD::escapeString($category['name']);
+    $id = $category['id'];
+    
+    if(POD::query("UPDATE {$database['prefix']}LinkCategories
+        SET
+            name = '".$categoryTitle."'
+            WHERE blogid = $blogid AND id = $id")) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function deleteLinkCategory($blogid, $id) {
+    global $database;
+    if(POD::query("DELETE FROM {$database['prefix']}LinkCategories
+        WHERE blogid = $blogid AND id = $id")) {
+        POD::execute("UPDATE {$database['prefix']}Links
+            SET category = 0
+            WHERE blogid = $blogid AND category = $id");
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function getLinkCategory($blogid, $id) {
+    global $database;
+    return POD::queryRow("SELECT * 
+            FROM {$database['prefix']}LinkCategories 
+            WHERE blogid = $blogid AND id = $id");
+}
+
+function getMaxIdOfLink($blogid = null) {
+    global $database;
+    if(empty($blogid)) $blogid = getBlogId();
+    $id = POD::queryCell("SELECT max(id) FROM {$database['prefix']}Links
+            WHERE blogid = $blogid");
+    return (empty($id) ? 0 : $id);
+}
+
+function getMaxPidOfLink() {
+    global $database;
+    $id = POD::queryCell("SELECT max(pid) FROM {$database['prefix']}Links");
+    return (empty($id) ? 0 : $id);
+}
+
+function getMaxIdOfLinkCategory($blogid = null) {
+    global $database;
+    if(empty($blogid)) $blogid = getBlogId();   
+    $id = POD::queryCell("SELECT max(id) FROM {$database['prefix']}LinkCategories
+            WHERE blogid = $blogid");
+    return (empty($id) ? 0 : $id);
+}
+function getMaxPidOfLinkCategory() {
+    global $database;
+    $id = POD::queryCell("SELECT max(pid) FROM {$database['prefix']}LinkCategories");
+    return (empty($id) ? 0 : $id);
+}
+
 ?>

trunk/lib/model/common.setting.php

@@ -92 +92 @@
     global $database;
     $prefix = $database['prefix'];
-    $definedTables = array("{$prefix}Attachments", "{$prefix}BlogSettings", "{$prefix}BlogStatistics", "{$prefix}Categories", "{$prefix}Comments", "{$prefix}CommentsNotified", "{$prefix}CommentsNotifiedQueue", "{$prefix}CommentsNotifiedSiteInfo", "{$prefix}DailyStatistics", "{$prefix}Entries", "{$prefix}EntriesArchive", "{$prefix}FeedGroupRelations", "{$prefix}FeedGroups", "{$prefix}FeedItems", "{$prefix}FeedReads", "{$prefix}OpenIDUsers", "{$prefix}Feeds", "{$prefix}FeedSettings", "{$prefix}FeedStarred", "{$prefix}Filters", "{$prefix}Links", "{$prefix}PageCacheLog", "{$prefix}Plugins", "{$prefix}RefererLogs", "{$prefix}RefererStatistics", "{$prefix}ReservedWords", "{$prefix}ServiceSettings", "{$prefix}Sessions", "{$prefix}SessionVisits", "{$prefix}SkinSettings", "{$prefix}TagRelations", "{$prefix}Tags", "{$prefix}Teamblog", "{$prefix}TeamEntryRelations", "{$prefix}TrackbackLogs", "{$prefix}Trackbacks", "{$prefix}Users", "{$prefix}UserSettings", "{$prefix}XMLRPCPingSettings");
+    $definedTables = array("{$prefix}Attachments", "{$prefix}BlogSettings", "{$prefix}BlogStatistics", "{$prefix}Categories", "{$prefix}Comments", "{$prefix}CommentsNotified", "{$prefix}CommentsNotifiedQueue", "{$prefix}CommentsNotifiedSiteInfo", "{$prefix}DailyStatistics", "{$prefix}Entries", "{$prefix}EntriesArchive", "{$prefix}FeedGroupRelations", "{$prefix}FeedGroups", "{$prefix}FeedItems", "{$prefix}FeedReads", "{$prefix}OpenIDUsers", "{$prefix}Feeds", "{$prefix}FeedSettings", "{$prefix}FeedStarred", "{$prefix}Filters", "{$prefix}Links", "{$prefix}LinkCategories", "{$prefix}PageCacheLog", "{$prefix}Plugins", "{$prefix}RefererLogs", "{$prefix}RefererStatistics", "{$prefix}ReservedWords", "{$prefix}ServiceSettings", "{$prefix}Sessions", "{$prefix}SessionVisits", "{$prefix}SkinSettings", "{$prefix}TagRelations", "{$prefix}Tags", "{$prefix}Teamblog", "{$prefix}TeamEntryRelations", "{$prefix}TrackbackLogs", "{$prefix}Trackbacks", "{$prefix}Users", "{$prefix}UserSettings", "{$prefix}XMLRPCPingSettings");
     return $definedTables;
 }

trunk/lib/piece/owner/contentMenu.php

@@ -36 +36 @@
                     array('menu'=>'comment','title'=>_t('소통 기록'),'link'=>'/owner/communication/comment'),
                     array('menu'=>'openid','title'=>_t('오픈아이디 목록'),'link'=>'/owner/communication/openid'),
-                    array('menu'=>'add','title'=>_t('링크 추가'),'link'=>'/owner/communication/link/add'),
-                    array('menu'=>'link','title'=>_t('링크 목록'),'link'=>'/owner/communication/link'),
-                    array('menu'=>'xfn','title'=>_t('친구 링크 관리'),'link'=>'/owner/communication/xfn')
+                    array('menu'=>'link','title'=>_t('링크'),'link'=>'/owner/communication/link')
                 );
                 if($service['reader'] == true) array_push($blogContentMenuItem,array('menu'=>'reader','title'=>_t('바깥 글 읽기'),'link'=>'/owner/communication/reader'));
@@ -147 +145 @@
     if(in_array($blogMenu['contentMenu'],array('notify','trackback','trashcomment','trashtrackback')))
         $blogMenu['contentMenu'] = 'comment';
-
+    else if(in_array($blogMenu['contentMenu'],array('linkadd','linkedit','linkcategoryEdit','xfn')))
+        $blogMenu['contentMenu'] = 'link';
+    
     foreach($blogContentMenuItem as $contentMenuItem) { 
         $PostIdStr = null;

trunk/setup.php

@@ -1268 +1268 @@
 ) $charset;
 CREATE TABLE {$_POST['dbPrefix']}Links (
-  blogid int(11) NOT NULL default '0',
-  id int(11) NOT NULL auto_increment,
+  pid int(11) NOT NULL default '0',
+  blogid int(11) NOT NULL default '0',
+  id int(11) NOT NULL default '0',
   name varchar(255) NOT NULL default '',
   url varchar(255) NOT NULL default '',
@@ -1276 +1277 @@
   visibility tinyint(4) NOT NULL default '2',
   xfn varchar(128) NOT NULL default '',
-  PRIMARY KEY  (id),
+  PRIMARY KEY (pid),
   UNIQUE KEY blogid (blogid,url)
+) $charset;
+CREATE TABLE {$_POST['dbPrefix']}LinkCategories (
+  pid int(11) NOT NULL default '0',
+  blogid int(11) NOT NULL default '0',