From 8e20f80cd29816c70031d45b9ef47c966e49156c Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 10 May 2013 16:34:50 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=84=A4=EC=B9=98=EC=8B=9C=20=EB=B3=80?=
 =?UTF-8?q?=EC=88=98=EC=84=A0=EC=96=B8=20notice=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/config.php b/config.php
index eb8e86cc3..7870b3354 100644
--- a/config.php
+++ b/config.php
@@ -57,9 +57,18 @@ define('G4_SYNDI_DIR',      'syndi');
 if (G4_DOMAIN) {
     define('G4_URL', G4_DOMAIN);
 } else {
-    define('G4_URL', $g4_path['url']);
+    if (isset($g4_path['url'])) {
+        define('G4_URL', $g4_path['url']);
+    } else {
+        define('G4_URL', '');
+    }
+}
+
+if (isset($g4_path['path'])) {
+    define('G4_PATH', $g4_path['path']);
+} else {
+    define('G4_PATH', '');
 }
-define('G4_PATH', $g4_path['path']);
 
 define('G4_ADMIN_URL',      G4_URL.'/'.G4_ADMIN_DIR);
 define('G4_BBS_URL',        G4_URL.'/'.G4_BBS_DIR);

From b8405d3db787a667ec1be4faf85ea0f8d242ace3 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 10 May 2013 16:35:17 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=9B=84=20url?=
 =?UTF-8?q?=EC=9D=84=20urlencode=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

---
 lib/common.lib.php   | 5 +++--
 lib/outlogin.lib.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index 2cc4c0874..1ac098608 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1987,8 +1987,9 @@ function hyphen_hp_number($hp)
 function login_url($url='')
 {
     if (!$url) $url = G4_URL;
-    $p = parse_url($url);
-    return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
+    //$p = parse_url($url);
+    //return $url.urldecode(preg_replace("/^".urlencode($p['path'])."/", "", urlencode($_SERVER['REQUEST_URI'])));
+    return $url;
 }
 
 
diff --git a/lib/outlogin.lib.php b/lib/outlogin.lib.php
index 077a4bd5a..aee773096 100644
--- a/lib/outlogin.lib.php
+++ b/lib/outlogin.lib.php
@@ -34,7 +34,7 @@ function outlogin($skin_dir='basic')
             $is_auth = true;
     }
 
-    $outlogin_url        = login_url();
+    $outlogin_url        = login_url($urlencode);
     $outlogin_action_url = G4_HTTPS_BBS_URL.'/login_check.php';
 
     ob_start();