From d062fac671fa758cad11135fa0c99f764ca7c0d2 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 1 Apr 2018 04:36:22 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=8F=84=20=EB=BB=97=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0.=20commandlist=20?=
 =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=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

---
 hwe/commandlist.php | 8 +++++++-
 hwe/func_map.php    | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hwe/commandlist.php b/hwe/commandlist.php
index 603ad82e..aad8bd0b 100644
--- a/hwe/commandlist.php
+++ b/hwe/commandlist.php
@@ -4,7 +4,8 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+$session = Session::Instance()->loginGame()->setReadOnly();
+
 $connect = dbConn();
 
 ?>
@@ -15,6 +16,11 @@ $connect = dbConn();
 <meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=utf-8'>
 <link rel=stylesheet href=css/common.css type=text/css>
 <script type="text/javascript">
+<?php
+if(!$session->isLoggedIn()){
+    echo 'window.parent.location.href = "../";';
+}
+?>
 function myclock() {
     lastday = new Array(31,28,31,30,31,30,31,31,30,31,30,31);
 
diff --git a/hwe/func_map.php b/hwe/func_map.php
index 09ed7d6a..8cd83ec4 100644
--- a/hwe/func_map.php
+++ b/hwe/func_map.php
@@ -1,5 +1,5 @@
 <?php
-
+namespace sammo;
 class MapRequest{
     public $year;
     public $month;
@@ -101,7 +101,7 @@ function getWorldMap($req){
     if($myNation){
         //굳이 타국 도시에 있는 아국 장수 리스트를 뽑을 이유가 없음. 일단 다 뽑자.
         $shownByGeneralList = 
-            array_map('Util::toInt',
+            array_map('\\sammo\\Util::toInt',
                 $db->queryFirstColumn('select distinct `city` from `general` where `nation` = %i',
                     $myNation));
     }
@@ -112,7 +112,7 @@ function getWorldMap($req){
     $cityList = [];
     foreach($db->query('select `city`, `level`, `state`, `nation`, `region`, `supply` from `city`') as $r){
         $cityList[] = 
-            array_map('Util::toInt', [$r['city'], $r['level'], $r['state'], $r['nation'], $r['region'], $r['supply']]);
+            array_map('\\sammo\\Util::toInt', [$r['city'], $r['level'], $r['state'], $r['nation'], $r['region'], $r['supply']]);
     }
 
     return [