From 8af457cc1aff41d130a02140bf652b0ab9bf0762 Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Thu, 25 Jun 2009 12:01:19 +0000
Subject: [PATCH 01/19] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6674 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/file/file.admin.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index 00874ddd5..beb376da8 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -29,7 +29,7 @@
             // 목록 구함
             $oFileModel = &getAdminModel('file');
             $output = $oFileModel->getFileList($args);
-debugPrint($output);
+
             // 목록의 loop를 돌면서 document를 구하기
             if($output->data) {
                 $oCommentModel = &getModel('comment');

From b0e163721c6d0c2f46f6c6507e94afc1a919e249 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 27 Jun 2009 13:41:47 +0000
Subject: [PATCH 02/19] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@6675
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/issuetracker/issuetracker.view.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/issuetracker/issuetracker.view.php b/modules/issuetracker/issuetracker.view.php
index 6529eaf1c..8408e6281 100644
--- a/modules/issuetracker/issuetracker.view.php
+++ b/modules/issuetracker/issuetracker.view.php
@@ -19,6 +19,7 @@
              **/
             // 템플릿에서 사용할 변수를 Context::set()
             if($this->module_srl) Context::set('module_srl',$this->module_srl);
+            if(!$this->module_info->svn_cmd) $this->module_info->svn_cmd = '/usr/bin/svn';
 
             // 현재 호출된 게시판의 모듈 정보를 module_info 라는 이름으로 context setting
             Context::set('module_info',$this->module_info);

From 9d7a921f3b4b61a5ebd4cd70e51ab32c38459d60 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 27 Jun 2009 13:48:59 +0000
Subject: [PATCH 03/19] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@6676
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/wiki/wiki.model.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/wiki/wiki.model.php b/modules/wiki/wiki.model.php
index 6caa9deaa..d630ba4a0 100644
--- a/modules/wiki/wiki.model.php
+++ b/modules/wiki/wiki.model.php
@@ -28,9 +28,8 @@
             $oModuleModel = &getModel('module');
 
             $mid = Context::get('mid');
-
             $cache_file = sprintf('%sfiles/cache/wiki/%d.xml', _XE_PATH_,$this->module_srl);
-            if(!file_exists($cache_file)) FileHandler::writeFile($cache_file, $this->loadWikiTreeList($this->module_srl));
+            FileHandler::writeFile($cache_file, $this->loadWikiTreeList($this->module_srl));
 
             print FileHandler::readFile($cache_file);
             Context::close();

From 06452b0541f232b9f87d972203bc6ef8edbee781 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 27 Jun 2009 13:51:33 +0000
Subject: [PATCH 04/19] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@6677
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/wiki/wiki.model.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/wiki/wiki.model.php b/modules/wiki/wiki.model.php
index d630ba4a0..3ba2ed7b9 100644
--- a/modules/wiki/wiki.model.php
+++ b/modules/wiki/wiki.model.php
@@ -28,8 +28,11 @@
             $oModuleModel = &getModel('module');
 
             $mid = Context::get('mid');
+
             $cache_file = sprintf('%sfiles/cache/wiki/%d.xml', _XE_PATH_,$this->module_srl);
-            FileHandler::writeFile($cache_file, $this->loadWikiTreeList($this->module_srl));
+            if($this->grant->write_document || !file_exists($cache_file)) {
+                 FileHandler::writeFile($cache_file, $this->loadWikiTreeList($this->module_srl));
+            }
 
             print FileHandler::readFile($cache_file);
             Context::close();

From 34758060d32af2792bccd0086f47a6ee8d9a8954 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 27 Jun 2009 13:59:27 +0000
Subject: [PATCH 05/19] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@6678
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/issuetracker/classes/svn.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/issuetracker/classes/svn.class.php b/modules/issuetracker/classes/svn.class.php
index 21d7f540e..82150463b 100644
--- a/modules/issuetracker/classes/svn.class.php
+++ b/modules/issuetracker/classes/svn.class.php
@@ -207,7 +207,7 @@
                 $command = sprintf('%s --non-interactive %s --config-dir %s log --xml --limit 2 %s%s@%d', $this->svn_cmd, $this->_getAuthInfo(), $this->tmp_dir, $this->url, $path, $erev);
                 $buff = $this->execCmd($command, $error);
                 $xmlDoc = $this->oXml->parse($buff);
-                $brev = $xmlDoc->log->logentry[1]->attrs->revision;
+                if(is_array($xmlDoc->log->logentry)) $brev = $xmlDoc->log->logentry[1]->attrs->revision;
                 if(!$brev) return;
             }
 

From 46e1b3b0ca6b98b9f1186be96f2088ae1a0d809f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 1 Jul 2009 15:12:51 +0000
Subject: [PATCH 06/19] =?UTF-8?q?=EB=A7=88=EB=AC=B4=EB=A6=AC=20-=20?=
 =?UTF-8?q?=EC=9D=B4=EC=8A=88=ED=8A=B8=EB=9E=98=EC=BB=A4=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B3=B8=20=EC=8A=A4=ED=82=A8=20=EC=B2=A8=EB=B6=80=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B2=84=ED=8A=BC=20css=20=EB=88=84=EB=9D=BD=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20xpresseditor=EC=9D=98=20js=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=EC=9D=98=20optimized=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6679 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/skins/xpresseditor/editor.html             | 8 ++++----
 .../skins/xe_issuetracker/css/issuetracker.css            | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/editor/skins/xpresseditor/editor.html b/modules/editor/skins/xpresseditor/editor.html
index 871894acc..c92e0ee9e 100644
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@@ -23,8 +23,8 @@
 <!--@else-->
 
     <!--// 기본 js/언어파일 로드 -->
-    <!--%import("js/Xpress_Editor.js",optimized=false)-->
-    <!--%import("js/xe_interface.js",optimized=false)-->
+    <!--%import("js/Xpress_Editor.js")-->
+    <!--%import("js/xe_interface.js")-->
 
     <!-- 자동저장용 폼 -->
 
@@ -482,8 +482,8 @@
         </div>
 
         <!--@if($allow_fileupload)-->
-            <!--%import("../../tpl/js/uploader.js",optimized=false)-->
-            <!--%import("../../tpl/js/swfupload.js",optimized=false)-->
+            <!--%import("../../tpl/js/uploader.js")-->
+            <!--%import("../../tpl/js/swfupload.js")-->
             <script type="text/javascript">//<![CDATA[
             editorUploadInit(
                 {
diff --git a/modules/issuetracker/skins/xe_issuetracker/css/issuetracker.css b/modules/issuetracker/skins/xe_issuetracker/css/issuetracker.css
index 8a6db7589..b0f6a8f95 100644
--- a/modules/issuetracker/skins/xe_issuetracker/css/issuetracker.css
+++ b/modules/issuetracker/skins/xe_issuetracker/css/issuetracker.css
@@ -283,6 +283,12 @@
 .feedbackList .item .secretMessage dd .inputText{ padding:3px 4px; height:15px; vertical-align:middle; margin-right:5px;}
 
 /* Attached File */
+.attachedFile { position:relative; float:left; width:100%;}
+.attachedFile *{ margin:0; padding:0; font-size:11px; vertical-align:middle;}
+.attachedFile dt img{ margin-right:10px;}
+.attachedFile dt .fileToggle{ border:0; padding:0; overflow:visible; cursor:pointer; font-size:11px; background:none; vertical-align:middle;}
+.attachedFile dd{ position:relative; margin-right:5px; display:none; margin-top:5px; padding-left:40px;}
+.attachedFile.open dd{ display:block;}
 .attachedFile ul.files { position:relative; margin:0; padding:0; clear:both; list-style:none;}
 .attachedFile ul.files *{ display:inline-block; *display:inline; padding:0; margin:0; font-size:11px;}
 .attachedFile ul.files li{ position:relative; margin:0 10px 0 0;}

From 04afff647d0723ec7e72ebda833f6320ff50e947 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 3 Jul 2009 06:46:48 +0000
Subject: [PATCH 07/19] =?UTF-8?q?IssueTracker=20=EC=8A=A4=ED=82=A8=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6680 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 .../skins/xe_issuetracker/timeline.html             | 13 ++++++-------
 .../skins/xe_issuetracker/view_issue.html           |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/issuetracker/skins/xe_issuetracker/timeline.html b/modules/issuetracker/skins/xe_issuetracker/timeline.html
index f0beec6c6..8d68f1a7f 100644
--- a/modules/issuetracker/skins/xe_issuetracker/timeline.html
+++ b/modules/issuetracker/skins/xe_issuetracker/timeline.html
@@ -21,15 +21,14 @@
 <div class="clear"></div>
 
 
-{@ $curDate = null }
+{@ $curDate = null}
 <!--@foreach($changesets as $changeset)-->
-<!--@if($curdate || strcmp(zdate($changeset->date, "Ymd"),  $curDate))-->
-<h4>{zdate($changeset->date, "Y-m-d")}</h4>
-<!--@if($curDate)-->
-</dl>
-<!--@end-->
+
+<!--@if(!$curDate || $curDate != zdate($changeset->date, "Y-m-d"))-->
+{@ $curDate = zdate($changeset->date, "Y-m-d")}
+<!--@if($curDate)--></dl><!--@end-->
+<h4>{$curDate}</h4>
 <dl class="changeset">
-{@ $curDate = zdate($changeset->date, "Ymd") }
 <!--@end-->
 <dt>
     <span class="time">{zdate($changeset->date,"H:i")}</span>
diff --git a/modules/issuetracker/skins/xe_issuetracker/view_issue.html b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
index e2b5d5cc9..4c0a6b006 100644
--- a/modules/issuetracker/skins/xe_issuetracker/view_issue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
@@ -269,7 +269,6 @@
                 </ul>
             </td>
         </tr>
-        <!--@end-->
         </table>
         <!--@end-->
 
@@ -291,5 +290,6 @@
 
 </form>
 <!--@end-->
+<!--@end-->
 
 <!--#include("footer.html")-->

From 2b3b3c8297d5ad22c1b9d4e0450a818376e742f2 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 3 Jul 2009 08:14:07 +0000
Subject: [PATCH 08/19] git-svn-id:
 http://xe-core.googlecode.com/svn/sandbox@6681
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/issuetracker/skins/xe_issuetracker/download.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/issuetracker/skins/xe_issuetracker/download.html b/modules/issuetracker/skins/xe_issuetracker/download.html
index a947684f8..a0ce6ec41 100644
--- a/modules/issuetracker/skins/xe_issuetracker/download.html
+++ b/modules/issuetracker/skins/xe_issuetracker/download.html
@@ -34,11 +34,11 @@
                 <!--@if($release)-->
                 <tr>
                     <th>{$lang->release_note}</th>
-                    <td><div class="xe_cotnent">{str_replace('  ','&nbsp;&nbsp;',nl2br($release->release_note))}</div></td>
+                    <td><div class="xe_content">{str_replace('  ','&nbsp;&nbsp;',nl2br($release->release_note))}&nbsp;</div></td>
                 </tr>
                 <tr>
                     <th>{$lang->release_changes}</th>
-                    <td><div class="xe_cotnent">{str_replace('  ','&nbsp;&nbsp;',nl2br($release->release_changes))}</div></td>
+                    <td><div class="xe_content">{str_replace('  ','&nbsp;&nbsp;',nl2br($release->release_changes))}&nbsp;</div></td>
                 </tr>
                 <!--@end-->
                 <tr>

From 487076bc34584d75aec9a34cd7261fd749689778 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 4 Jul 2009 08:39:10 +0000
Subject: [PATCH 09/19] =?UTF-8?q?=EC=9D=B4=EC=8A=88=ED=8A=B8=EB=9E=98?=
 =?UTF-8?q?=EC=BB=A4=EC=9D=98=20=EA=B8=80=EC=93=B0=EA=B8=B0=20=ED=8F=BC?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A0=9C=EB=AA=A9=20=EB=82=B4=EC=9A=A9=20?=
 =?UTF-8?q?=EC=82=AC=EB=9D=BC=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6682 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/issuetracker/skins/xe_issuetracker/newissue.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/issuetracker/skins/xe_issuetracker/newissue.html b/modules/issuetracker/skins/xe_issuetracker/newissue.html
index 47deee587..3264c29b6 100644
--- a/modules/issuetracker/skins/xe_issuetracker/newissue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/newissue.html
@@ -10,7 +10,7 @@
     <!--@if($oIssue->getTitleText())-->
     <input type="text" name="title" id="postTitle" class="inputText" value="{htmlspecialchars($oIssue->getTitleText())}" />
     <!--@else-->
-    <input type="text" name="title" id="postTitle" class="inputText" value="{$lang->title}" onfocus="this.value=''" />
+    <input type="text" name="title" id="postTitle" class="inputText" value="{$lang->title}" title="{$lang->title}" onfocus="if(this.title == this.value) this.value='';" />
     <!--@end-->
 
     <table border="1" cellspacing="0" summary="Extra Form" class="extraVarsList">

From 1811fb5e521efa4a122f0e0a05a9de54741ed6f5 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Sat, 4 Jul 2009 08:39:55 +0000
Subject: [PATCH 10/19] =?UTF-8?q?=EC=9C=84=ED=82=A4=20=EB=82=B4=EC=9A=A9?=
 =?UTF-8?q?=20=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC=20=EC=98=81=EC=97=AD?=
 =?UTF-8?q?=EC=9D=B4=20=EC=97=AE=EC=9D=B8=EA=B8=80=EA=B3=BC=20=EA=B2=B9?=
 =?UTF-8?q?=EC=B9=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6683 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/wiki/skins/xe_wiki/css/wiki.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/wiki/skins/xe_wiki/css/wiki.css b/modules/wiki/skins/xe_wiki/css/wiki.css
index 7a765eae1..922ad26f8 100644
--- a/modules/wiki/skins/xe_wiki/css/wiki.css
+++ b/modules/wiki/skins/xe_wiki/css/wiki.css
@@ -316,7 +316,7 @@
 .time dt{ background:#fff;}
 
 /* Attached File */
-.attachedFile { position:relative; margin:1em -100% 1em 0; float:left; width:100%;}
+.attachedFile { position:relative; margin:1em 0 1em 0; float:left; width:100%;}
 .attachedFile *{ margin:0; padding:0; font-size:11px; vertical-align:middle;}
 .attachedFile dt img{ margin-right:10px;}
 .attachedFile dt .fileToggle{ border:0; padding:0; overflow:visible; cursor:pointer; font-size:11px; background:none;}

From c1d02fa7d33142cde7bf3700d7795c849c6aeba7 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 8 Jul 2009 10:08:17 +0000
Subject: [PATCH 11/19] add moveModule trigger

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6684 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.admin.controller.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 681f97011..8fcd2c629 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -48,6 +48,17 @@
             $oDB = &DB::getInstance();
             $oDB->begin();
 
+            $triggerObj->document_srl_list = $document_srl_list;
+            $triggerObj->module_srl = $module_srl;
+            $triggerObj->category_srl = $category_srl;
+
+            // Call trigger (before)
+            $output = ModuleHandler::triggerCall('document.moveDocumentModule', 'before', $triggerObj);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
             for($i=count($document_srl_list)-1;$i>=0;$i--) {
                 $document_srl = $document_srl_list[$i];
                 $oDocument = $oDocumentModel->getDocument($document_srl);
@@ -141,6 +152,13 @@
                 $oDB->rollback();
                 return $output;
             }
+
+            // Call trigger (before)
+            $output = ModuleHandler::triggerCall('document.moveDocumentModule', 'after', $triggerObj);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
             
             $oDB->commit();
             return new Object();

From aec81ff72317856f3b3ae8ef5952778ec28641f1 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 8 Jul 2009 10:08:49 +0000
Subject: [PATCH 12/19] issue move trigger

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6685 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/issuetracker/issuetracker.class.php      |  9 +++++++++
 modules/issuetracker/issuetracker.controller.php | 14 ++++++++++++++
 .../issuetracker/queries/updateIssueModule.xml   | 16 ++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 modules/issuetracker/queries/updateIssueModule.xml

diff --git a/modules/issuetracker/issuetracker.class.php b/modules/issuetracker/issuetracker.class.php
index 8781e2934..e9c89e6ab 100644
--- a/modules/issuetracker/issuetracker.class.php
+++ b/modules/issuetracker/issuetracker.class.php
@@ -29,6 +29,9 @@
             // 히스토리(=댓글) 첨부파일 활성화 트리거
             $oModuleController->insertTrigger('issuetracker.insertHistory', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
             $oModuleController->insertTrigger('issuetracker.insertHistory', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+
+            // movemodule trigger
+            $oModuleController->insertTrigger('document.moveDocumentModule', 'issuetracker', 'controller', 'triggerMoveDocumentModule', 'after');
         }
 
         function checkUpdate()
@@ -45,6 +48,8 @@
             if(!$oModuleModel->getTrigger('issuetracker.insertHistory', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
             if(!$oDB->isColumnExists('issues_history', 'uploaded_count')) return true;
 
+            if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'issuetracker', 'controller', 'triggerMoveDocumentModule', 'after')) return true;
+
             return false;
         }
 
@@ -72,6 +77,10 @@
                 $oDB->addColumn('issues_history', 'uploaded_count', 'number', 11, 0);
             }
 
+            if(!$oModuleModel->getTrigger('document.moveDocumentModule', 'issuetracker', 'controller', 'triggerMoveDocumentModule', 'after')) {
+                $oModuleController->insertTrigger('document.moveDocumentModule', 'issuetracker', 'controller', 'triggerMoveDocumentModule', 'after');
+            }
+
             return new Object(0, 'success_updated');
         }
     }
diff --git a/modules/issuetracker/issuetracker.controller.php b/modules/issuetracker/issuetracker.controller.php
index 47b7905ff..c4cbcac2e 100644
--- a/modules/issuetracker/issuetracker.controller.php
+++ b/modules/issuetracker/issuetracker.controller.php
@@ -151,6 +151,20 @@
             return $output;
         }
 
+        function triggerMoveDocumentModule(&$obj)
+        {
+            $args->module_srl = $obj->module_srl;
+            $args->document_srls = $obj->document_srls;
+            $args->milestone_srl = 0;
+            $args->type_srl = 0;
+            $args->priority_srl = 0;
+            $args->component_srl = 0;
+            $args->resolution_srl = 0;
+
+            $output = executeQuery('issuetracker.updateIssueModule', $args);
+            return $output;
+        }
+
         function insertHistory($target_srl, $objs, $module_srl, $grant)
         {
             $oIssuetrackerModel = &getModel('issuetracker');
diff --git a/modules/issuetracker/queries/updateIssueModule.xml b/modules/issuetracker/queries/updateIssueModule.xml
new file mode 100644
index 000000000..edc71abb8
--- /dev/null
+++ b/modules/issuetracker/queries/updateIssueModule.xml
@@ -0,0 +1,16 @@
+<query id="updateIssueModule" action="update">
+    <tables>
+        <table name="issues" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" default="0" />
+        <column name="milestone_srl" var="milestone_srl" filter="number" default="0" />
+        <column name="type_srl" var="type_srl" filter="number" default="0" />
+        <column name="priority_srl" var="priority_srl" filter="number" default="0" />
+        <column name="component_srl" var="component_srl" filter="number" default="0" />
+        <column name="resolution_srl" var="resolution_srl" filter="number" default="0" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="target_srl" var="document_srls" notnull="notnull" />
+    </conditions>
+</query>

From 66ee1a32f7757d3710ec1e2abefab543bf9e25ed Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 8 Jul 2009 12:12:18 +0000
Subject: [PATCH 13/19] document_srls

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6686 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.admin.controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 8fcd2c629..a295a5f3d 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -48,7 +48,7 @@
             $oDB = &DB::getInstance();
             $oDB->begin();
 
-            $triggerObj->document_srl_list = $document_srl_list;
+            $triggerObj->document_srls = implode(',',$document_srl_list);
             $triggerObj->module_srl = $module_srl;
             $triggerObj->category_srl = $category_srl;
 

From 55e8d5cb59bce8e9ac3ae127a9c3040212c9efad Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Thu, 9 Jul 2009 02:32:46 +0000
Subject: [PATCH 14/19] =?UTF-8?q?history=20update=20=EB=B6=80=EB=B6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6687 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/issuetracker/issuetracker.controller.php      |  7 ++++++-
 .../issuetracker/queries/updateIssueHistoryModule.xml | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 modules/issuetracker/queries/updateIssueHistoryModule.xml

diff --git a/modules/issuetracker/issuetracker.controller.php b/modules/issuetracker/issuetracker.controller.php
index c4cbcac2e..0e194d315 100644
--- a/modules/issuetracker/issuetracker.controller.php
+++ b/modules/issuetracker/issuetracker.controller.php
@@ -160,8 +160,13 @@
             $args->priority_srl = 0;
             $args->component_srl = 0;
             $args->resolution_srl = 0;
-
             $output = executeQuery('issuetracker.updateIssueModule', $args);
+            if(!$output->toBool()) return $output;
+
+            $args = null;
+            $args->module_srl = $obj->module_srl;
+            $args->document_srls = $obj->document_srls;
+            $output = executeQuery('issuetracker.updateIssueHistoryModule', $args);
             return $output;
         }
 
diff --git a/modules/issuetracker/queries/updateIssueHistoryModule.xml b/modules/issuetracker/queries/updateIssueHistoryModule.xml
new file mode 100644
index 000000000..a677c3c3f
--- /dev/null
+++ b/modules/issuetracker/queries/updateIssueHistoryModule.xml
@@ -0,0 +1,11 @@
+<query id="updateIssueHistoryModule" action="update">
+    <tables>
+        <table name="issues_history" />
+    </tables>
+    <columns>
+        <column name="module_srl" var="module_srl" filter="number" default="0" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="target_srl" var="document_srls" notnull="notnull" />
+    </conditions>
+</query>

From c323962382c1045cbe8729d28be4c6203a7aadd2 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Thu, 9 Jul 2009 02:38:11 +0000
Subject: [PATCH 15/19] module_srl should not be 0

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6688 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/issuetracker/queries/updateIssueHistoryModule.xml | 2 +-
 modules/issuetracker/queries/updateIssueModule.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/issuetracker/queries/updateIssueHistoryModule.xml b/modules/issuetracker/queries/updateIssueHistoryModule.xml
index a677c3c3f..1a00283b2 100644
--- a/modules/issuetracker/queries/updateIssueHistoryModule.xml
+++ b/modules/issuetracker/queries/updateIssueHistoryModule.xml
@@ -3,7 +3,7 @@
         <table name="issues_history" />
     </tables>
     <columns>
-        <column name="module_srl" var="module_srl" filter="number" default="0" />
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
     </columns>
     <conditions>
         <condition operation="in" column="target_srl" var="document_srls" notnull="notnull" />
diff --git a/modules/issuetracker/queries/updateIssueModule.xml b/modules/issuetracker/queries/updateIssueModule.xml
index edc71abb8..71ee96cd0 100644
--- a/modules/issuetracker/queries/updateIssueModule.xml
+++ b/modules/issuetracker/queries/updateIssueModule.xml
@@ -3,7 +3,7 @@
         <table name="issues" />
     </tables>
     <columns>
-        <column name="module_srl" var="module_srl" filter="number" default="0" />
+        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
         <column name="milestone_srl" var="milestone_srl" filter="number" default="0" />
         <column name="type_srl" var="type_srl" filter="number" default="0" />
         <column name="priority_srl" var="priority_srl" filter="number" default="0" />

From 1193d5e152f10c66714b10d8d159e901d07ed153 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 10 Jul 2009 06:18:33 +0000
Subject: [PATCH 16/19] =?UTF-8?q?MSSQL=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20(=EB=AF=B8=EC=99=84=EC=84=B1=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EB=A7=8C=20XE=20Core=20=EB=B6=84=EB=A6=AC=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=EC=84=9C=20=EC=82=AC=EC=9A=A9=ED=95=98?=
 =?UTF-8?q?=EC=A7=80=20=EB=AA=BB=ED=95=98=EA=B2=8C=20=ED=95=9C=20=ED=9B=84?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6689 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DB.class.php              |   1 +
 classes/db/DBMssql.class.php         | 707 +++++++++++++++++++++++++++
 modules/install/tpl/filter/mssql.xml |  36 ++
 modules/install/tpl/form.mssql.html  |  51 ++
 4 files changed, 795 insertions(+)
 create mode 100644 classes/db/DBMssql.class.php
 create mode 100644 modules/install/tpl/filter/mssql.xml
 create mode 100644 modules/install/tpl/form.mssql.html

diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index a4045e3e9..e8f12b7d4 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -547,6 +547,7 @@
             if(function_exists('ibase_connect')) $result[] = 'FireBird';
             if(function_exists('pg_connect')) $result[] = 'Postgre';
             if(function_exists('sqlite_open')) $result[] = 'sqlite2';
+            if(function_exists('mssql_connect')) $result[] = 'MSSQL';
             if(function_exists('PDO')) $result[] = 'sqlite3(PDO)';
             return $result;
         }
diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
new file mode 100644
index 000000000..0cbd14647
--- /dev/null
+++ b/classes/db/DBMssql.class.php
@@ -0,0 +1,707 @@
+<?php
+
+    /**
+     * @class DBMSSQL
+     * @author zero (zero@nzeo.com)
+     * @brief MSSQL 을 ADODB로 이
+     * @version 0.1
+     **/
+
+    class DBMssql extends DB {
+
+        /**
+         * DB를 이용하기 위한 정보
+         **/
+		var $conn = NULL;
+		var $rs = NULL;
+        var $database = NULL; ///< database
+        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
+        
+        /**
+         * @brief mssql 에서 사용될 column type
+         *
+         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
+         * 각 DBMS에 맞게 replace 해주어야 한다
+         **/
+        var $column_type = array(
+            'bignumber' => 'bigint',
+            'number' => 'int',
+            'varchar' => 'varchar',
+            'char' => 'char',
+            'text' => 'text',
+            'bigtext' => 'text',
+            'date' => 'varchar(14)',
+            'float' => 'float',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBMssql() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+        /**
+         * @brief 설치 가능 여부를 return
+         **/
+        function isSupported() {
+			return false;
+            if(!class_exists('COM')) return false;
+            return true;
+        }
+
+        /**
+         * @brief DB정보 설정 및 connect/ close
+         **/
+        function _setDBInfo() {
+            $db_info = Context::getDBInfo();
+            $this->hostname = $db_info->db_hostname;
+            $this->port = $db_info->db_port;
+            $this->userid   = $db_info->db_userid;
+            $this->password   = $db_info->db_password;
+            $this->database = $db_info->db_database;
+            $this->prefix = $db_info->db_table_prefix;
+			
+			if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
+        }
+
+        /**
+         * @brief DB 접속
+         **/
+        function _connect() {
+            // db 정보가 없으면 무시
+            if(!$this->hostname || !$this->database) return;
+
+			$this->conn = new COM("ADODB.Connection",NULL,CP_UTF8); 
+			//$this->conn = new COM("ADODB.Connection"); 
+			$this->conn->open( sprintf('Provider=sqloledb;Data Source=%s;Initial Catalog=%s;Network Library=dbmssocn;User ID=%s;Password=%s;', $this->hostname, $this->database, $this->userid, $this->password));
+	
+		    // 접속체크
+            $this->is_connected = true;
+        }
+
+        /**
+         * @brief DB접속 해제
+         **/
+        function close() {
+            if(!$this->isConnected()) return;
+            $this->commit();
+    		$this->conn->close();
+			$this->rs = $this->conn = null;
+        }
+
+        /**
+         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
+         **/
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)) $string = str_replace("'","''",$string);
+            return $string;
+        }
+
+        /**
+         * @brief 트랜잭션 시작
+         **/
+        function begin() {
+			return;
+            if(!$this->isConnected() || $this->transaction_started) return;
+            $this->transaction_started = true;
+            $this->_query("BEGIN TRANSACTION XE_Transaction");
+        }
+
+        /**
+         * @brief 롤백
+         **/
+        function rollback() {
+			return;		
+            if(!$this->isConnected() || !$this->transaction_started) return;
+            $this->transaction_started = false;
+            $this->_query("ROLLBACK TRANSACTION XE_Transaction");
+        }
+
+        /**
+         * @brief 커밋
+         **/
+        function commit($force = false) {
+			return;		
+            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
+            $this->transaction_started = false;	
+            $this->_query("COMMIT TRANSACTION XE_Transaction");
+        }
+
+        /**
+         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
+         *
+         * query : query문 실행하고 result return\n
+         * fetch : reutrn 된 값이 없으면 NULL\n
+         *         rows이면 array object\n
+         *         row이면 object\n
+         *         return\n
+         **/
+        function _query($query) {
+			if(!$this->isConnected() || !$query) return;
+
+			 	 
+			$this->rs = new COM("ADODB.Recordset"); 
+			$this->rs->CursorLocation=3; 
+
+            // 쿼리 시작을 알림
+            $this->actStart($query);
+
+            // 쿼리 문 실행
+			try {
+				@$this->rs->open($query,$this->conn,0,1,1);
+			} catch(Exception $e) {
+				//$this->setError('MSSQL Error in '.$query);
+			}
+			
+
+            // 쿼리 실행 종료를 알림
+            $this->actFinish();
+        }
+
+        /**
+         * @brief 결과를 fetch
+         **/
+        function _fetch() {
+			if(!$this->isConnected() || $this->isError() || !$this->rs) return;
+			
+			$output = array();
+			
+			for($i=0;!$this->rs->EOF;$this->rs->MoveNext(),$i++){ 
+				unset($row);
+				for($j=0;$j<$this->rs->Fields->Count;$j++){ 
+					$row->{$this->rs[$j]->name} = $this->rs[$j]->value;
+				} 
+				$output[$i]=$row; 
+			} 
+			$this->rs->close();
+			$this->rs = null;
+						
+			if(count($output)==1) return $output[0];
+            return $output;
+        }
+
+        /**
+         * @brief 1씩 증가되는 sequence값을 return (mssql의 auto_increment는 sequence테이블에서만 사용)
+         **/
+        function getNextSequence() {
+            $query = sprintf("insert into %ssequence (seq) values (ident_incr('%ssequence'))", $this->prefix, $this->prefix);
+			$this->_query($query);
+            $query = sprintf("select ident_current('%ssequence')+1 as sequence", $this->prefix);
+            $this->_query($query);
+            $tmp = $this->_fetch();
+            return $tmp->sequence;
+        }
+
+        /**
+         * @brief 테이블 기생성 여부 return
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf("select name from sysobjects where name = '%s%s' and xtype='U'", $this->prefix, $this->addQuotes($target_name));
+            $this->_query($query);			
+            $tmp = $this->_fetch();
+            if(!$tmp) return false;
+            return true;
+        }
+
+        /**
+         * @brief 특정 테이블에 특정 column 추가
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+			if($this->isColumnExists($table_name, $column_name)) return;
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($notnull) $query .= " not null ";
+
+            $this->_query($query);
+        }
+
+        /**
+         * @brief 특정 테이블에 특정 column 제거
+         **/
+        function dropColumn($table_name, $column_name) {
+			if(!$this->isColumnExists($table_name, $column_name)) return;
+            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief 특정 테이블의 column의 정보를 return
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("select syscolumns.name as name from syscolumns, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = syscolumns.id and syscolumns.name = '%s'", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+            if($this->isError()) return;
+            $tmp = $this->_fetch();
+            if(!$tmp->name) return false;
+            return true;
+        }
+
+        /**
+         * @brief 특정 테이블에 특정 인덱스 추가
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+			if($this->isIndexExists($table_name, $index_name)) return;
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $query = sprintf("create %s index %s on %s%s (%s)", $is_unique?'unique':'', $index_name, $this->prefix, $table_name, implode(',',$target_columns));
+            $this->_query($query);
+        }
+
+        /**
+         * @brief 특정 테이블의 특정 인덱스 삭제
+         **/
+        function dropIndex($table_name, $index_name, $is_unique = false) {
+			if(!$this->isIndexExists($table_name, $index_name)) return;
+            $query = sprintf("drop index %s%s.%s", $this->prefix, $table_name, $index_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief 특정 테이블의 index 정보를 return
+         **/
+        function isIndexExists($table_name, $index_name) {
+            $query = sprintf("select sysindexes.name as name from sysindexes, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = sysindexes.id and sysindexes.name = '%s'", $this->prefix, $table_name, $index_name);
+
+            $this->_query($query);
+            if($this->isError()) return;
+            $tmp = $this->_fetch();
+
+            if(!$tmp->name) return false;
+            return true;
+        }
+
+        /**
+         * @brief xml 을 받아서 테이블을 생성
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief xml 을 받아서 테이블을 생성
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // xml 파일을 읽음
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief schema xml을 이용하여 create table query생성
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+
+            // 테이블 생성 schema 작성
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+
+            if($table_name == 'sequence') {
+                $table_name = $this->prefix.$table_name;
+                $query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
+                return $this->_query($query);
+            } else {
+                $table_name = $this->prefix.$table_name;
+
+                if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+                else $columns = $xml_obj->table->column;
+
+                foreach($columns as $column) {
+                    $name = $column->attrs->name;
+                    $type = $column->attrs->type;
+                    $size = $column->attrs->size;
+                    $notnull = $column->attrs->notnull;
+                    $primary_key = $column->attrs->primary_key;
+                    $index = $column->attrs->index;
+                    $unique = $column->attrs->unique;
+                    $default = $column->attrs->default;
+                    $auto_increment = $column->attrs->auto_increment;
+
+                    $column_schema[] = sprintf('[%s] %s%s %s %s %s %s',
+                    $name,
+                    $this->column_type[$type],
+                    !in_array($type,array('number','text'))&&$size?'('.$size.')':'',
+                    $primary_key?'primary key':'',
+                    $default?"default '".$default."'":'',
+                    $notnull?'not null':'null',
+                    $auto_increment?'identity(1,1)':''
+                    );
+
+                    if($unique) $unique_list[$unique][] = $name;
+                    else if($index) $index_list[$index][] = $name;
+                }
+				
+                $schema = sprintf('create table [%s] (xe_seq int identity(1,1),%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
+                $output = $this->_query($schema);
+                if(!$output) return false;
+				
+                if(count($unique_list)) {
+                    foreach($unique_list as $key => $val) {
+                        $query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
+                        $this->_query($query);
+                    }
+                }
+
+                if(count($index_list)) {
+                    foreach($index_list as $key => $val) {
+                        $query = sprintf("create index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
+                        $this->_query($query);
+                    }
+                }
+				return true;
+            }
+        }
+
+        /**
+         * @brief 조건문 작성하여 return
+         **/
+        function getCondition($output) {
+            if(!$output->conditions) return;
+            $condition = $this->_getCondition($output->conditions,$output->column_type);
+            if($condition) $condition = ' where '.$condition;
+            return $condition;
+        }
+
+        function getLeftCondition($conditions,$column_type){
+            return $this->_getCondition($conditions,$column_type);
+        }
+
+
+        function _getCondition($conditions,$column_type) {
+            $condition = '';
+            foreach($conditions as $val) {
+                $sub_condition = '';
+                foreach($val['condition'] as $v) {
+                    if(!isset($v['value'])) continue;
+                    if($v['value'] === '') continue;
+                    if(!in_array(gettype($v['value']), array('string', 'integer'))) continue;
+
+                    $name = $v['column'];
+					if(preg_match('/^substr\(/i',$name)) $name = preg_replace('/^substr\(/i','substring(',$name);
+                    $operation = $v['operation'];
+                    $value = $v['value'];
+                    $type = $this->getColumnType($column_type,$name);
+                    $pipe = $v['pipe'];
+
+                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
+                    if(!$value) $value = $v['value'];
+                    $str = $this->getConditionPart($name, $value, $operation);
+                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
+                    $sub_condition .=  $str;
+                }
+                if($sub_condition) {
+                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
+                    $condition .= '('.$sub_condition.')';
+                }
+            }
+            return $condition;
+        }
+
+        /**
+         * @brief insertAct 처리
+         **/
+        function _executeInsertAct($output) {
+		
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '['.$this->prefix.$val.']';
+            }
+
+            // 컬럼 정리 
+            foreach($output->columns as $key => $val) {
+                $name = $val['name'];
+                $value = $val['value'];
+                if($output->column_type[$name]!='number') {
+                    $value = "'".$this->addQuotes($value)."'";
+                    if(!$value) $value = 'null';
+                } elseif(!$value || is_numeric($value)) $value = (int)$value;
+
+                $column_list[] = '['.$name.']';
+                $value_list[] = $value;
+            }
+
+            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief updateAct 처리
+         **/
+        function _executeUpdateAct($output) {
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '['.$this->prefix.$val.']';
+            }
+
+            // 컬럼 정리 
+            foreach($output->columns as $key => $val) {
+                if(!isset($val['value'])) continue;
+                $name = $val['name'];
+                $value = $val['value'];
+                if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
+                else {
+                    if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
+                    elseif(!$value || is_numeric($value)) $value = (int)$value;
+
+                    $column_list[] = sprintf("[%s] = %s",  $name, $value);
+                }
+            }
+
+            // 조건절 정리
+            $condition = $this->getCondition($output);
+
+            $query = sprintf("update %s set %s %s", implode(',',$table_list), implode(',',$column_list), $condition);
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief deleteAct 처리
+         **/
+        function _executeDeleteAct($output) {
+            // 테이블 정리
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '['.$this->prefix.$val.']';
+            }
+
+            // 조건절 정리
+            $condition = $this->getCondition($output);
+
+            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief selectAct 처리
+         *
+         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
+         * navigation이라는 method를 제공
+         **/
+        function _executeSelectAct($output) {
+            // 테이블 정리
+            $table_list = array();
+            foreach($output->tables as $key => $val) {
+                $table_list[] = '['.$this->prefix.$val.'] as '.$key;
+            }
+
+            $left_join = array();
+            // why???
+            $left_tables= (array)$output->left_tables;
+
+            foreach($left_tables as $key => $val) {
+                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+                if($condition){
+                    $left_join[] = $val . ' ['.$this->prefix.$output->_tables[$key].'] as '.$key  . ' on (' . $condition . ')';
+                }
+            }
+
+            if(!$output->columns) {
+                $columns = '*';
+            } else {
+                $column_list = array();
+                foreach($output->columns as $key => $val) {
+                    $name = $val['name'];
+					if(preg_match('/^substr\(/i',$name)) $name = preg_replace('/^substr\(/i','substring(',$name);
+                    $alias = $val['alias'];
+                    if(substr($name,-1) == '*') {
+                        $column_list[] = $name;
+                    } elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
+                        if($alias) $column_list[] = sprintf('[%s] as [%s]', $name, $alias);
+                        else $column_list[] = sprintf('[%s]',$name);
+                    } else {
+                        if($alias) $column_list[] = sprintf('%s as [%s]', $name, $alias);
+                        else $column_list[] = sprintf('%s',$name);
+                    }
+                }
+                $columns = implode(',',$column_list);
+            }
+
+            $condition = $this->getCondition($output);
+			
+
+            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
+
+
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            if($output->order) {
+                $conditions = $this->getConditionList($output);
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
+                        else $condition = sprintf(' where %s < 2100000000 ', $col);
+                    }
+                }
+            }
+
+            $query = sprintf("%s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
+
+            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
+
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+					if(preg_match('/^substr\(/i',$val[0])) $name = preg_replace('/^substr\(/i','substring(',$val[0]);
+                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
+                }
+                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
+            }
+
+            // list_count를 사용할 경우 적용
+            if($output->list_count['value']) $query = sprintf('select top %d %s', $output->list_count['value'], $query);
+			else $query = "select ".$query;
+            $this->_query($query);
+            if($this->isError()) return;
+            $data = $this->_fetch();
+
+            $buff = new Object();
+            $buff->data = $data;
+            return $buff;
+        }
+
+        /**
+         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
+         *
+         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
+         **/
+        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
+            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
+
+            // 전체 개수를 구함
+            $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
+            $total_count = $this->getCountCache($output->tables, $count_condition);
+            if($total_count === false) {
+                $count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
+                if (count($output->groups)) $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
+                $this->_query($count_query);
+                $count_output = $this->_fetch();
+                $total_count = (int)$count_output->count;
+                $this->putCountCache($output->tables, $count_condition, $total_count);
+            }
+
+            $list_count = $output->list_count['value'];
+            if(!$list_count) $list_count = 20;
+            $page_count = $output->page_count['value'];
+            if(!$page_count) $page_count = 10;
+            $page = $output->page['value'];
+            if(!$page) $page = 1;
+
+            // 전체 페이지를 구함
+            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
+            else $total_page = 1;
+
+            // 페이지 변수를 체크
+            if($page > $total_page) $page = $total_page;
+            $start_count = ($page-1)*$list_count;
+
+            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
+            $conditions = $this->getConditionList($output);
+            if($output->order) {
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
+                        else $condition = sprintf(' %s < 2100000000 ', $col);
+                    }
+                }
+            }
+			
+
+            // group by 절 추가
+            if(count($output->groups)) $group .= sprintf('group by %s', implode(',',$output->groups));
+
+            // order 절 추가
+            $order_targets = array();
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+					if(preg_match('/^substr\(/i',$val[0])) $name = preg_replace('/^substr\(/i','substring(',$val[0]);
+                    $order_targets[$val[0]] = $val[1];
+                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
+                }
+                if(count($index_list)) $order .= 'order by '.implode(',',$index_list);
+            }
+            if(!count($order_targets)) {
+                if(in_array('list_order',$conditions)) $order_targets['list_order'] = 'asc';
+                else $order_targets['xe_seq'] = 'desc';
+            }
+
+            if($start_count<1) {
+                $query = sprintf('select top %d %s from %s %s %s %s %s', $list_count, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
+            } else {
+                foreach($order_targets as $k => $v) {
+					$first_columns[] = sprintf('%s(%s) as %s', $v=='asc'?'max':'min', $k, $k);
+					$first_sub_columns[] = $k;
+                }
+				
+				// 1차로 order 대상에 해당 하는 값을 가져옴
+				$first_query = sprintf("select %s from (select top %d %s from %s %s %s %s %s) xet", implode(',',$first_columns),  $start_count, implode(',',$first_sub_columns), implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
+				$this->_query($first_query);
+				$tmp = $this->_fetch();
+
+				
+				// 1차에서 나온 값을 이용 다시 쿼리 실행
+				$sub_cond = array();
+                foreach($order_targets as $k => $v) {
+                    $sub_cond[] = sprintf("%s %s '%s'", $k, $v=='asc'?'>':'<', $tmp->{$k});
+				}
+				$sub_condition = ' and( '.implode(' and ',$sub_cond).' )';
+				
+				if($condition) $condition .= $sub_condition;
+				else $condition  = ' where '.$sub_condition;
+				$query = sprintf('select top %d %s from %s %s %s %s %s', $list_count, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
+            }
+
+            $this->_query($query);
+            if($this->isError()) {
+                $buff = new Object();
+                $buff->total_count = 0;
+                $buff->total_page = 0;
+                $buff->page = 1;
+                $buff->data = array();
+
+                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+                return $buff;
+            }
+
+            $virtual_no = $total_count - ($page-1)*$list_count;
+			for($i=0;!$this->rs->EOF;$this->rs->MoveNext(),$i++){ 
+				unset($row);
+				for($j=0;$j<$this->rs->Fields->Count;$j++){ 
+					$row->{$this->rs[$j]->key} = $this->rs[$j]->value;
+				} 
+				$data[$virtual_no--] = $row; 
+			} 
+			$this->rs = null;
+			
+            $buff = new Object();
+            $buff->total_count = $total_count;
+            $buff->total_page = $total_page;
+            $buff->page = $page;
+            $buff->data = $data;
+
+            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+            return $buff;
+        }
+
+    }
+?>
diff --git a/modules/install/tpl/filter/mssql.xml b/modules/install/tpl/filter/mssql.xml
new file mode 100644
index 000000000..ac0d37d83
--- /dev/null
+++ b/modules/install/tpl/filter/mssql.xml
@@ -0,0 +1,36 @@
+<filter name="install" module="install" act="procInstall">
+    <form>
+        <node target="db_type" required="true" />
+        <node target="db_hostname" required="true" minlength="1" maxlength="250" />
+        <node target="db_port" minlength="1" maxlength="250" />
+        <node target="db_database" required="true" minlength="1" maxlength="250" />
+        <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha"/>
+        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
+        <node target="password1" required="true" minlength="1" maxlength="20" />
+        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
+        <node target="user_name" required="true" minlength="2" maxlength="20" />
+        <node target="nick_name" required="true" minlength="2" maxlength="20" />
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email"/>
+    </form>
+    <parameter>
+        <param name="db_type" target="db_type" />
+        <param name="db_hostname" target="db_hostname" />
+        <param name="db_port" target="db_port" />
+        <param name="db_userid" target="db_userid" />
+        <param name="db_password" target="db_password" />
+        <param name="db_database" target="db_database" />
+        <param name="db_table_prefix" target="db_table_prefix" />
+        <param name="user_id" target="user_id" />
+        <param name="password" target="password1" />
+        <param name="user_name" target="user_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="email_address" target="email_address" />
+        <param name="use_rewrite" target="use_rewrite" />
+        <param name="time_zone" target="time_zone" />
+    </parameter>
+    <response callback_func="completeInstalled">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="redirect_url" />
+    </response>
+</filter>
diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html
new file mode 100644
index 000000000..089cae04f
--- /dev/null
+++ b/modules/install/tpl/form.mssql.html
@@ -0,0 +1,51 @@
+<!--%import("filter/mssql.xml")-->
+<!--%import("js/install_admin.js")-->
+<!--#include("header.html")-->
+
+<form action="./" method="post" onsubmit="return procFilter(this, install)">
+<input type="hidden" name="db_type" value="{$db_type}" />
+
+<h2 class="xeAdmin">{$lang->form_title}</h2>
+
+    <table cellspacing="0" class="tableType7">
+    <col width="100" />
+    <col width="160" />
+    <col />
+
+    <tr>
+        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
+        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
+        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
+        <td><input type="text" name="db_port" value="" class="inputTypeText w100" id="textfield12" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
+        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
+        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
+    </tr>
+    <tr>
+        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
+        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
+    </tr>
+    <tr>
+        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
+        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
+    </tr>
+
+    <!--#include("form.install.html")-->
+
+    </table>
+
+    <div class="buttonCenter">
+        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
+    </div>
+
+</form>
+
+<!--#include("footer.html")-->

From f7024290a283ef3501e9197e15738cc634a6d33d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 10 Jul 2009 06:18:54 +0000
Subject: [PATCH 17/19] =?UTF-8?q?r6689=EC=9D=98=20MSSQL=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EC=84=A4=EC=B9=98=EC=8B=9C=20=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EC=96=B8=EC=96=B4=20=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6690 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/en.lang.php    | 1 +
 modules/install/lang/es.lang.php    | 1 +
 modules/install/lang/fr.lang.php    | 1 +
 modules/install/lang/jp.lang.php    | 1 +
 modules/install/lang/ko.lang.php    | 1 +
 modules/install/lang/ru.lang.php    | 1 +
 modules/install/lang/zh-CN.lang.php | 1 +
 modules/install/lang/zh-TW.lang.php | 1 +
 8 files changed, 8 insertions(+)

diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index b9835182b..c8f7326aa 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -141,6 +141,7 @@ EndOfLicense;
         'sqlite2' => 'Supporting sqlite2 which saves the data into the file.<br />When installing, DB file should be created at unreachable place from web.<br />(Never got tested on stabilization)',
         'sqlite3_pdo' => 'Suppots sqlite3 by PHP\'s PDO.<br />When installing, DB file should be created at unreachable place from web.',
         'cubrid' => 'Use CUBRID DB.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'Use MSSQL DB',
         'postgresql' => 'Use PostgreSql DB.',
         'firebird' => 'Use firebird DB.',
     );
diff --git a/modules/install/lang/es.lang.php b/modules/install/lang/es.lang.php
index 19c5cebed..e7f76ea43 100644
--- a/modules/install/lang/es.lang.php
+++ b/modules/install/lang/es.lang.php
@@ -237,6 +237,7 @@ EndOfLicense;
         'sqlite2' => 'Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)',
         'sqlite3_pdo' => 'A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.',
         'cubrid' => 'Usar BD CUBRID. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'Usar BD MSSQL.',
         'postgresql' => 'Usar BD PostgreSql.',
         'firebird' => 'Usar BD firebird. Cómo crear <br /> PP (crear base de datos "/ path / dbname.fdb" page_size = 8192 el conjunto de caracteres UTF8 por defecto;)',
     );
diff --git a/modules/install/lang/fr.lang.php b/modules/install/lang/fr.lang.php
index b9f4ea960..a7a142e5a 100644
--- a/modules/install/lang/fr.lang.php
+++ b/modules/install/lang/fr.lang.php
@@ -195,6 +195,7 @@ EndOfLicense;
         'sqlite2' => 'Surpporter sqlite2 qui conserve les données dans les fichiers.<br />Quand vous installez, vous devez créer le fichier de Base de Données dans une place que l\'on ne peut pas accéder par web.<br />(Jamais  testé sur  stabilization)',
         'sqlite3_pdo' => 'Supporter sqlite3 PDO de PHP.<br />Quand vous installez, vous devez cr?r le fichier de Base de Données dans une place que l\'on ne peut pas accéder par Web.',
         'cubrid' => 'Utiliser la Base de Données de CUBRID.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'Utiliser la Base de Données de MSSQL.',
         'postgresql' => 'Utiliser la Base de Données de PostgreSql.',
         'firebird' => 'Utiliser la Base de Données de firebird.',
     );
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index ad4b8d778..f90b45b20 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -233,6 +233,7 @@ EndOfLicense;
         'sqlite2' => 'ファイルタイプデータベースである「sqlite2」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブがらアクセス出来ない場所に作成して下さい。<br />（安定化までのテストは行われていません）',
         'sqlite3_pdo' => 'PHPのPDOを経由うして「sqlite3」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブからアクセス出来ない場所に作成して下さい。',
         'cubrid' => 'CUBRID DBを利用します。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'MSSQL DBを利用します。',
         'postgresql' => 'PostgreSql DBを利用します。',
         'firebird' => 'Firebird DBを利用します。<br />DB生成方法 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)',
     );
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index 09b8c577f..f8c040e7f 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -233,6 +233,7 @@ EndOfLicense;
         'sqlite2' => '파일로 데이터를 저장하는 sqlite2를 지원합니다.<br />설치시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.<br />(안정화 테스트가 되지 않았습니다)',
         'sqlite3_pdo' => 'PHP의 PDO로 sqlite3를 지원합니다.<br />설치시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.',
         'cubrid' => 'CUBRID DB를 이용합니다. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'MSSQL DB를 이용합니다.',
         'postgresql' => 'PostgreSql을 이용합니다',
         'firebird' => 'Firebird를 이용합니다.<br />DB 생성 방법 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)',
     );
diff --git a/modules/install/lang/ru.lang.php b/modules/install/lang/ru.lang.php
index f6dfa4773..41609b38d 100644
--- a/modules/install/lang/ru.lang.php
+++ b/modules/install/lang/ru.lang.php
@@ -325,6 +325,7 @@ EndOfLicense;
         'sqlite2' => 'Поддерживает sqlite2, которая сохраняет данные в файл.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.<br />(Никогда не тестировалось на стабильность)',
         'sqlite3_pdo' => 'Поддерживает sqlite3 посредством PHP\'s PDO.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.',
         'cubrid' => 'Используем CUBRID DB. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => 'Используем MSSQL DB.',
         'postgresql' => 'Используем PostgreSql DB.',
         'firebird' => 'Используем firebird DB.',
     );
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index 73262a9f1..2f6bc6988 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -224,6 +224,7 @@ EndOfLicense;
         'sqlite2' => '支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)',
         'sqlite3_pdo' => '用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。',
         'cubrid' => '使用CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => '使用MSSQL DB。',
         'postgresql' => '使用PostgreSql DB。',
         'firebird' => '使用Firebird DB。',
     );
diff --git a/modules/install/lang/zh-TW.lang.php b/modules/install/lang/zh-TW.lang.php
index 3b3ede0b9..295074570 100644
--- a/modules/install/lang/zh-TW.lang.php
+++ b/modules/install/lang/zh-TW.lang.php
@@ -225,6 +225,7 @@ EndOfLicense;
         'sqlite2' => '支援用檔案形式保存數據的『sqlite2』。<br />安裝時，資料庫數據應建立在 web無法訪問的地方。<br />(尚未通過安全測試)',
         'sqlite3_pdo' => '用 PHP的 PDO支援『sqlite3』。<br />安裝時，資料庫數據應建立在網頁無法訪問的地方。',
         'cubrid' => '使用 CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
+        'mssql' => '使用 MSSQL DB。',
         'postgresql' => '使用 PostgreSql DB。',
         'firebird' => '使用 Firebird DB。<br />DB 생성 방법 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)',
     );

From 5a9eea53c115191bd897ea56ea26372281a283a3 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 10 Jul 2009 06:50:46 +0000
Subject: [PATCH 18/19] =?UTF-8?q?r6690=20MSSQL=20DB=20Handler=20insert=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6691 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DBMssql.class.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 0cbd14647..301094e35 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -168,17 +168,17 @@
 			if(!$this->isConnected() || $this->isError() || !$this->rs) return;
 			
 			$output = array();
-			
+			$k = (int)$this->rs->Fields->Count;
 			for($i=0;!$this->rs->EOF;$this->rs->MoveNext(),$i++){ 
 				unset($row);
-				for($j=0;$j<$this->rs->Fields->Count;$j++){ 
+				for($j=0;$j<$k;$j++){ 
 					$row->{$this->rs[$j]->name} = $this->rs[$j]->value;
 				} 
 				$output[$i]=$row; 
 			} 
 			$this->rs->close();
 			$this->rs = null;
-						
+					
 			if(count($output)==1) return $output[0];
             return $output;
         }
@@ -536,11 +536,10 @@
             }
 
             $condition = $this->getCondition($output);
-			
+
 
             if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
 
-
             // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
             if($output->order) {
                 $conditions = $this->getConditionList($output);
@@ -558,7 +557,7 @@
 
             if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
 
-            if($output->order) {
+            if($output->order && !preg_match('/count\(\*\)/i',$columns) ) {
                 foreach($output->order as $key => $val) {
 					if(preg_match('/^substr\(/i',$val[0])) $name = preg_replace('/^substr\(/i','substring(',$val[0]);
                     $index_list[] = sprintf('%s %s', $val[0], $val[1]);
@@ -569,6 +568,7 @@
             // list_count를 사용할 경우 적용
             if($output->list_count['value']) $query = sprintf('select top %d %s', $output->list_count['value'], $query);
 			else $query = "select ".$query;
+			
             $this->_query($query);
             if($this->isError()) return;
             $data = $this->_fetch();
@@ -647,6 +647,7 @@
 
             if($start_count<1) {
                 $query = sprintf('select top %d %s from %s %s %s %s %s', $list_count, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
+
             } else {
                 foreach($order_targets as $k => $v) {
 					$first_columns[] = sprintf('%s(%s) as %s', $v=='asc'?'max':'min', $k, $k);
@@ -687,7 +688,7 @@
 			for($i=0;!$this->rs->EOF;$this->rs->MoveNext(),$i++){ 
 				unset($row);
 				for($j=0;$j<$this->rs->Fields->Count;$j++){ 
-					$row->{$this->rs[$j]->key} = $this->rs[$j]->value;
+					$row->{$this->rs[$j]->name} = $this->rs[$j]->value;
 				} 
 				$data[$virtual_no--] = $row; 
 			} 

From 42c050fb56d0f1604198b59731ccdb2bd8139938 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 10 Jul 2009 06:54:42 +0000
Subject: [PATCH 19/19] =?UTF-8?q?MSSQL=EC=9D=98=20try,=20catch=EB=AC=B8?=
 =?UTF-8?q?=EC=9D=84=20=EC=9D=BC=EB=8B=A8=20=EC=A3=BC=EC=84=9D=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6692 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/db/DBMssql.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 301094e35..99ac2677a 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -150,11 +150,11 @@
             $this->actStart($query);
 
             // 쿼리 문 실행
-			try {
-				@$this->rs->open($query,$this->conn,0,1,1);
-			} catch(Exception $e) {
+			//try {
+				//@$this->rs->open($query,$this->conn,0,1,1);
+			//} catch(Exception $e) {
 				//$this->setError('MSSQL Error in '.$query);
-			}
+			//}
 			
 
             // 쿼리 실행 종료를 알림