#18205582, #18150330, 메일 인증/ 비밀번호 찾기등의 메일 발송시 경로가 제대로 전달되도록 수정.

auth_key, member_srl등의 값이 제대로 들어가지 않아서 인증이 제대로 되지 않던 문제 수정



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

config/func.inc.php

@@ -219,6 +219,21 @@
         return Context::getUrl($num_args, $args_list);
     }
 
+    /**
+     * @brief getUrl()의 값에 request uri를 추가하여 reutrn
+     * full url을 얻기 위함
+     **/
+    function getFullUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+        if(!$num_args) return Context::getRequestUri();
+
+        $url = Context::getUrl($num_args, $args_list);
+        if(!preg_match('/^http/i',$url)) return substr(Context::getRequestUri(),0,-1).$url;
+        return $url;
+    }
+
     /**
      * @brief Context::getUrl()를 쓰기 쉽게 함수로 선언
      * @return string

modules/member/member.controller.php

@@ -966,8 +966,7 @@
             $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
             if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
-            $find_url = getUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$args->auth_key);
-            if(!preg_match('/^http/i',$find_url)) $find_url = substr(Context::getRequestUri(),0,-1).$find_url;
+            $find_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$args->auth_key);
             Context::set('find_url',$find_url);
 
 
@@ -1076,6 +1075,9 @@
             $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
             if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
+            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+            Context::set('auth_url', $auth_url);
+
             $oTemplate = &TemplateHandler::getInstance();
             $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 
@@ -1118,17 +1120,13 @@
             $output = executeQuery('member.chkAuthMail', $chk_args);
             if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
 
-            // 인증 메일 재발송
-            $auth_args->email_address = $auth_info->email_address = $args->email_address;
-
-            $output = executeQuery('member.getAuthMail', $auth_args);
-
-			$auth_info->auth_key = $output->data->auth_key;
+            $auth_args->member_srl = $member_info->member_srl;
+            $output = executeQueryArray('member.getAuthMailInfo', $auth_args);
+            if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
+            $auth_info = $output->data[0];
 
             // 메일 내용을 구함
-            Context::set('auth_args', $auth_info);
             Context::set('member_info', $member_info);
-
             $oModuleModel = &getModel('module');
             $member_config = $oModuleModel->getModuleConfig('member');
             if(!$member_config->skin) $this->member_config->skin = "default";
@@ -1139,6 +1137,9 @@
             $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
             if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
+            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
+            Context::set('auth_url', $auth_url);
+
 	        $oTemplate = &TemplateHandler::getInstance();
             $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 
@@ -1587,6 +1588,9 @@
 	            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
 	            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
 
+                $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$args->member_srl, 'auth_key',$auth_args->auth_key);
+                Context::set('auth_url', $auth_url);
+
 	            $oTemplate = &TemplateHandler::getInstance();
                 $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
 

modules/member/queries/getAuthMailInfo.xml

@@ -0,0 +1,11 @@
+<query id="getAuthMailInfo" action="select">
+    <tables>
+        <table name="member_auth_mail" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" pipe="and" />
+    </conditions>
+</query>

modules/member/skins/default/confirm_member_account_mail.html

@@ -9,4 +9,4 @@
 </ul>
 <hr noshade="noshade" />
 {$lang->msg_confirm_account_comment}<br />
-<a href="{Context::getRequestUri()}{getUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key)}" target="_blank">{Context::getRequestUri()}{getUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl,'auth_key',$auth_args->auth_key)}</a>
+<a href="{$auth_url}">{$auth_url}</a>

modules/member/skins/default/resend_auth_mail.html

@@ -17,4 +17,4 @@
     </table>
 
 </form>
-</div>
+</div>