From a45caca7eedf2997e3c07ce75800270614c28ca3 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 5 Dec 2013 17:18:26 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=83=81?=
 =?UTF-8?q?=EB=8B=A8=20=EA=B2=80=EC=83=89=EC=B0=BD=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EB=94=94=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default.css | 8 ++++----
 head.php        | 8 ++++----
 mobile/head.php | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/css/default.css b/css/default.css
index da04d20c9..eab055806 100644
--- a/css/default.css
+++ b/css/default.css
@@ -29,10 +29,10 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
 #logo {padding:26px 0}
 
 /* 전체 검색 */
-#sch_all {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca}
-#sch_all legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
-#sch_all #sch_all_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
-#sch_all_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer}
+#sch {position:absolute;top:22px;left:170px;margin:0;padding:0;border:1px solid #c3c6ca}
+#sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
+#sch #sch_stx {padding-left:5px;width:110px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
+#sch_submit {padding:0 5px;height:26px;border:0;background:#e2e6eb;color:#333;cursor:pointer}
 
 #tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
diff --git a/head.php b/head.php
index 6078b96f3..f1dcf2d08 100644
--- a/head.php
+++ b/head.php
@@ -35,14 +35,14 @@ if ($config['cf_include_head']) {
             <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
         </div>
 
-        <fieldset id="sch_all">
+        <fieldset id="sch">
             <legend>사이트 내 전체검색</legend>
             <form name="fsearchbox" method="get" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);">
             <input type="hidden" name="sfl" value="wr_subject||wr_content">
             <input type="hidden" name="sop" value="and">
-            <label for="sch_all_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
-            <input type="text" name="stx" id="sch_all_stx" maxlength="20">
-            <input type="submit" id="sch_all_submit" value="검색">
+            <label for="sch_stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
+            <input type="text" name="stx" id="sch_stx" maxlength="20">
+            <input type="submit" id="sch_submit" value="검색">
             </form>
 
             <script>
diff --git a/mobile/head.php b/mobile/head.php
index a70ac7c31..1de748859 100644
--- a/mobile/head.php
+++ b/mobile/head.php
@@ -22,13 +22,13 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="처음으로"></a>
         </div>
 
-        <fieldset id="schall">
+        <fieldset id="sch">
             <legend>사이트 내 전체검색</legend>
             <form name="fsearchbox" action="<?php echo G5_BBS_URL ?>/search.php" onsubmit="return fsearchbox_submit(this);" method="get">
             <input type="hidden" name="sfl" value="wr_subject||wr_content">
             <input type="hidden" name="sop" value="and">
-            <input type="text" name="stx" id="schall_stx" placeholder="검색어(필수)" required class="required" maxlength="20">
-            <input type="image" alt="검색" src="<?php echo G5_IMG_URL ?>/btn_search.jpg" id="schall_submit" width="24" height="24">
+            <input type="text" name="stx" id="sch_stx" placeholder="검색어(필수)" required class="required" maxlength="20">
+            <input type="image" alt="검색" src="<?php echo G5_IMG_URL ?>/btn_search.jpg" id="sch_submit" width="24" height="24">
             </form>
 
             <script>

From 003a3ccd18eaa941e1dbb1be7fb93ce7beb208c0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 5 Dec 2013 17:21:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=EC=97=90=20?=
 =?UTF-8?q?=ED=8F=AC=ED=8A=B8=EA=B0=80=20=EC=9E=88=EC=9D=84=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20url=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbs/login.php b/bbs/login.php
index 47efe4597..738ee1156 100644
--- a/bbs/login.php
+++ b/bbs/login.php
@@ -9,7 +9,7 @@ $url = $_GET['url'];
 $p = parse_url($url);
 if ((isset($p['scheme']) && $p['scheme']) || (isset($p['host']) && $p['host'])) {
     //print_r2($p);
-    if ($p['host'] != $_SERVER['HTTP_HOST'])
+    if ($p['host'].(isset($p['port']) ? ':'.$p['port'] : '') != $_SERVER['HTTP_HOST'])
         alert('url에 타 도메인을 지정할 수 없습니다.');
 }