diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 0adb89e29..966a62b5e 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -43,6 +43,7 @@
$lang->cmd_setup = '설정';
$lang->cmd_apply = '적용';
$lang->cmd_open_calendar = '날자 선택';
+ $lang->cmd_send = '발송';
$lang->enable = '가능';
$lang->disable = '불가능';
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index 11881ddf3..a2fe0fbee 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -25,7 +25,6 @@
-
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
index 06f522e6d..43b9ae9f2 100644
--- a/modules/member/lang/ko.lang.php
+++ b/modules/member/lang/ko.lang.php
@@ -12,6 +12,10 @@
$lang->default_group_2 = "정회원";
$lang->admin_group = "관리그룹";
+ $lang->send_start_date = "발송 시작일";
+ $lang->send_finish_date = "발송 완료일";
+ $lang->sended_count = "발송 대상자";
+
$lang->remember_user_id = '아이디 저장';
$lang->already_logged = '이미 로그인되어 있습니다';
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index d916ba63c..a1ef46df1 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -74,9 +74,13 @@
// 관리자 정보 세팅
$admin_info = Context::gets('user_id','password','nick_name','user_name', 'email_address');
+ if($admin_info->user_id) {
+ // 관리자 정보 입력
+ $oMemberController->insertAdmin($admin_info);
- // 관리자 정보 입력
- $oMemberController->insertAdmin($admin_info);
+ // 로그인 처리시킴
+ $output = $oMemberController->doLogin($admin_info->user_id);
+ }
// 금지 아이디 등록 (기본 + 모듈명)
$oModuleModel = &getModel('module');
@@ -91,10 +95,6 @@
$oMemberController->insertDeniedID('ftp','');
$oMemberController->insertDeniedID('http','');
- // 로그인 처리시킴
- $output = $oMemberController->doLogin($admin_info->user_id);
- if(!$output) return $output;
-
// member 에서 사용할 cache디렉토리 생성
FileHandler::makeDir('./files/member_extra_info/attach/image_name');
FileHandler::makeDir('./files/member_extra_info/attach/image_mark');
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index e5cbf6ee1..085aa3184 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -513,5 +513,6 @@
$this->setTemplateFile('denied_id_list');
}
+
}
?>
diff --git a/modules/member/schemas/member_mailing.xml b/modules/member/schemas/member_mailing.xml
new file mode 100644
index 000000000..1064c0aae
--- /dev/null
+++ b/modules/member/schemas/member_mailing.xml
@@ -0,0 +1,10 @@
+
diff --git a/modules/member/tpl/mailing_list.html b/modules/member/tpl/mailing_list.html
new file mode 100644
index 000000000..f318c6d6b
--- /dev/null
+++ b/modules/member/tpl/mailing_list.html
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+ {number_format($total_count)},
+ {$lang->page_count} : {number_format($page)} / {number_format($total_page)}
+
+
+
+
+
+
+ | {$lang->no} |
+ {$lang->title} |
+ {$lang->regdate} |
+ {$lang->send_start_date} |
+ {$lang->send_finish_date} |
+ {$lang->sended_count} |
+ {$lang->cmd_send} |
+
+
+
+ | {$no} |
+ {$val->title} |
+ {zdate($val->regdate,"Y-m-d")} |
+ {zdate($val->send_start_date,"Y-m-d")} |
+ {zdate($val->send_finish_date,"Y-m-d")} |
+ {number_format($val->sended_count)} |
+
+
+ {$lang->cmd_send}
+
+ |
+
+
+
+
+
+
+
+
+
+