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

common/js/common.js

@@ -415,8 +415,8 @@ function chkMemberMenu(evt) {
     }
     if(!obj || !obj.className || obj.className.search("member_")==-1) return;
 
-    var member_srl = obj.className.replace(/member_([0-9]+)/,'$1');
+    var member_srl = parseInt(obj.className.replace(/member_([0-9]+)/,'$1'),10);
-    if(member_srl<1) return;
+    if(!member_srl) return;
 
     // 현재 글의 mid, module를 구함
     var mid = location.href.getQuery("mid");

modules/member/member.controller.php

@@ -290,6 +290,10 @@
          * @brief 회원 가입 or 정보 수정
          **/
         function procMemberInsert() {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
+
             // 필수 정보들을 미리 추출
             $args = Context::gets('user_id','user_name','nick_name','email_address','password','allow_mailing');
             $args->member_srl = getNextSequence();
@@ -311,6 +315,7 @@
             if(!$output->toBool()) return $output;
 
             $this->add('member_srl', $args->member_srl);
+            if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
             $this->setMessage('success_registed');
         }
 
@@ -482,10 +487,12 @@
          * @brief 서명을 파일로 저장
          **/
         function putSignature($member_srl, $signature) {
-            $filename = sprintf('files/attach/signature/%s%d.gif', getNumberingPath($member_srl), $member_srl);
+            $path = sprintf('files/attach/signature/%s/', getNumberingPath($member_srl));
+            $filename = sprintf('%s%d.signature.php', $path, $member_srl);
             if(!$signature) return @unlink($filename);
 
             $buff = sprintf('<?php if(!__ZBXE__) exit();?>%s', $signature);
+            FileHandler::makeDir($path);
             FileHandler::writeFile($filename, $buff);
         }
 

modules/member/member.model.php

@@ -472,11 +472,12 @@
          * @brief 사용자의 signature를 구함
          **/
         function getSignature($member_srl) {
-            $filename = sprintf('files/attach/signature/%s%d.gif', getNumberingPath($member_srl), $member_srl);
+            $filename = sprintf('files/attach/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
             if(!file_exists($filename)) return '';
 
             $buff = FileHandler::readFile($filename);
-            return substr($buff, 29);29);
+            $signature = substr($buff, 29);
+            return $signature;
         }
     }
 ?>

modules/member/member.view.php

@@ -243,8 +243,8 @@
             Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info));
 
             $member_info = Context::get('member_info');
-            $member_info->signature = $oMemberModel->getSignature($member_srl);
+            $member_info->signature = $oMemberModel->getSignature($this->member_info->member_srl);
-            Context::set('member_info');
+            Context::set('member_info', $member_info);
 
             // 에디터 모듈의 getEditor를 호출하여 서명용으로 세팅
             if($this->member_info->member_srl) {

modules/member/skins/default/filter/signup.xml

@@ -20,5 +20,6 @@
     <response callback_func="completeInsert">
         <tag name="error" />
         <tag name="message" />
+        <tag name="redirect_url" />
     </response>
 </filter>

modules/member/skins/default/js/member.js

@@ -2,10 +2,12 @@
 function completeInsert(ret_obj, response_tags, args, fo_obj) {
     var error = ret_obj['error'];
     var message = ret_obj['message'];
+    var redirect_url = ret_obj['redirect_url'];
 
     alert(message);
 
-    location.href = location.href.setQuery('act','');
+    if(redirect_url) location.href = redirect_url;
+    else location.href = location.href.setQuery('act','');
 }
 
 /* 정보 수정 */