diff --git a/adm/member_form.php b/adm/member_form.php index 4a15ac63e..ddfd8acb7 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -117,6 +117,11 @@ if(!isset($mb['mb_addr_jibeon'])) { sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_addr_jibeon` varchar(255) NOT NULL DEFAULT '' AFTER `mb_addr2` ", false); } +// 건물명필드추가 +if(!isset($mb['mb_addr3'])) { + sql_query(" ALTER TABLE {$g5['member_table']} ADD `mb_addr3` varchar(255) NOT NULL DEFAULT '' AFTER `mb_addr2` ", false); +} + if ($mb['mb_intercept_date']) $g5['title'] = "차단된 "; else $g5['title'] .= ""; $g5['title'] .= '회원 '.$html_title; @@ -206,9 +211,12 @@ include_once('./admin.head.php'); - 주소 검색
-
- - + +
+ +
+ +
지번주소 : diff --git a/adm/member_form_update.php b/adm/member_form_update.php index 7e4c4669c..5dd520475 100644 --- a/adm/member_form_update.php +++ b/adm/member_form_update.php @@ -29,8 +29,6 @@ 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']}', @@ -42,7 +40,8 @@ $sql_common = " mb_name = '{$_POST['mb_name']}', mb_zip1 = '{$_POST['mb_zip1']}', mb_zip2 = '{$_POST['mb_zip2']}', mb_addr1 = '{$_POST['mb_addr1']}', - mb_addr2 = '{$mb_addr2}', + mb_addr2 = '{$_POST['mb_addr2']}', + mb_addr3 = '{$_POST['mb_addr3']}', mb_addr_jibeon = '{$_POST['mb_addr_jibeon']}', mb_birth = '{$_POST['mb_birth']}', mb_sex = '{$_POST['mb_sex']}', diff --git a/adm/member_list.php b/adm/member_list.php index cab4c5ed8..d6a67511f 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -185,7 +185,7 @@ $colspan = 15; if ($intercept_title == '') $intercept_title = '차단하기'; - $address = $row['mb_zip1'] ? print_address($row['mb_addr1'], $row['mb_addr2']) : ''; + $address = $row['mb_zip1'] ? print_address($row['mb_addr1'], $row['mb_addr2'], $row['mb_addr3']) : ''; $bg = 'bg'.($i%2); diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index c75d3c678..956204a3c 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -53,9 +53,6 @@ $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') { if ($msg = empty_mb_id($mb_id)) alert($msg, "", true, true); // alert($msg, $url, $error, $post); @@ -202,6 +199,7 @@ if ($w == '') { mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', mb_addr2 = '{$mb_addr2}', + mb_addr3 = '{$mb_addr3}', mb_addr_jibeon = '{$mb_addr_jibeon}', mb_signature = '{$mb_signature}', mb_profile = '{$mb_profile}', @@ -313,6 +311,7 @@ if ($w == '') { mb_zip2 = '{$mb_zip2}', mb_addr1 = '{$mb_addr1}', mb_addr2 = '{$mb_addr2}', + mb_addr3 = '{$mb_addr3}', mb_addr_jibeon = '{$mb_addr_jibeon}', mb_signature = '{$mb_signature}', mb_profile = '{$mb_profile}', diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql index 7b7307b72..93739d0f8 100644 --- a/install/gnuboard5.sql +++ b/install/gnuboard5.sql @@ -456,6 +456,7 @@ CREATE TABLE IF NOT EXISTS `g5_member` ( `mb_zip2` char(3) NOT NULL default '', `mb_addr1` varchar(255) NOT NULL default '', `mb_addr2` varchar(255) NOT NULL default '', + `mb_addr3` varchar(255) NOT NULL default '', `mb_addr_jibeon` varchar(255) NOT NULL default '', `mb_signature` text NOT NULL, `mb_recommend` varchar(255) NOT NULL default '', diff --git a/lib/common.lib.php b/lib/common.lib.php index de6ce4fde..bfdb067eb 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2522,17 +2522,17 @@ function get_address2($addr2, $addr3) // 도로명주소 출력 // 주소출력 -function print_address($addr1, $addr2) +function print_address($addr1, $addr2, $addr3) { $address = trim($addr1); $addr2 = trim($addr2); + $addr3 = trim($addr3); - if($addr2) { - if(preg_match('/^\(/', $addr2)) - $address .= ' '.$addr2; - else - $address .= ', '.$addr2; - } + if($addr2) + $address .= ', '.$addr2; + + if($addr3) + $address .= ' '.$addr3; return $address; } diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index 85c48068a..a292759a5 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -147,10 +147,10 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 주소 검색
class="frm_input frm_address " size="50">
- - + +
diff --git a/mobile/skin/member/basic/zip.skin.php b/mobile/skin/member/basic/zip.skin.php index cf1b8d4ff..6632def28 100644 --- a/mobile/skin/member/basic/zip.skin.php +++ b/mobile/skin/member/basic/zip.skin.php @@ -65,7 +65,6 @@ function put_data(zip1, zip2, addr1, addr3, jibeon) of..value = ""; of..value = addr3; - window.opener.$("#").text(addr3); window.opener.$("#").text("지번주소 : "+jibeon); if(of. !== undefined) diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index a6c17ac19..1b01d690d 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -150,12 +150,12 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 class="frm_input " size="3" maxlength="3"> 주소 검색
- - class="frm_input frm_address " size="40"> - -
- - + class="frm_input frm_address " size="50"> + + + + + diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php index 2d9f5a30e..398b66efc 100644 --- a/skin/member/basic/zip.skin.php +++ b/skin/member/basic/zip.skin.php @@ -65,7 +65,6 @@ function put_data(zip1, zip2, addr1, addr3, jibeon) of..value = ""; of..value = addr3; - window.opener.$("#").text(addr3); window.opener.$("#").text("지번주소 : "+jibeon); if(of. !== undefined)