From b02e93f5e79e967403ee76af7cdf4ebae8a06634 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 1 Feb 2018 01:47:11 +0900
Subject: [PATCH] =?UTF-8?q?func=5Fhistory=EB=A5=BC=20=EC=98=88=EC=A0=84?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=EC=9C=BC=EB=A1=9C=20=EB=A1=A4=EB=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 che_close/func_history.php | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/che_close/func_history.php b/che_close/func_history.php
index 1c393bf..bd18360 100644
--- a/che_close/func_history.php
+++ b/che_close/func_history.php
@@ -1,5 +1,4 @@
 <?php
-require_once('../e_lib/util.php');
 include "func_http.php";
 
 function getHistory($count, $year, $month, $isFirst=0) {
@@ -35,7 +34,7 @@ function getGenHistory($count, $year, $month, $isFirst=0) {
     @fseek($fp, -$count*300, SEEK_END);
     $file = @fread($fp, $count*300);
     @fclose($fp);
-    $log = explode("\n",$file);
+    $log = explode("\r\n",$file);
 
     $str = "";
     $prefix = "</>{$month}월:";
@@ -73,25 +72,17 @@ function LogHistory($connect, $isFirst=0) {
         $admin['month'] = 12;
     }
 
-    //TODO: 웹 접속이 아닌 콘솔일 경우에 대응책 필요. conf등에 저장하는 것을 고려
-    $current_url = util::get_current_url();
-    $map_path =  explode('/',parse_url($current_url, PHP_URL_PASS));
-    array_pop($map_path);
-    array_push($map_path, 'map.php?type=2&graphic=0');
-    $map_path = join('/', $map_path);
-    //$file = explode('/', __FILE__);
-    //$url = '/'.$file[count($file)-3].'/'.$file[count($file)-2].'/map.php?type=2&graphic=0';
+    $file = explode('/', __FILE__);
+    $url = '/'.$file[count($file)-3].'/'.$file[count($file)-2].'/map.php?type=2&graphic=0';
 
     /* 소켓 통신을 통하여 필요한 html정보를 가져옴 */
     if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', Start HTTP');
-    
-    //$http = new HTTP("62che.com", 80, 10);
-    $http = new HTTP(parse_url($current_url, PHP_URL_HOST), parse_url($current_url, PHP_URL_PORT), 10); 
+    $http = new HTTP("62che.com", 80, 10);
     if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', Connect end, '.$http->GetError());
     if($http->GetErr() == true) { return false; }
     $http->setHttpVersion("1.1");
     $cookie = "";
-    $http->Get($map_path, $cookie);
+    $http->Get($url, $cookie);
     if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', Response end, '.$http->GetError());
     if($http->GetErr() == true) { return false; }
     $map = $http->Response["body"];
@@ -114,13 +105,13 @@ function LogHistory($connect, $isFirst=0) {
     for($i=0; $i < $nationcount; $i++) {
         $nation = MYDB_fetch_array($result);
 
-        $query = "select city from city where nation='{$nation['nation']}'";
+        $query = "select city from city where nation='$nation[nation]'";
         $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $citycount = MYDB_num_rows($cityresult);
 
-        $nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</font><br>";
-        $powerStr .= "국력 {$nation['power']}<br>";
-        $genStr .= "장수 {$nation['gennum']}<br>";
+        $nationStr .= "<font color=cyan>◆</font> <font style=color:".newColor($nation[color]).";background-color:$nation[color];>$nation[name]</font><br>";
+        $powerStr .= "국력 $nation[power]<br>";
+        $genStr .= "장수 $nation[gennum]<br>";
         $cityStr .= "속령 $citycount<br>";
     }
 
@@ -130,10 +121,11 @@ function LogHistory($connect, $isFirst=0) {
         insert into history (
             year, month, map, log, genlog, nation, power, gen, city
         ) values (
-            '{$admin['year']}', '{$admin['month']}', '$map', '$log', '$genlog', '$nationStr', '$powerStr', '$genStr', '$cityStr'
+            '$admin[year]', '$admin[month]', '$map', '$log', '$genlog', '$nationStr', '$powerStr', '$genStr', '$cityStr'
         )",
     $connect) or Error(__LINE__.MYDB_error($connect),"");
 
     if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', LogHistory Finish');
     return true;
 }
+?>