diff --git a/adm/board_form.php b/adm/board_form.php
index efbf2939f..087832b93 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -154,6 +154,13 @@ $pg_anchor = '
';
+
+$frm_submit = '
+
+
목록'.PHP_EOL;
+if ($w == 'u') $frm_submit .= '
게시판복사
+
게시판 바로가기'.PHP_EOL;
+$frm_submit .= '
';
?>
diff --git a/adm/board_list_delete.php b/adm/board_list_delete.php
deleted file mode 100644
index 4ff4f8a41..000000000
--- a/adm/board_list_delete.php
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$sub_menu = "300100";
-include_once("./_common.php");
-
-check_demo();
-
-if ($is_admin != "super")
- alert("게시판 삭제는 최고관리자만 가능합니다.");
-
-auth_check($auth[$sub_menu], "d");
-
-check_token();
-
-// _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
-define("_BOARD_DELETE_", TRUE);
-
-for ($i=0; $i
diff --git a/adm/config_form.php b/adm/config_form.php
index 6dec4a4d5..3df62ab63 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -147,6 +147,11 @@ $pg_anchor = '';
+$frm_submit = '';
+
if (!$config['cf_icode_server_ip']) $config['cf_icode_server_ip'] = '211.172.232.124';
if (!$config['cf_icode_server_port']) $config['cf_icode_server_port'] = '7295';
@@ -418,6 +423,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
게시판 기본 설정
@@ -498,6 +505,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
회원가입 설정
@@ -643,6 +652,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
본인확인 설정
@@ -719,6 +730,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
기본 메일 환경 설정
@@ -756,6 +769,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
게시판 글 작성 시 메일 설정
@@ -808,6 +823,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
회원가입 시 메일 설정
@@ -839,6 +856,7 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
투표 기타의견 작성 시 메일 설정
@@ -864,6 +882,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
소셜네트워크서비스(SNS : Social Network Service)
@@ -909,6 +929,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
레이아웃 추가설정
@@ -957,6 +979,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
SMS
@@ -1037,6 +1061,8 @@ if ($config['cf_icode_id'] && $config['cf_icode_pw']) {
+
+
-
-
-
+
diff --git a/adm/member_form.php b/adm/member_form.php
index e7e73ee03..4a15ac63e 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -205,9 +205,10 @@ include_once('./admin.head.php');
-
- 주소 검색
-
+ 주소 검색
+
+
지번주소 :
|
diff --git a/adm/member_form_update.php b/adm/member_form_update.php
index 44a7d50c7..7e4c4669c 100644
--- a/adm/member_form_update.php
+++ b/adm/member_form_update.php
@@ -29,6 +29,8 @@ if($_POST['mb_certify_case'] && $_POST['mb_certify']) {
$mb_adult = 0;
}
+$mb_addr2 = get_address2($_POST['mb_addr2'], $_POST['mb_addr3']);
+
$sql_common = " mb_name = '{$_POST['mb_name']}',
mb_nick = '{$_POST['mb_nick']}',
mb_email = '{$_POST['mb_email']}',
@@ -40,7 +42,7 @@ $sql_common = " mb_name = '{$_POST['mb_name']}',
mb_zip1 = '{$_POST['mb_zip1']}',
mb_zip2 = '{$_POST['mb_zip2']}',
mb_addr1 = '{$_POST['mb_addr1']}',
- mb_addr2 = '{$_POST['mb_addr2']}',
+ mb_addr2 = '{$mb_addr2}',
mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}',
mb_birth = '{$_POST['mb_birth']}',
mb_sex = '{$_POST['mb_sex']}',
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 0b96a2867..c75d3c678 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -35,6 +35,7 @@ $mb_zip1 = isset($_POST['mb_zip1']) ? escape_trim($_POST['mb_zip
$mb_zip2 = isset($_POST['mb_zip2']) ? escape_trim($_POST['mb_zip2']) : "";
$mb_addr1 = isset($_POST['mb_addr1']) ? escape_trim($_POST['mb_addr1']) : "";
$mb_addr2 = isset($_POST['mb_addr2']) ? escape_trim($_POST['mb_addr2']) : "";
+$mb_addr3 = isset($_POST['mb_addr3']) ? escape_trim($_POST['mb_addr3']) : "";
$mb_addr_jibeon = isset($_POST['mb_addr_jibeon']) ? escape_trim($_POST['mb_addr_jibeon']) : "";
$mb_signature = isset($_POST['mb_signature']) ? escape_trim($_POST['mb_signature']) : "";
$mb_profile = isset($_POST['mb_profile']) ? escape_trim($_POST['mb_profile']) : "";
@@ -52,6 +53,8 @@ $mb_8 = isset($_POST['mb_8']) ? escape_trim($_POST['mb_8']
$mb_9 = isset($_POST['mb_9']) ? escape_trim($_POST['mb_9']) : "";
$mb_10 = isset($_POST['mb_10']) ? escape_trim($_POST['mb_10']) : "";
+// 상세주소처리
+$mb_addr2 = get_address2($mb_addr2, $mb_addr3);
if ($w == '' || $w == 'u') {
diff --git a/css/admin.css b/css/admin.css
index 7136969c3..0c82e993a 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -139,8 +139,10 @@ h3 {margin:0 20px}
.btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm02 a:focus {background:#555}
+
.btn_confirm03 {clear:both;margin-top:10px;text-align:right}
+
.btn_submit {background:#ff3061;cursor:pointer}
.btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
diff --git a/css/default.css b/css/default.css
index 878659f7e..1ebce0786 100644
--- a/css/default.css
+++ b/css/default.css
@@ -197,7 +197,6 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.frm_input {height:22px}
.tbl_frm01 textarea {width:98%;height:100px}
.tbl_frm01 a {text-decoration:none}
-.tbl_frm01 .frm_address {display:block;margin-top:5px}
.tbl_frm01 .frm_file {display:block;margin-bottom:5px}
.tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}
diff --git a/css/mobile.css b/css/mobile.css
index c089e9a6c..f2e4d5919 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -167,7 +167,6 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
.tbl_frm01 textarea {width:100%;height:100px}
.tbl_frm01 a {text-decoration:none}
-.tbl_frm01 .frm_address {display:block;margin-top:5px}
.tbl_frm01 .frm_file {display:block;margin-bottom:5px;width:100%}
.tbl_frm01 .frm_info {display:block;padding:5px 0 0;color:#666;line-height:1.3em}
diff --git a/img/tnb_admin.jpg b/img/tnb_admin.jpg
deleted file mode 100644
index e4c5e1d50..000000000
Binary files a/img/tnb_admin.jpg and /dev/null differ
diff --git a/img/tnb_cnt.jpg b/img/tnb_cnt.jpg
deleted file mode 100644
index df548b2c9..000000000
Binary files a/img/tnb_cnt.jpg and /dev/null differ
diff --git a/img/tnb_join.jpg b/img/tnb_join.jpg
deleted file mode 100644
index 40579c97e..000000000
Binary files a/img/tnb_join.jpg and /dev/null differ
diff --git a/img/tnb_login.jpg b/img/tnb_login.jpg
deleted file mode 100644
index e6abecf6f..000000000
Binary files a/img/tnb_login.jpg and /dev/null differ
diff --git a/img/tnb_logout.jpg b/img/tnb_logout.jpg
deleted file mode 100644
index ea6a229b2..000000000
Binary files a/img/tnb_logout.jpg and /dev/null differ
diff --git a/img/tnb_modify.jpg b/img/tnb_modify.jpg
deleted file mode 100644
index 4abbc15fb..000000000
Binary files a/img/tnb_modify.jpg and /dev/null differ
diff --git a/img/tnb_new.jpg b/img/tnb_new.jpg
deleted file mode 100644
index 2f5167d94..000000000
Binary files a/img/tnb_new.jpg and /dev/null differ
diff --git a/lib/common.lib.php b/lib/common.lib.php
index b5972fdb5..23365e1fb 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2505,4 +2505,18 @@ function module_exec_check($exe, $type)
return $error;
}
+
+// 도로명 상세 주소처리
+function get_address2($addr2, $addr3)
+{
+ if($addr3) {
+ if($addr2) {
+ $addr2 .= ' '.$addr3;
+ } else {
+ $addr2 = $addr3;
+ }
+ }
+
+ return $addr2;
+}
?>
\ No newline at end of file
diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php
index 26db27ef1..85c48068a 100644
--- a/mobile/skin/member/basic/register_form.skin.php
+++ b/mobile/skin/member/basic/register_form.skin.php
@@ -144,12 +144,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
class="frm_input " size="3" maxlength="3">
- 주소 검색
+ 주소 검색
- class="frm_input frm_address " size="50">
-
- class="frm_input frm_address " size="50">
-
+ class="frm_input frm_address " size="50">
+
+
+
+
+
diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css
index 81dc8a116..c93d35207 100644
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@@ -41,7 +41,6 @@
.mb_skin table {}
.mb_skin caption {}
.mb_skin .frm_info {}
-.mb_skin .frm_address {}
.mb_skin .frm_file {}
.mbskin .tbl_frm01 {}
@@ -84,12 +83,15 @@
/* 회원가입 입력 */
#fregisterform #reg_mb_email, #fregisterform .frm_address {width:100%}
-#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
#fregisterform textarea {width:100%;height:50px}
#fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
+#fregisterform .frm_address {margin:5px 0 0}
+#fregisterform #mb_addr3 {display:block;margin:5px 0 0}
+#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
+
/* 회원가입 완료 */
#reg_result {padding:40px 10px 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
diff --git a/mobile/skin/member/basic/zip.skin.php b/mobile/skin/member/basic/zip.skin.php
index b9c9592c8..cf1b8d4ff 100644
--- a/mobile/skin/member/basic/zip.skin.php
+++ b/mobile/skin/member/basic/zip.skin.php
@@ -55,16 +55,18 @@ $(function() {
});
});
-function put_data(zip1, zip2, addr1, addr2, jibeon)
+function put_data(zip1, zip2, addr1, addr3, jibeon)
{
var of = window.opener.document.;
of..value = zip1;
of..value = zip2;
of..value = addr1;
- of..value = addr2;
+ of..value = "";
+ of..value = addr3;
- window.opener.document.getElementById("").innerText = "지번주소 : "+jibeon;
+ window.opener.$("#").text(addr3);
+ window.opener.$("#").text("지번주소 : "+jibeon);
if(of. !== undefined)
of..value = jibeon;
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php
index 0736c2c4b..a6c17ac19 100644
--- a/skin/member/basic/register_form.skin.php
+++ b/skin/member/basic/register_form.skin.php
@@ -149,11 +149,13 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-
class="frm_input " size="3" maxlength="3">
- 주소 검색
+ 주소 검색
- class="frm_input frm_address " size="70">
-
- class="frm_input frm_address " size="70">
+ class="frm_input frm_address " size="40">
+
+
+
+
diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css
index eaedad9d1..844e8d7fa 100644
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@@ -47,7 +47,6 @@
.mbskin table {}
.mbskin caption {}
.mbskin .frm_info {}
-.mbskin .frm_address {}
.mbskin .frm_file {}
.mbskin .tbl_frm01 {}
@@ -92,12 +91,14 @@
#fregister .btn_confirm {margin-bottom:20px}
/* 회원가입 입력 */
-#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
-
#fregisterform textarea {height:50px}
#fregisterform #msg_certify {margin:5px 0 0;padding:5px;border:1px solid #dbecff;background:#eaf4ff;text-align:center}
+#fregisterform .frm_address {margin:5px 0 0}
+#fregisterform #mb_addr3 {display:inline-block;margin:5px 0 0;vertical-align:middle}
+#fregisterform #mb_addr_jibeon {display:block;margin:5px 0 0}
+
/* 회원가입 완료 */
#reg_result {padding:50px 0 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php
index 7c432413f..2d9f5a30e 100644
--- a/skin/member/basic/zip.skin.php
+++ b/skin/member/basic/zip.skin.php
@@ -55,16 +55,18 @@ $(function() {
});
});
-function put_data(zip1, zip2, addr1, addr2, jibeon)
+function put_data(zip1, zip2, addr1, addr3, jibeon)
{
var of = window.opener.document.;
of..value = zip1;
of..value = zip2;
of..value = addr1;
- of..value = addr2;
+ of..value = "";
+ of..value = addr3;
- window.opener.document.getElementById("").innerText = "지번주소 : "+jibeon;
+ window.opener.$("#").text(addr3);
+ window.opener.$("#").text("지번주소 : "+jibeon);
if(of. !== undefined)
of..value = jibeon;