From 5a37e8243dc21ffd6f5bf3e979976d4d746c4989 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 20 Aug 2014 16:55:18 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=8C=EC=A3=BC=EC=86=8CAPI=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B0=8F=20=EA=B8=B0=ED=83=80=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/zip.php                           |  2 ++
 js/zip.js                             | 19 ++++++++++
 lib/common.lib.php                    |  6 ++--
 mobile/skin/member/basic/zip.skin.php | 51 ++++++++-------------------
 mobile/tail.php                       |  3 +-
 skin/member/basic/zip.skin.php        | 46 ++++++++----------------
 tail.php                              |  3 +-
 7 files changed, 57 insertions(+), 73 deletions(-)
 create mode 100644 js/zip.js

diff --git a/bbs/zip.php b/bbs/zip.php
index abb4ebe66..0e8fb9079 100644
--- a/bbs/zip.php
+++ b/bbs/zip.php
@@ -12,5 +12,7 @@ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') {   //https 통신
 
 include_once($member_skin_path.'/zip.skin.php');
 
+echo '<script src="'.G5_JS_URL.'/zip.js"></script>';
+
 include_once(G5_PATH.'/tail.sub.php');
 ?>
diff --git a/js/zip.js b/js/zip.js
new file mode 100644
index 000000000..2e6b50946
--- /dev/null
+++ b/js/zip.js
@@ -0,0 +1,19 @@
+$(function() {
+    var is_chrome = navigator.userAgent.toLowerCase().indexOf("chrome") > -1;
+    if(!(g5_is_mobile && is_chrome)) {  //모바일 크롬에서 먹통되는 현상이 있음
+        $("html, body").addClass("daum_juso_body");
+    }
+    var el_id = document.getElementById("daum_juso_wrap");
+    new daum.Postcode({
+        oncomplete: function(data) {
+            var address1 = data.address1,
+                address2 = "";
+            if(data.addressType == "R"){        //도로명이면
+                address2 = data.address2;
+            }
+            put_data2(data.postcode1, data.postcode2, address1, "", address2, data.addressType);
+        },
+        width : "100%",
+        height : "100%"
+    }).embed(el_id);
+});
\ No newline at end of file
diff --git a/lib/common.lib.php b/lib/common.lib.php
index c0dfc9ae0..c8e839ed3 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2592,11 +2592,11 @@ function print_address($addr1, $addr2, $addr3, $addr4)
     } else {
         if($addr2)
             $address .= ', '.$addr2;
-
-        if($addr3)
-            $address .= ' '.$addr3;
     }
 
+    if($addr3)
+        $address .= ' '.$addr3;
+
     return $address;
 }
 
diff --git a/mobile/skin/member/basic/zip.skin.php b/mobile/skin/member/basic/zip.skin.php
index af53d64af..c187b5f92 100644
--- a/mobile/skin/member/basic/zip.skin.php
+++ b/mobile/skin/member/basic/zip.skin.php
@@ -8,44 +8,23 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 <div id="daum_juso_wrap" class="daum_juso_wrap"></div>
 
 <script>
-jQuery(function($){
-    var is_chrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
-    if(!is_chrome) {  //모바일 크롬에서 먹통되는 현상이 있음
-        $("html, body").addClass("daum_juso_body");
-    }
+function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
+{
+    var of = window.opener.document.<?php echo $frm_name; ?>;
 
-    function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
-    {
-        var of = window.opener.document.<?php echo $frm_name; ?>;
+    of.<?php echo $frm_zip1; ?>.value = zip1;
+    of.<?php echo $frm_zip2; ?>.value = zip2;
+    of.<?php echo $frm_addr1; ?>.value = addr1;
+    of.<?php echo $frm_addr2; ?>.value = addr2;
+    of.<?php echo $frm_addr3; ?>.value = addr3;
 
-        of.<?php echo $frm_zip1; ?>.value = zip1;
-        of.<?php echo $frm_zip2; ?>.value = zip2;
-        of.<?php echo $frm_addr1; ?>.value = addr1;
-        of.<?php echo $frm_addr2; ?>.value = addr2;
-        of.<?php echo $frm_addr3; ?>.value = addr3;
-
-        if( jibeon ){
-            if(of.<?php echo $frm_jibeon; ?> !== undefined){
-                of.<?php echo $frm_jibeon; ?>.value = jibeon;
-            }
+    if( jibeon ){
+        if(of.<?php echo $frm_jibeon; ?> !== undefined){
+            of.<?php echo $frm_jibeon; ?>.value = jibeon;
         }
-        of.<?php echo $frm_addr3; ?>.focus();   //안드로이드 4.3 기본브라우져에서 가끔 안나오는 현상이 있어서 일부러 적용
-        of.<?php echo $frm_addr2; ?>.focus();
-        window.close();
     }
-
-    var el_id = document.getElementById('daum_juso_wrap');
-    new daum.Postcode({
-        oncomplete: function(data) {
-            var address1 = data.address1,
-                address2 = "";
-            if(data.addressType == "R"){        //도로명이면
-                address2 = data.address2;
-            }
-            put_data2(data.postcode1, data.postcode2, address1, '', address2, data.addressType);
-        },
-        width : '100%',
-        height : '100%'
-    }).embed(el_id);
-});
+    of.<?php echo $frm_addr3; ?>.focus();   //안드로이드 4.3 기본브라우져에서 가끔 안나오는 현상이 있어서 일부러 적용
+    of.<?php echo $frm_addr2; ?>.focus();
+    window.close();
+}
 </script>
\ No newline at end of file
diff --git a/mobile/tail.php b/mobile/tail.php
index f5069605e..913f5489d 100644
--- a/mobile/tail.php
+++ b/mobile/tail.php
@@ -27,7 +27,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <?php
 if(G5_USE_MOBILE && G5_IS_MOBILE) {
     $seq = 0;
-    $href = $_SERVER['PHP_SELF'];
+    $p = parse_url(G5_URL);
+    $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF'];
     if($_SERVER['QUERY_STRING']) {
         $sep = '?';
         foreach($_GET as $key=>$val) {
diff --git a/skin/member/basic/zip.skin.php b/skin/member/basic/zip.skin.php
index 6ce92c7df..efd80d21e 100644
--- a/skin/member/basic/zip.skin.php
+++ b/skin/member/basic/zip.skin.php
@@ -8,40 +8,22 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 <div id="daum_juso_wrap" class="daum_juso_wrap"></div>
 
 <script>
-jQuery(function($){
-    $("html, body").addClass("daum_juso_body");
+function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
+{
+    var of = window.opener.document.<?php echo $frm_name; ?>;
 
-    function put_data2(zip1, zip2, addr1, addr2, addr3, jibeon)
-    {
-        var of = window.opener.document.<?php echo $frm_name; ?>;
+    of.<?php echo $frm_zip1; ?>.value = zip1;
+    of.<?php echo $frm_zip2; ?>.value = zip2;
+    of.<?php echo $frm_addr1; ?>.value = addr1;
+    of.<?php echo $frm_addr2; ?>.value = addr2;
+    of.<?php echo $frm_addr3; ?>.value = addr3;
 
-        of.<?php echo $frm_zip1; ?>.value = zip1;
-        of.<?php echo $frm_zip2; ?>.value = zip2;
-        of.<?php echo $frm_addr1; ?>.value = addr1;
-        of.<?php echo $frm_addr2; ?>.value = addr2;
-        of.<?php echo $frm_addr3; ?>.value = addr3;
-
-        if( jibeon ){
-            if(of.<?php echo $frm_jibeon; ?> !== undefined){
-                of.<?php echo $frm_jibeon; ?>.value = jibeon;
-            }
+    if( jibeon ){
+        if(of.<?php echo $frm_jibeon; ?> !== undefined){
+            of.<?php echo $frm_jibeon; ?>.value = jibeon;
         }
-        of.<?php echo $frm_addr2; ?>.focus();
-        window.close();
     }
-
-    var el_id = document.getElementById('daum_juso_wrap');
-    new daum.Postcode({
-        oncomplete: function(data) {
-            var address1 = data.address1,
-                address2 = "";
-            if(data.addressType == "R"){        //도로명이면
-                address2 = data.address2;
-            }
-            put_data2(data.postcode1, data.postcode2, address1, '', address2, data.addressType);
-        },
-        width : '100%',
-        height : '100%'
-    }).embed(el_id);
-});
+    of.<?php echo $frm_addr2; ?>.focus();
+    window.close();
+}
 </script>
\ No newline at end of file
diff --git a/tail.php b/tail.php
index e579db0bc..398a0b3d1 100644
--- a/tail.php
+++ b/tail.php
@@ -42,7 +42,8 @@ if (G5_IS_MOBILE) {
 <?php
 if(G5_USE_MOBILE && !G5_IS_MOBILE) {
     $seq = 0;
-    $href = $_SERVER['PHP_SELF'];
+    $p = parse_url(G5_URL);
+    $href = $p['scheme'].'://'.$p['host'].$_SERVER['PHP_SELF'];
     if($_SERVER['QUERY_STRING']) {
         $sep = '?';
         foreach($_GET as $key=>$val) {