diff --git a/.gitignore b/.gitignore index 78e439322..309e1c111 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ log/ g5_tree/ naver*.html initests01/ +SIRsoft000/ diff --git a/adm/member_form.php b/adm/member_form.php index e47771fcd..ddcdfbe47 100644 --- a/adm/member_form.php +++ b/adm/member_form.php @@ -214,11 +214,9 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js - - - - - -
+ + +

diff --git a/adm/member_form_update.php b/adm/member_form_update.php index 333b18728..310e5e8d1 100644 --- a/adm/member_form_update.php +++ b/adm/member_form_update.php @@ -29,6 +29,9 @@ if($_POST['mb_certify_case'] && $_POST['mb_certify']) { $mb_adult = 0; } +$mb_zip1 = substr($_POST['mb_zip'], 0, 3); +$mb_zip2 = substr($_POST['mb_zip'], 3); + $sql_common = " mb_name = '{$_POST['mb_name']}', mb_nick = '{$_POST['mb_nick']}', mb_email = '{$_POST['mb_email']}', @@ -37,8 +40,8 @@ $sql_common = " mb_name = '{$_POST['mb_name']}', mb_hp = '{$mb_hp}', mb_certify = '{$mb_certify}', mb_adult = '{$mb_adult}', - mb_zip1 = '{$_POST['mb_zip1']}', - mb_zip2 = '{$_POST['mb_zip2']}', + mb_zip1 = '$mb_zip1', + mb_zip2 = '$mb_zip2', mb_addr1 = '{$_POST['mb_addr1']}', mb_addr2 = '{$_POST['mb_addr2']}', mb_addr3 = '{$_POST['mb_addr3']}', diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index 77f72efd9..c1a3bc4e0 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -146,7 +146,6 @@ $sql = " update {$g5['g5_shop_default_table']} de_hope_date_after = '{$_POST['de_hope_date_after']}', de_baesong_content = '{$_POST['de_baesong_content']}', de_change_content = '{$_POST['de_change_content']}', - de_level_sell = '{$_POST['de_level_sell']}', de_point_days = '{$_POST['de_point_days']}', de_simg_width = '{$_POST['de_simg_width']}', de_simg_height = '{$_POST['de_simg_height']}', diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 99aed396b..429e6544f 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -817,12 +817,9 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js 주문하시는 분 주소 - - - - - - -
+ + +

@@ -872,12 +869,9 @@ add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js 받으시는 분 주소 - - - - - - -
+ + +
diff --git a/adm/shop_admin/orderformupdate.php b/adm/shop_admin/orderformupdate.php index fc425c3c1..1ff37a11c 100644 --- a/adm/shop_admin/orderformupdate.php +++ b/adm/shop_admin/orderformupdate.php @@ -3,6 +3,11 @@ $sub_menu = '400400'; include_once('./_common.php'); if($_POST['mod_type'] == 'info') { + $od_zip1 = substr($_POST['od_zip'], 0, 3); + $od_zip2 = substr($_POST['od_zip'], 3); + $od_b_zip1 = substr($_POST['od_b_zip'], 0, 3); + $od_b_zip2 = substr($_POST['od_b_zip'], 3); + $sql = " update {$g5['g5_shop_order_table']} set od_name = '$od_name', od_tel = '$od_tel', diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php index 2120f3bfd..461e9f111 100644 --- a/adm/shop_admin/orderprintresult.php +++ b/adm/shop_admin/orderprintresult.php @@ -104,7 +104,7 @@ if ($csv == 'csv') $ct_send_cost = iconv_euckr($ct_send_cost); } - echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.','; + echo '"'.$row['od_b_zip1'].$row['od_b_zip2'].'"'.','; echo '"'.print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon']).'"'.','; echo '"'.$row['od_b_name'].'"'.','; //echo '"'.multibyte_digit((string)$row[od_b_tel]).'"'.','; @@ -209,7 +209,7 @@ if ($csv == 'xls') $row = array_map('iconv_euckr', $row); - $worksheet->write($i, 0, $row['od_b_zip1'].'-'.$row['od_b_zip2']); + $worksheet->write($i, 0, $row['od_b_zip1'].$row['od_b_zip2']); $worksheet->write($i, 1, print_address($row['od_b_addr1'], $row['od_b_addr2'], $row['od_b_addr3'], $row['od_b_addr_jibeon'])); $worksheet->write($i, 2, $row['od_b_name']); $worksheet->write($i, 3, ' '.$row['od_b_tel']); @@ -291,8 +291,8 @@ if (mysql_num_rows($result) == 0) $row1 = sql_fetch($sql1); // 1.03.02 - $row1['od_addr'] = '('.$row1['od_zip1'].'-'.$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row1['od_addr3'], $row1['od_addr_jibeon']); - $row1['od_b_addr'] = '('.$row1['od_b_zip1'].'-'.$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row1['od_b_addr3'], $row1['od_b_addr_jibeon']); + $row1['od_addr'] = '('.$row1['od_zip1'].$row1['od_zip2'].') '.print_address($row1['od_addr1'], $row1['od_addr2'], $row1['od_addr3'], $row1['od_addr_jibeon']); + $row1['od_b_addr'] = '('.$row1['od_b_zip1'].$row1['od_b_zip2'].') '.print_address($row1['od_b_addr1'], $row1['od_b_addr2'], $row1['od_b_addr3'], $row1['od_b_addr_jibeon']); $row1['od_addr'] = ($row1['od_addr']) ? $row1['od_addr'] : '입력안함'; $row1['od_tel'] = ($row1['od_tel']) ? $row1['od_tel'] : '입력안함'; diff --git a/adm/sms_admin/history_send.php b/adm/sms_admin/history_send.php index a28d981fe..214815a6a 100644 --- a/adm/sms_admin/history_send.php +++ b/adm/sms_admin/history_send.php @@ -116,7 +116,7 @@ if ($result) $row['bk_hp'] = get_hp($row['bk_hp'], 1); $log = array_shift($SMS->Log); - $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log); + $log = @iconv('euc-kr', 'utf-8', $log); sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum='$new_wr_renum', bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='{$row['hs_name']}', hs_hp='{$row['hs_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false); } diff --git a/adm/sms_admin/sms_write_send.php b/adm/sms_admin/sms_write_send.php index 45646ffec..5bbc285bb 100644 --- a/adm/sms_admin/sms_write_send.php +++ b/adm/sms_admin/sms_write_send.php @@ -202,7 +202,7 @@ if ($result) $row['bk_hp'] = get_hp($row['bk_hp'], 1); $log = array_shift($SMS->Log); - $log = @iconv('UTF-8', 'UTF-8//IGNORE', $log); + $log = @iconv('euc-kr', 'utf-8', $log); sql_query("insert into {$g5['sms5_history_table']} set wr_no='$wr_no', wr_renum=0, bg_no='{$row['bg_no']}', mb_id='{$row['mb_id']}', bk_no='{$row['bk_no']}', hs_name='".addslashes($row['bk_name'])."', hs_hp='{$row['bk_hp']}', hs_datetime='".G5_TIME_YMDHIS."', hs_flag='$hs_flag', hs_code='$hs_code', hs_memo='".addslashes($hs_memo)."', hs_log='".addslashes($log)."'", false); } diff --git a/bbs/alert.php b/bbs/alert.php index d64b6f2fd..6b1ab26a7 100644 --- a/bbs/alert.php +++ b/bbs/alert.php @@ -30,7 +30,8 @@ include_once(G5_PATH.'/head.sub.php'); $msg2 = str_replace("\\n", "
", $msg); -if (!$url) $url = $_SERVER['HTTP_REFERER']; +$url = clean_xss_tags($url); +if (!$url) $url = clean_xss_tags($_SERVER['HTTP_REFERER']); // url 체크 check_url_host($url); diff --git a/bbs/confirm.php b/bbs/confirm.php index 76e9c7652..fcf94e0e9 100644 --- a/bbs/confirm.php +++ b/bbs/confirm.php @@ -2,6 +2,10 @@ include_once('./_common.php'); include_once(G5_PATH.'/head.sub.php'); +$url1 = clean_xss_tags($url1); +$url2 = clean_xss_tags($url2); +$url3 = clean_xss_tags($url3); + // url 체크 check_url_host($url1); check_url_host($url2); diff --git a/bbs/move.php b/bbs/move.php index e3a7d86f2..a4631addf 100644 --- a/bbs/move.php +++ b/bbs/move.php @@ -55,7 +55,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) - +
diff --git a/bbs/new.php b/bbs/new.php index bbf9ccf96..9e008e861 100644 --- a/bbs/new.php +++ b/bbs/new.php @@ -17,6 +17,8 @@ if ($view == "w") $sql_common .= " and a.wr_id = a.wr_parent "; else if ($view == "c") $sql_common .= " and a.wr_id <> a.wr_parent "; +else + $view = ''; $mb_id = isset($_GET['mb_id']) ? ($_GET['mb_id']) : ''; $mb_id = substr(preg_replace('#[^a-z0-9_]#i', '', $mb_id), 0, 20); diff --git a/bbs/newwin.inc.php b/bbs/newwin.inc.php index 0e587ce53..2882aa9c3 100644 --- a/bbs/newwin.inc.php +++ b/bbs/newwin.inc.php @@ -19,14 +19,11 @@ $result = sql_query($sql, false);

팝업레이어 알림

diff --git a/bbs/password.php b/bbs/password.php index b29681143..ffd2a55b4 100644 --- a/bbs/password.php +++ b/bbs/password.php @@ -51,7 +51,7 @@ $sql = " select wr_subject from {$write_table} and wr_is_comment = 0 "; $row = sql_fetch($sql); -$g5['title'] = $row['wr_subject']; +$g5['title'] = get_text($row['wr_subject']); include_once($member_skin_path.'/password.skin.php'); diff --git a/bbs/register_email.php b/bbs/register_email.php index 4345d4eea..e7fc92537 100644 --- a/bbs/register_email.php +++ b/bbs/register_email.php @@ -2,27 +2,28 @@ include_once('./_common.php'); include_once(G5_CAPTCHA_PATH.'/captcha.lib.php'); +$g5['title'] = '메일인증 메일주소 변경'; +include_once('./_head.php'); + +$mb_id = substr(clean_xss_tags($_GET['mb_id']), 0, 20); $sql = " select mb_email, mb_datetime, mb_email_certify from {$g5['member_table']} where mb_id = '{$mb_id}' "; $mb = sql_fetch($sql); if (substr($mb['mb_email_certify'],0,1)!=0) { alert("이미 메일인증 하신 회원입니다.", G5_URL); } - -$g5['title'] = '메일인증 메일주소 변경'; -include_once('./_head.php'); ?> -

메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.

+

메일인증을 받지 못한 경우 회원정보의 메일주소를 변경 할 수 있습니다.

-
+
- + diff --git a/bbs/register_email_update.php b/bbs/register_email_update.php index 3ae7b006f..36fe66f8f 100644 --- a/bbs/register_email_update.php +++ b/bbs/register_email_update.php @@ -8,7 +8,7 @@ $mb_email = trim($_POST['mb_email']); $sql = " select mb_name, mb_datetime from {$g5['member_table']} where mb_id = '{$mb_id}' and mb_email_certify <> '' "; $mb = sql_fetch($sql); -if (!$mb) { +if ($mb) { alert("이미 메일인증 하신 회원입니다.", G5_URL); } diff --git a/bbs/register_form.php b/bbs/register_form.php index cb6fd2517..4729c7692 100644 --- a/bbs/register_form.php +++ b/bbs/register_form.php @@ -115,6 +115,9 @@ $req_nick = !isset($member['mb_nick_date']) || (isset($member['mb_nick_date']) & $required = ($w=='') ? 'required' : ''; $readonly = ($w=='u') ? 'readonly' : ''; +$agree = preg_replace('#[^0-9]#', '', $agree); +$agree2 = preg_replace('#[^0-9]#', '', $agree2); + // add_javascript('js 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨 if ($config['cf_use_addr']) add_javascript(G5_POSTCODE_JS, 0); //다음 주소 js diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 61227357b..f15e319c8 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -40,8 +40,8 @@ $mb_birth = isset($_POST['mb_birth']) ? trim($_POST['mb_birth']) $mb_homepage = isset($_POST['mb_homepage']) ? trim($_POST['mb_homepage']) : ""; $mb_tel = isset($_POST['mb_tel']) ? trim($_POST['mb_tel']) : ""; $mb_hp = isset($_POST['mb_hp']) ? trim($_POST['mb_hp']) : ""; -$mb_zip1 = isset($_POST['mb_zip1']) ? trim($_POST['mb_zip1']) : ""; -$mb_zip2 = isset($_POST['mb_zip2']) ? trim($_POST['mb_zip2']) : ""; +$mb_zip1 = isset($_POST['mb_zip']) ? substr(trim($_POST['mb_zip']), 0, 3) : ""; +$mb_zip2 = isset($_POST['mb_zip']) ? substr(trim($_POST['mb_zip']), 3) : ""; $mb_addr1 = isset($_POST['mb_addr1']) ? trim($_POST['mb_addr1']) : ""; $mb_addr2 = isset($_POST['mb_addr2']) ? trim($_POST['mb_addr2']) : ""; $mb_addr3 = isset($_POST['mb_addr3']) ? trim($_POST['mb_addr3']) : ""; @@ -73,7 +73,7 @@ if ($w == '' || $w == 'u') { if($w == '' && $mb_password != $mb_password_re) alert('비밀번호가 일치하지 않습니다.'); - if ($msg = empty_mb_name($mb_id)) alert($msg, "", true, true); + if ($msg = empty_mb_name($mb_name)) alert($msg, "", true, true); if ($msg = empty_mb_nick($mb_nick)) alert($msg, "", true, true); if ($msg = empty_mb_email($mb_email)) alert($msg, "", true, true); if ($msg = reserve_mb_id($mb_id)) alert($msg, "", true, true); diff --git a/bbs/search.php b/bbs/search.php index 4f4df3f19..0f3fe803b 100644 --- a/bbs/search.php +++ b/bbs/search.php @@ -17,7 +17,7 @@ if ($stx) { $stx = preg_replace('/\//', '\/', trim($stx)); $sop = strtolower($sop); if (!$sop || !($sop == 'and' || $sop == 'or')) $sop = 'and'; // 연산자 and , or - $srows = isset($_GET['srows']) ? preg_replace('#[^0-9]#', '', $_GET['srows']) : 10; + $srows = isset($_GET['srows']) ? (int)preg_replace('#[^0-9]#', '', $_GET['srows']) : 10; if (!$srows) $srows = 10; // 한페이지에 출력하는 검색 행수 $g5_search['tables'] = Array(); diff --git a/config.php b/config.php index bc81c19fe..8cf1f2f23 100644 --- a/config.php +++ b/config.php @@ -7,8 +7,8 @@ define('G5_VERSION', '그누보드5'); -define('G5_GNUBOARD_VER', '5.0.39'); -define('G5_YOUNGCART_VER', '5.0.40'); +define('G5_GNUBOARD_VER', '5.0.42'); +define('G5_YOUNGCART_VER', '5.0.43'); // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음 define('_GNUBOARD_', true); diff --git a/css/default.css b/css/default.css index 881d14f6b..240c04076 100644 --- a/css/default.css +++ b/css/default.css @@ -279,4 +279,8 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal} /* Mobile화면으로 */ -#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center} \ No newline at end of file +#device_change {display:block;margin:0.3em;padding:0.5em 0;border:1px solid #eee;border-radius:2em;background:#fff;color:#000;font-size:2em;text-decoration:none;text-align:center} + +/*메일인증*/ +.rg_em{margin-top:5px} +.rg_em caption{padding:0;font-size:0;line-height:0;overflow:hidden} diff --git a/css/mobile.css b/css/mobile.css index 412491a4e..6316c221e 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -247,4 +247,10 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .pg_current {display:inline-block;margin:0 4px 0 0;background:#333;color:#fff;font-weight:normal} /* PC화면으로 */ -#device_change {display:block;margin:5px;padding:5px 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center} +#device_change {display:block;margin:5px;padding:5px 0;border:1px solid #eee;border-radius:2em;color:#000;font-size:1em;text-decoration:none;text-align:center} + +/*메일인증*/ +.rg_em_p{padding:0 5px} +.rg_em{margin:5px 5px 10px;} +.rg_em table{width:100%;border-collapse:collapse} +.rg_em caption{padding:0;font-size:0;line-height:0;overflow:hidden} \ No newline at end of file diff --git a/js/common.js b/js/common.js index 8802f1c09..b964cd782 100644 --- a/js/common.js +++ b/js/common.js @@ -376,7 +376,7 @@ var win_homepage = function(href) { /** * 우편번호 창 **/ -var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_addr3, frm_jibeon) { +var win_zip = function(frm_name, frm_zip, frm_addr1, frm_addr2, frm_addr3, frm_jibeon) { if(typeof daum === 'undefined'){ alert("다음 우편번호 postcode.v2.js 파일이 로드되지 않았습니다."); return false; @@ -386,7 +386,7 @@ var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_a var complete_fn = function(data){ // 팝업에서 검색결과 항목을 클릭했을때 실행할 코드를 작성하는 부분. - + // 각 주소의 노출 규칙에 따라 주소를 조합한다. // 내려오는 변수가 값이 없는 경우엔 공백('')값을 가지므로, 이를 참고하여 분기 한다. var fullAddr = ''; // 최종 주소 변수 @@ -417,8 +417,7 @@ var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_a // 우편번호와 주소 정보를 해당 필드에 넣고, 커서를 상세주소 필드로 이동한다. var of = document[frm_name]; - of[frm_zip1].value = data.postcode1; - of[frm_zip2].value = data.postcode2; + of[frm_zip].value = data.zonecode; of[frm_addr1].value = fullAddr; of[frm_addr3].value = extraAddr; @@ -432,7 +431,7 @@ var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_a switch(zip_case) { case 1 : //iframe을 이용하여 페이지에 끼워 넣기 - var daum_pape_id = 'daum_juso_page'+frm_zip1, + var daum_pape_id = 'daum_juso_page'+frm_zip, element_wrap = document.getElementById(daum_pape_id), currentScroll = Math.max(document.body.scrollTop, document.documentElement.scrollTop); if (element_wrap == null) { @@ -475,7 +474,7 @@ var win_zip = function(frm_name, frm_zip1, frm_zip2, frm_addr1, frm_addr2, frm_a }).open(); break; default : //iframe을 이용하여 레이어 띄우기 - var rayer_id = 'daum_juso_rayer'+frm_zip1, + var rayer_id = 'daum_juso_rayer'+frm_zip, element_layer = document.getElementById(rayer_id); if (element_layer == null) { element_layer = document.createElement("div"); diff --git a/js/shop.mobile.main.js b/js/shop.mobile.main.js index a99ea5031..b02e93d25 100644 --- a/js/shop.mobile.main.js +++ b/js/shop.mobile.main.js @@ -121,7 +121,7 @@ var count = $slides.size(); var width, outerW; - if(count < 2) + if(count < 1) return; function button_change(idx) diff --git a/lib/common.lib.php b/lib/common.lib.php index 7cdc904d7..7ca2426b6 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -192,7 +192,7 @@ function confirm($msg, $url1='', $url2='', $url3='') alert($msg); } - if (!$url3) $url3 = $_SERVER['HTTP_REFERER']; + if (!$url3) $url3 = clean_xss_tags($_SERVER['HTTP_REFERER']); $msg = str_replace("\\n", "
", $msg); @@ -1309,7 +1309,7 @@ function view_file_link($file, $width, $height, $content='') if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) { $img = ''; - $img .= ''.$content.''; + $img .= ''.$content.''; $img .= ''; return $img; @@ -2367,12 +2367,8 @@ function hyphen_hp_number($hp) function login_url($url='') { if (!$url) $url = G5_URL; - /* - $p = parse_url($url); - echo urlencode($_SERVER['REQUEST_URI']); - return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI']))); - */ - return $url; + + return urlencode(clean_xss_tags(urldecode($url))); } @@ -2742,6 +2738,11 @@ function clean_xss_tags($str) { $str = preg_replace('#]*+>#i', '', $str); + $search = array('"', "'"); + $replace = array('"', '''); + + $str = str_replace($search, $replace, $str); + return $str; } diff --git a/mobile/newwin.inc.php b/mobile/newwin.inc.php index 978f8fcb7..812ebff28 100644 --- a/mobile/newwin.inc.php +++ b/mobile/newwin.inc.php @@ -19,14 +19,11 @@ $result = sql_query($sql, false);

팝업레이어 알림

diff --git a/mobile/shop/inicis/orderform.1.php b/mobile/shop/inicis/orderform.1.php index bfdaab703..8573e7300 100644 --- a/mobile/shop/inicis/orderform.1.php +++ b/mobile/shop/inicis/orderform.1.php @@ -16,6 +16,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 + diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php index 28703de79..e807ae404 100644 --- a/mobile/shop/kcp/order_approval_form.php +++ b/mobile/shop/kcp/order_approval_form.php @@ -353,11 +353,11 @@ if($default['de_tax_flag_use']) {
-
사이트 이용정보 입력
자동등록방지
- +
+
- +
diff --git a/mobile/shop/orderaddress.php b/mobile/shop/orderaddress.php index c782a60de..c4297c767 100644 --- a/mobile/shop/orderaddress.php +++ b/mobile/shop/orderaddress.php @@ -65,8 +65,7 @@ $(function() { f.od_b_name.value = addr[0]; f.od_b_tel.value = addr[1]; f.od_b_hp.value = addr[2]; - f.od_b_zip1.value = addr[3]; - f.od_b_zip2.value = addr[4]; + f.od_b_zip.value = addr[3] + addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; f.od_b_addr3.value = addr[7]; diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 2f00d6aeb..9bd0c86f4 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -215,7 +215,7 @@ ob_start(); 주문금액 적립포인트
- + 주소 - - - - - - -
+ + +
@@ -439,12 +436,9 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php'); 주소 - - - - - - -
+ + +
@@ -902,12 +896,11 @@ $(function() { }); $("#od_b_addr2").focus(function() { - var zip1 = $("#od_b_zip1").val().replace(/[^0-9]/g, ""); - var zip2 = $("#od_b_zip2").val().replace(/[^0-9]/g, ""); - if(zip1 == "" || zip2 == "") + var zip = $("#od_b_zip").val().replace(/[^0-9]/g, ""); + if(zip == "") return false; - var code = String(zip1) + String(zip2); + var code = String(zip); if(zipcode == code) return false; @@ -949,8 +942,7 @@ $(function() { f.od_b_name.value = addr[0]; f.od_b_tel.value = addr[1]; f.od_b_hp.value = addr[2]; - f.od_b_zip1.value = addr[3]; - f.od_b_zip2.value = addr[4]; + f.od_b_zip.value = addr[3] + addr[4]; f.od_b_addr1.value = addr[5]; f.od_b_addr2.value = addr[6]; f.od_b_addr3.value = addr[7]; @@ -1172,7 +1164,7 @@ function pay_approval() f.rcvr_tel1.value = pf.od_b_tel.value; f.rcvr_tel2.value = pf.od_b_hp.value; f.rcvr_mail.value = pf.od_email.value; - f.rcvr_zipx.value = pf.od_b_zip1.value + pf.od_b_zip2.value; + f.rcvr_zipx.value = pf.od_b_zip.value; f.rcvr_add1.value = pf.od_b_addr1.value; f.rcvr_add2.value = pf.od_b_addr2.value; f.settle_method.value = settle_method; @@ -1301,8 +1293,7 @@ function orderfield_check(f) check_field(f.od_tel, "주문하시는 분 전화번호를 입력하십시오."); check_field(f.od_addr1, "주소검색을 이용하여 주문하시는 분 주소를 입력하십시오."); //check_field(f.od_addr2, " 주문하시는 분의 상세주소를 입력하십시오."); - check_field(f.od_zip1, ""); - check_field(f.od_zip2, ""); + check_field(f.od_zip, ""); clear_field(f.od_email); if(f.od_email.value=='' || f.od_email.value.search(/(\S+)@(\S+)\.(\S+)/) == -1) @@ -1319,8 +1310,7 @@ function orderfield_check(f) check_field(f.od_b_tel, "받으시는 분 전화번호를 입력하십시오."); check_field(f.od_b_addr1, "주소검색을 이용하여 받으시는 분 주소를 입력하십시오."); //check_field(f.od_b_addr2, "받으시는 분의 상세주소를 입력하십시오."); - check_field(f.od_b_zip1, ""); - check_field(f.od_b_zip2, ""); + check_field(f.od_b_zip, ""); var od_settle_bank = document.getElementById("od_settle_bank"); if (od_settle_bank) { @@ -1454,20 +1444,18 @@ function gumae2baesong(checked) { f.od_b_name.value = f.od_name.value; f.od_b_tel.value = f.od_tel.value; f.od_b_hp.value = f.od_hp.value; - f.od_b_zip1.value = f.od_zip1.value; - f.od_b_zip2.value = f.od_zip2.value; + f.od_b_zip.value = f.od_zip.value; f.od_b_addr1.value = f.od_addr1.value; f.od_b_addr2.value = f.od_addr2.value; f.od_b_addr3.value = f.od_addr3.value; f.od_b_addr_jibeon.value = f.od_addr_jibeon.value; - calculate_sendcost(String(f.od_b_zip1.value) + String(f.od_b_zip2.value)); + calculate_sendcost(String(f.od_b_zip.value)); } else { f.od_b_name.value = ""; f.od_b_tel.value = ""; f.od_b_hp.value = ""; - f.od_b_zip1.value = ""; - f.od_b_zip2.value = ""; + f.od_b_zip.value = ""; f.od_b_addr1.value = ""; f.od_b_addr2.value = ""; f.od_b_addr3.value = ""; diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index b85e01a98..ddb95c9fc 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -235,8 +235,9 @@ if ((int)($send_cost - $tot_sc_cp_price) !== (int)($i_send_cost - $i_send_coupon } // 추가배송비가 상이함 -$od_b_zip1 = preg_replace('/[^0-9]/', '', $od_b_zip1); -$od_b_zip2 = preg_replace('/[^0-9]/', '', $od_b_zip2); +$od_b_zip = preg_replace('/[^0-9]/', '', $od_b_zip); +$od_b_zip1 = substr($od_b_zip, 0, 3); +$od_b_zip2 = substr($od_b_zip, 3); $zipcode = $od_b_zip1 . $od_b_zip2; $sql = " select sc_id, sc_price from {$g5['g5_shop_sendcost_table']} where sc_zip1 <= '$zipcode' and sc_zip2 >= '$zipcode' "; $tmp = sql_fetch($sql); @@ -443,8 +444,9 @@ $od_email = get_email_address($od_email); $od_name = clean_xss_tags($od_name); $od_tel = clean_xss_tags($od_tel); $od_hp = clean_xss_tags($od_hp); -$od_zip1 = preg_replace('/[^0-9]/', '', $od_zip1); -$od_zip2 = preg_replace('/[^0-9]/', '', $od_zip2); +$od_zip = preg_replace('/[^0-9]/', '', $od_zip); +$od_zip1 = substr($od_zip, 0, 3); +$od_zip2 = substr($od_zip, 3); $od_addr1 = clean_xss_tags($od_addr1); $od_addr2 = clean_xss_tags($od_addr2); $od_addr3 = clean_xss_tags($od_addr3); diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php index 1f4ec709d..40d24ebfa 100644 --- a/mobile/shop/orderinquiryview.php +++ b/mobile/shop/orderinquiryview.php @@ -467,7 +467,7 @@ if($od['od_pg'] == 'lg') { 주 소 - + E-mail @@ -503,7 +503,7 @@ if($od['od_pg'] == 'lg') { 주 소 - + ', 0 + if ($view['link']) { + ?>