Changeset 5085

Timestamp:

01/20/08 04:11:38 (2 years ago)

Author:

inureyes

Message:

• 어쩔수없이 종합 커밋합니다. (동시에 여러개를 해결하다보니...)

#779

• 환경설정이 있는 사이드바 플러그인이 제대로 동작하지 않는 오류 수정
• 사이드바 패널의 순서 설정이 실시간으로 반영되지 않는 오류 수정

#711

• 데이터베이스 호환성 개선 작업 준비를 위하여 Trackbacks, TrackbackLogs 테이블에서 auto_increment 설정 제거

#796

• 트랙백 테이블의 인덱스 재조정.

Location:

trunk

Files:

• components/Textcube.Data.Trackback.php (modified) (2 diffs)
• components/Textcube.Data.TrackbackLog.php (modified) (2 diffs)
• interface/blog/checkup.php (modified) (3 diffs)
• interface/owner/skin/sidebar/delete/index.php (modified) (1 diff)
• interface/owner/skin/sidebar/initialize/index.php (modified) (1 diff)
• interface/owner/skin/sidebar/order/index.php (modified) (1 diff)
• interface/owner/skin/sidebar/register/index.php (modified) (1 diff)
• interface/owner/skin/sidebar/setPlugin/index.php (modified) (1 diff)
• lib/config.php (modified) (1 diff)
• lib/model/blog.trackback.php (modified) (1 diff)
• lib/model/common.plugin.php (modified) (2 diffs)
• lib/piece/blog/end.php (modified) (2 diffs)

trunk/components/Textcube.Data.Trackback.php

@@ -74 +74 @@
     function add() {
         global $database;
-        $this->id = null;
+        if (!isset($this->id))
+            $this->id = $this->nextId();
+        else $this->id = $this->nextId($this->id);
         if (!isset($this->entry))
             return $this->_error('entry');
@@ -100 +102 @@
     function getCount() {
         return (isset($this->_count) ? $this->_count : 0);
+    }
+    
+    function nextId($id = 0) {
+        global $database;
+        $maxId = POD::queryCell("SELECT max(id) FROM {$database['prefix']}Trackbacks WHERE blogid = ".getBlogId());
+        if($id == 0)
+            return $maxId + 1;
+        else
+             return ($maxId > $id ? $maxId : $id);
     }
     

trunk/components/Textcube.Data.TrackbackLog.php

@@ -65 +65 @@
     
     function add() {
-        $this->id = null;
+        if (!isset($this->id))
+            $this->id = $this->nextId();
+        else $this->id = $this->nextId($this->id);
         if (!isset($this->entry))
             return $this->_error('entry');
@@ -85 +87 @@
     function getCount() {
         return (isset($this->_count) ? $this->_count : 0);
+    }
+    
+    function nextId($id = 0) {
+        global $database;
+        $maxId = POD::queryCell("SELECT max(id) FROM {$database['prefix']}TrackbackLogs WHERE blogid = ".getBlogId());
+        if($id == 0)
+            return $maxId + 1;
+        else
+             return ($maxId > $id ? $maxId : $id);
     }
     

trunk/interface/blog/checkup.php

@@ -77 +77 @@
 }
 
+if (POD::queryCell("DESC {$database['prefix']}Trackbacks id", 'Extra') == 'auto_increment') {
+    $changed = true;
+    echo '<li>', _text('데이터베이스 호환성을 위하여 트랙백 테이블의 자동 증가 설정을 제거합니다.'), ': ';
+    if (POD::execute("ALTER TABLE {$database['prefix']}Trackbacks CHANGE id id int(11) NOT NULL")
+        && POD::execute("ALTER TABLE {$database['prefix']}TrackbackLogs CHANGE id id int(11) NOT NULL"))
+        echo '<span style="color:#33CC33;">', _text('성공'), '</span></li>';
+    else
+        echo '<span style="color:#FF0066;">', _text('실패'), '</span></li>';
+}
+
 if (POD::queryCell("DESC {$database['prefix']}Comments blogid", 'Key') != 'PRI') {
     $changed = true;
@@ -186 +196 @@
 
 
-if (POD::queryCount("SHOW INDEX FROM {$database['prefix']}Trackbacks WHERE Key_name = 'written'") == 0) {
+if (POD::queryCell("DESC {$database['prefix']}Trackbacks blogid", 'Key') != 'PRI') {
     $changed = true;
     echo '<li>', _text('트랙백 불러오기 속도를 개선하기 위하여 트랙백 테이블의 인덱스 설정을 변경합니다.'), ': ';
-    if (POD::execute("ALTER TABLE {$database['prefix']}Trackbacks ADD KEY written (blogid, isFiltered, written)"))
+    if (POD::execute("ALTER TABLE {$database['prefix']}Trackbacks 
+            DROP PRIMARY KEY, ADD PRIMARY KEY (blogid, id),
+            DROP KEY blogid,
+            ADD KEY blogid (blogid, isFiltered, written)"))
         echo '<span style="color:#33CC33;">', _text('성공'), '</span></li>';
     else
@@ -205 +218 @@
 }
 
-//if (POD::queryCell("DESC {$database['prefix']}BlogSettings name", 'Key') != 'MUL') {
-if (POD::queryCount("SHOW INDEX FROM {$database['prefix']}BlogSettings WHERE Key_name = 'name'") == 0) {
+if (POD::queryCell("DESC {$database['prefix']}BlogSettings name", 'Key') != 'PRI') {
     $changed = true;
     echo '<li>', _text('블로그 설정 불러오기 속도를 개선하기 위하여 블로그 설정 테이블의 인덱스 설정을 변경합니다.'), ': ';

trunk/interface/owner/skin/sidebar/delete/index.php

@@ -18 +18 @@
 $sidebarOrder = deleteSidebarModuleOrderData(getSidebarModuleOrderData($sidebarCount), $_GET['sidebarNumber'], $_GET['modulePos']);
 setBlogSetting("sidebarOrder", serialize($sidebarOrder));
+Skin::purgeCache();
 
 //respond::PrintResult(array('error' => 0));

trunk/interface/owner/skin/sidebar/initialize/index.php

@@ -10 +10 @@
 
 setting::removeBlogSettingGlobal('sidebarOrder');
+Skin::purgeCache();
 header('Location: '. $blogURL . '/owner/skin/sidebar' . $_REQUEST['viewMode']);
 ?>

trunk/interface/owner/skin/sidebar/order/index.php

@@ -36 +36 @@
     
     setBlogSetting("sidebarOrder", serialize($sidebarOrder));
+    Skin::purgeCache();
 }
 

trunk/interface/owner/skin/sidebar/register/index.php

@@ -29 +29 @@
     if (!is_null($sidebarOrder)) {
         setBlogSetting("sidebarOrder", serialize($sidebarOrder));
+        Skin::purgeCache();
     }
 }

trunk/interface/owner/skin/sidebar/setPlugin/index.php

@@ -76 +76 @@
 $sidebarOrderData[$sidebarNumber][$modulePos]['parameters'] = $newParameter;
 setBlogSetting("sidebarOrder", serialize($sidebarOrderData));
-
+Skin::purgeCache();
 if ($ajaxcall == false) {
     if ($_REQUEST['viewMode'] != '') $_REQUEST['viewMode'] = '?' . $_REQUEST['viewMode'];

trunk/lib/config.php

@@ -6 +6 @@
 // Define basic signatures.
 define('TEXTCUBE_NAME', 'Textcube');
-define('TEXTCUBE_VERSION', '1.6 pre-beta 3a');
+define('TEXTCUBE_VERSION', '1.6 pre-beta 3b');
 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.trackback.php

@@ -65 +65 @@
         FROM {$database['prefix']}Trackbacks t
         LEFT JOIN {$database['prefix']}Entries e ON t.entry = e.id AND t.blogid = e.blogid
-        WHERE t.entry > 0 
-            AND t.blogid = $blogid $authorized 
-            AND t.isFiltered = 0 
+        WHERE  t.blogid = $blogid
+            AND t.isFiltered = 0
+            AND t.entry > 0 $authorized 
             AND (t.excerpt like '%$search%' OR t.subject like '%$search%')")) {
-        foreach($result as $comment)    
-            array_push($list['items'], $comment);
+        foreach($result as $trackback)  
+            array_push($list['items'], $trackback);
     }   
     return $list;

trunk/lib/model/common.plugin.php

@@ -388 +388 @@
                     if (function_exists($handler)) {
                         $str .= "[##_temp_sidebar_element_{$i}_{$j}_##]";
-                        if (function_exists($handler)) {
-                            $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['plugin'] = $plugin;
-                            $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['handler'] = $handler;
-                            $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['parameters'] = $parameter;
-                        //  = call_user_func($handler, $parameters);
-                        } else {
-                            $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"] = "";
-                        }
+                        $parameter = $currentSidebarOrder[$j]['parameters'];
+                        $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['plugin'] = $plugin;
+                        $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['handler'] = $handler;
+                        $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"]['parameters'] = $parameter;
+                    } else {
+                        $obj->sidebarStorage["temp_sidebar_element_{$i}_{$j}"] = "";
                     }
                 } else {
@@ -411 +409 @@
             if (!is_null($sidebarAllOrders)) $sidebarAllOrders[$i] = $newSidebarAllOrders[$i];  
         }
-        
         dress("sidebar_{$i}", $str, $sval);
     }
     
     if (count($newSidebarAllOrders) > 0) {
-        if (($previewMode == false) && !is_null($sidebarAllOrders))
+        if (($previewMode == false) && !is_null($sidebarAllOrders)) {
             setBlogSetting("sidebarOrder", serialize($sidebarAllOrders));
+            Skin::purgeCache();
+        }
     }
 }

trunk/lib/piece/blog/end.php

@@ -116 +116 @@
     foreach ($sidebarElements as $element) {
         $pluginData = $skin->sidebarStorage[$element];
+        $plugin = $pluginData['plugin'];
         include_once (ROOT . "/plugins/{$plugin}/index.php");
         $pluginURL = "{$service['path']}/plugins/{$plugin}";
@@ -123 +124 @@
         else
             $configVal ='';
-    
+
         dress($element, call_user_func($pluginData['handler'], $pluginData['parameters']), $view);
     }
 }
+
 // Coverpage dressing
 $coverpageElements = array_keys($skin->coverpageStorage);