git-svn-id: http://xe-core.googlecode.com/svn/trunk@485 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/board/board.controller.php

@@ -125,16 +125,18 @@
             // comment 모듈의 controller 객체 생성
             $oCommentController = &getController('comment');
 
+            // comment_srl이 존재하는지 체크
+            $comment = $oCommentModel->getComment($obj->comment_srl, $this->grant->manager);
+
             // comment_srl이 없을 경우 신규 입력
-            if(!$obj->comment_srl) {
+            if($comment->comment_srl != $obj->comment_srl) {
 
                 // parent_srl이 있으면 답변으로
                 if($obj->parent_srl) {
-                    $comment = $oCommentModel->getComment($obj->parent_srl);
+                    $parent_comment = $oCommentModel->getComment($obj->parent_srl);
-                    if(!$comment) return new Object(-1, 'msg_invalid_request');
+                    if(!$parent_comment->comment_srl) return new Object(-1, 'msg_invalid_request');
 
                     $output = $oCommentController->insertComment($obj);
-                    $comment_srl = $output->get('comment_srl');
 
                 // 없으면 신규
                 } else {
@@ -143,10 +145,6 @@
 
             // comment_srl이 있으면 수정으로
             } else {
-
-                $comment = $oCommentModel->getComment($obj->comment_srl);
-                if(!$comment) return new Object(-1, 'msg_invalid_request');
-
                 $obj->parent_srl = $comment->parent_srl;
                 $output = $oCommentController->updateComment($obj);
                 $comment_srl = $obj->comment_srl;

modules/board/board.view.php

@@ -458,13 +458,14 @@
          **/
         function setCommentEditor($comment_srl=0) {
             if(!$comment_srl) {
-                $oDB = &DB::getNextSequence();
+                $oDB = &DB::getInstance();
                 $comment_srl = $oDB->getNextSequence();
+                Context::set('comment_srl', $comment_srl);
             }
 
             // 에디터 모듈의 dispEditor를 호출하여 세팅
             $oEditorView = &getView('editor');
-            $comment_editor = $oEditorView->getEditor($comment, $this->grant->fileupload);
+            $comment_editor = $oEditorView->getEditor($comment_srl, $this->grant->fileupload);
             Context::set('comment_editor', $comment_editor);
         }
 

modules/board/skins/default/comment_form.html

@@ -2,6 +2,8 @@
 
 <!--@if($source_comment)-->
   <!--#include("header.html")-->
+<!--@else-->
+  <!--%import("js/board.js")-->
 <!--@end-->
 
 <!-- 만약 댓글의 답을 다는 것이라면 원문 보여줌 -->
@@ -27,7 +29,7 @@
 <!--@end-->
 
 <!-- 글쓰기 폼 -->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_comment)">
+<form action="./" method="post" onsubmit="return procFilter(this, insert_comment)" <!--@if($grant->fileupload)-->enctype="multipart/form-data"<!--@end-->>
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 <input type="hidden" name="comment_srl" value="{$comment_srl}" />

modules/board/skins/default/write_form.html

@@ -3,7 +3,6 @@
 
 <form action="./" method="post" onsubmit="return procFilter(this, insert)" <!--@if($grant->fileupload)-->enctype="multipart/form-data"<!--@end-->>
 <input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procUploadFile" />
 <input type="hidden" name="content" value="{htmlspecialchars($document->content)}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
   <table width="100%">

modules/comment/comment.controller.php

@@ -40,7 +40,6 @@
 
             $oDB = &DB::getInstance();
 
-            $obj->comment_srl = $oDB->getNextSequence();
             $obj->list_order = $obj->comment_srl * -1;
             if($obj->password) $obj->password = md5($obj->password);
 

modules/editor/editor.view.php

@@ -16,8 +16,9 @@
         /**
          * @brief 에디터를 return
          **/
-        function getEditor($upload_target_srl) {
+        function getEditor($upload_target_srl, $allow_fileupload = false) {
             Context::set('upload_target_srl', $upload_target_srl);
+            Context::set('allow_fileupload', $allow_fileupload);
 
             $tpl_path = $this->module_path.'tpl';
             $tpl_file = 'editor.html';

modules/editor/tpl/editor.html

@@ -65,14 +65,14 @@
   <div class="editor_iframe_box"><iframe id="editor_iframe_{$upload_target_srl}" frameBorder="0" style="border:0px;width:99%;height:300px;margin:0px;"></iframe><div class="editor_drag_down_area" id="editor_drag_bar_{$upload_target_srl}"></div></div>
 </div>
 
-<!--@if($grant->fileupload)-->
+<!--@if($allow_fileupload)-->
-<!-- 파일 업로드는 어떤 모듈이건 $grant->fileupload가 true여야 호출된다. 필요할 모듈에서는 임의 설정 하면 됨 -->
 <!--%import("./js/uploader.js")-->
 <script type="text/javascript">
   editor_upload_init("{$upload_target_srl}");
 </script>
 
 <input type="hidden" name="upload_target_srl" value="{$upload_target_srl}" />
+<input type="hidden" name="act" value="procUploadFile" />
 
 <div class="editor_uploader_box">
   <div class="editor_uploader">

modules/editor/tpl/js/uploader.js

@@ -37,15 +37,18 @@ function editor_upload_form_set(upload_target_srl) {
   while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; }
   fo_obj.target = 'tmp_upload_iframe';
 
-  // upload_target_srl에 해당하는 첨부파일 목록을 로드
+  // upload_target_srl에 해당하는 첨부파일 목록을 로드 (procDeleteFile에 file_srl을 보내주지 않으면 삭제시도는 없이 목록만 갱신할 수 있음) 
   var module = "";
   if(fo_obj["module"]) module = fo_obj.module.value;
   var mid = "";
   if(fo_obj["mid"]) mid = fo_obj.mid.value;
+  var document_srl = "";
+  if(fo_obj["document_srl"]) document_srl = fo_obj.document_srl.value;
 
   var url = "./?act=procDeleteFile&upload_target_srl="+upload_target_srl;
   if(module) url+="&module="+module;
   if(mid) url+="&mid="+mid;
+  if(document_srl) url+="&document_srl="+document_srl;
 
   // iframe에 url을 보내버림
   var iframe_obj = xGetElementById('tmp_upload_iframe');

modules/file/file.controller.php

@@ -70,7 +70,7 @@
         /**
          * @brief 첨부파일 삭제
          **/
-        function deleteFile($file_srl) {
+        function deleteFile($file_srl, $is_admin = false) {
             $oDB = &DB::getInstance();
 
             // 파일 정보를 가져옴