From a292d1ec825d6781c5fc4b8ba3236e4c45e50842 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 31 Jan 2013 11:39:48 +0900
Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=B4=20=EC=B6=94=EA=B0=80=ED=96=88=EB=8D=98=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/settle_kcp.inc.php    |  5 -----
 shop/settle_kcp_common.php | 36 ++++++++++++++++++------------------
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/shop/settle_kcp.inc.php b/shop/settle_kcp.inc.php
index f96e944bb..d6b9d5d80 100644
--- a/shop/settle_kcp.inc.php
+++ b/shop/settle_kcp.inc.php
@@ -3,11 +3,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 $test = "";
 
-<<<<<<< HEAD
-$default['de_card_test'] = 1;
-$default['de_escrow_use'] = 1;
-=======
->>>>>>> a811b2f9cff6268823ba4ef76b9e57769cf04bc6
 if ($default['de_card_test']) {
     if ($default['de_escrow_use'] == 1) {
         // 에스크로결제 테스트
diff --git a/shop/settle_kcp_common.php b/shop/settle_kcp_common.php
index e9cabc590..358800857 100644
--- a/shop/settle_kcp_common.php
+++ b/shop/settle_kcp_common.php
@@ -16,25 +16,25 @@ fclose($fp);
        REMOTE ADDRESS 체크를 하여, 아래의 IP 이외의 다른 경로를 통해서 전송된
        데이터에 대해서는 결과처리를 하지 마시기 바랍니다.
 ------------------------------------------------------------------------------*/
-/*
-switch ($_SERVER['REMOTE_ADDR']) {
-    case '203.238.36.58' :
-    case '203.238.36.160' :
-    case '203.238.36.161' :
-    case '203.238.36.173' :
-    case '203.238.36.178' :
-        break;
-    default :
-        $super_admin = get_admin('super');
-        $egpcs_str = "ENV[" . serialize($_ENV) . "] "
-                   . "GET[" . serialize($_GET) . "]"
-                   . "POST[" . serialize($_POST) . "]"
-                   . "COOKIE[" . serialize($_COOKIE) . "]"
-                   . "SESSION[" . serialize($_SESSION) . "]";
-        mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', $_SERVER['PHP_SELF'].' 에 '.$_SERVER['REMOTE_ADDR'].' 이 '.$g4['time_ymdhis'].' 에 접속을 시도하였습니다.'."\n\n" . $egpcs_str, 2);
-        exit;
+if(!$default['de_card_test']) {
+    switch ($_SERVER['REMOTE_ADDR']) {
+        case '203.238.36.58' :
+        case '203.238.36.160' :
+        case '203.238.36.161' :
+        case '203.238.36.173' :
+        case '203.238.36.178' :
+            break;
+        default :
+            $super_admin = get_admin('super');
+            $egpcs_str = "ENV[" . serialize($_ENV) . "] "
+                       . "GET[" . serialize($_GET) . "]"
+                       . "POST[" . serialize($_POST) . "]"
+                       . "COOKIE[" . serialize($_COOKIE) . "]"
+                       . "SESSION[" . serialize($_SESSION) . "]";
+            mailer('경고', 'waring', $super_admin['mb_email'], '올바르지 않은 접속 보고', $_SERVER['PHP_SELF'].' 에 '.$_SERVER['REMOTE_ADDR'].' 이 '.$g4['time_ymdhis'].' 에 접속을 시도하였습니다.'."\n\n" . $egpcs_str, 2);
+            exit;
+    }
 }
-*/
 
     /* ============================================================================== */
     /* =   PAGE : 공통 통보 PAGE                                                    = */