diff --git a/adm/admin.menu200.php b/adm/admin.menu200.php
index 6e06700e7..1e41855db 100644
--- a/adm/admin.menu200.php
+++ b/adm/admin.menu200.php
@@ -5,6 +5,7 @@ $menu['menu200'] = array (
array('200300', '회원메일발송', G5_ADMIN_URL.'/mail_list.php', 'mb_mail'),
array('200800', '접속자집계', G5_ADMIN_URL.'/visit_list.php', 'mb_visit', 1),
array('200810', '접속자검색', G5_ADMIN_URL.'/visit_search.php', 'mb_search', 1),
+ array('200820', '접속자로그삭제', G5_ADMIN_URL.'/visit_delete.php', 'mb_delete', 1),
array('200200', '포인트관리', G5_ADMIN_URL.'/point_list.php', 'mb_point'),
array('200900', '투표관리', G5_ADMIN_URL.'/poll_list.php', 'mb_poll')
);
diff --git a/adm/visit_delete.php b/adm/visit_delete.php
new file mode 100644
index 000000000..e88fe0ad2
--- /dev/null
+++ b/adm/visit_delete.php
@@ -0,0 +1,95 @@
+
+
+
+ 접속자 로그를 삭제할 년도와 방법을 선택해주십시오.
+
+
+
+
+
+
+
diff --git a/adm/visit_delete_update.php b/adm/visit_delete_update.php
new file mode 100644
index 000000000..1cbe920cf
--- /dev/null
+++ b/adm/visit_delete_update.php
@@ -0,0 +1,60 @@
+
\ No newline at end of file
diff --git a/adm/visit_list.php b/adm/visit_list.php
index 30e407cba..60d73f6c9 100644
--- a/adm/visit_list.php
+++ b/adm/visit_list.php
@@ -91,7 +91,7 @@ $result = sql_query($sql);
자료가 없습니다. | ';
+ echo '| 자료가 없거나 관리자에 의해 삭제되었습니다. |
';
?>
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 960d5a138..31bda65a0 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -252,6 +252,10 @@ if ($w == '') {
ob_end_clean();
mailer($config['cf_title'], $config['cf_admin_email'], $mb_email, $subject, $content, 1);
+
+ // 메일인증을 사용하는 경우 가입메일에 인증 url이 있으므로 인증메일을 다시 발송되지 않도록 함
+ if($config['cf_use_email_certify'])
+ $old_email = $mb_email;
}
// 최고관리자님께 메일 발송
diff --git a/bbs/register_form_update_mail3.php b/bbs/register_form_update_mail3.php
index 36f975330..5ae4d46a9 100644
--- a/bbs/register_form_update_mail3.php
+++ b/bbs/register_form_update_mail3.php
@@ -21,7 +21,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
님의 E-mail 주소가 변경되었습니다.
+
아래의 주소를 클릭하시면 인증이 완료됩니다.
diff --git a/lib/common.lib.php b/lib/common.lib.php
index a4d3fe041..a46595028 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2195,7 +2195,7 @@ function html_end()
$buffer = ob_get_contents();
ob_end_clean();
preg_match('#
(.*)#is', $buffer, $bodys);
- preg_match_all('/(\r|\n)?]+>/i', $bodys[0], $links);
+ preg_match_all('/[\n\r]?(]+>).*()?/i', $bodys[0], $links);
$stylesheet = '';
$links[0] = array_unique($links[0]);
foreach ($links[0] as $key=>$link) {
@@ -2257,6 +2257,9 @@ function https_url($dir, $https=true)
// 게시판의 공지사항을 , 로 구분하여 업데이트 한다.
function board_notice($bo_notice, $wr_id, $insert=false)
{
+ if(strpos($bo_notice, strval($wr_id)) !== false)
+ return $bo_notice;
+
$notice_array = explode(",", trim($bo_notice));
$notice_array = array_merge(array($wr_id), $notice_array);
$notice_array = array_unique($notice_array);
diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css
index 712313af6..e23da9c93 100644
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@@ -95,9 +95,10 @@
/* 회원가입 완료 */
#reg_result {padding:40px 10px 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
-#reg_result #result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
+#reg_result #result_email {margin:20px 0;padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
#reg_result #result_email span {display:inline-block;width:150px}
#reg_result #result_email strong {color:#e8180c;font-size:1.2em}
+#reg_result p {line-height:1.8em}
#reg_result .btn_confirm {margin:50px 0}
/* 아이디/비밀번호 찾기 */
diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css
index b84a6eed2..ba15d7c44 100644
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@@ -102,9 +102,10 @@
/* 회원가입 완료 */
#reg_result {padding:50px 0 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
-#reg_result #result_email {padding:10px 50px;border-top:1px solid #e9e9e9;border-bottom:1px solid #dde4e9;background:#fff;line-height:2em}
+#reg_result #result_email {margin:20px 0;padding:10px 50px;border-top:1px solid #e9e9e9;border-bottom:1px solid #dde4e9;background:#fff;line-height:2em}
#reg_result #result_email span {display:inline-block;width:150px}
#reg_result #result_email strong {color:#e8180c;font-size:1.2em}
+#reg_result p {line-height:1.8em}
#reg_result .btn_confirm {margin:50px 0}
/* 아이디/비밀번호 찾기 */