From d4471e60ffa3a61f97791acb055f0988d62ad142 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 31 Jan 2013 16:37:33 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=A7=81?=
 =?UTF-8?q?=ED=81=AC=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skin/poll/neo/poll.skin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index 7e65e9ea4..f6e32326b 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -19,7 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll" class="cbg">
     <header>
         <h2>설문조사</h2>
-        <? if ($is_admin == "super") { ?><a href="<?=G4_ADM_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
+        <? if ($is_admin == "super") { ?><a href="<?=G4_ADMIN_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>

From de5fe00a270231f0ee5a66f57a4883cbcbf37c0a Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Thu, 31 Jan 2013 17:06:38 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=A1=9C=EA=B8=B4=EC=8B=9C=20host=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/board.php | 2 +-
 bbs/login.php | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bbs/board.php b/bbs/board.php
index ebcd78606..a05bb9988 100644
--- a/bbs/board.php
+++ b/bbs/board.php
@@ -47,7 +47,7 @@ if (isset($wr_id) && $wr_id) {
         if ($is_member)
             alert('글을 읽을 권한이 없습니다.', $g4['url']);
         else
-            alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode('./board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id));
+            alert('글을 읽을 권한이 없습니다.\\n\\n회원이시라면 로그인 후 이용해 보십시오.', './login.php?wr_id='.$wr_id.$qstr.'&amp;url='.urlencode(G4_BBS_URL.'/board.php?bo_table='.$bo_table.'&amp;wr_id='.$wr_id));
     }
 
     // 자신의 글이거나 관리자라면 통과
diff --git a/bbs/login.php b/bbs/login.php
index 9a7691146..1803cb6a8 100644
--- a/bbs/login.php
+++ b/bbs/login.php
@@ -5,9 +5,10 @@ $g4['title'] = '로그인';
 include_once('./_head.sub.php');
 
 $p = parse_url($url);
-if ((isset($p['scheme']) && $p['scheme']) ||
-    (isset($p['host']) && $p['host'])) {
-    alert('url에 도메인을 지정할 수 없습니다.');
+if ((isset($p['scheme']) && $p['scheme']) || (isset($p['host']) && $p['host'])) {
+    //print_r2($p);
+    if ($p['host'] != $_SERVER['HTTP_HOST'])
+        alert('url에 타 도메인을 지정할 수 없습니다.');
 }
 
 // 이미 로그인 중이라면