From 8c711242a9d4958fcb4f336ce8612bbb71d10c9e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 27 Jun 2018 02:12:59 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=95=EC=A1=B0=20=EC=9D=BC=EB=9E=8C?=
 =?UTF-8?q?=EC=97=90=20=EC=97=B0=EA=B0=90=EC=9D=84=20=EB=B3=BC=20=EC=88=98?=
 =?UTF-8?q?=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=ED=86=B5=ED=95=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_emperior.php | 46 +++++++++++++++++++++++++++++-----------------
 hwe/a_history.php  | 18 +++++++++++++-----
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php
index 707cf4c0..2706fb9d 100644
--- a/hwe/a_emperior.php
+++ b/hwe/a_emperior.php
@@ -41,50 +41,62 @@ if ($select == 0) {
     for ($i=0; $i < $empcount; $i++) {
         $emperior = MYDB_fetch_array($result);
 
-        echo "
-<form action=a_emperior.php method=get>
+?>
+
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
         <td bgcolor=skyblue align=center colspan=8>
-            <font size=5>{$emperior['phase']}</font>
+        <form action=a_emperior.php method=get>
+            <font size=5><?=$emperior['phase']?></font>
+            
             <input type=submit value='자세히'>
-            <input type=hidden name=select value='{$emperior['no']}'>
+            <input type=hidden name=select value='<?=$emperior['no']?>'>
+            
+            <?php if($emperior['server_id']): ?>
+            <a href="a_history.php?server_id=<?=$emperior['server_id']?>"><button type="button">역사 보기</button></a>
+            <?php endif ?>
+        </form>
         </td>
     </tr>
     <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=8>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
+        <td align=center style=color:".newColor($emperior['color'])."; bgcolor=<?=$emperior['color']?> colspan=8>
+            <font size=5><?=$emperior['name']?> (<?=$emperior['year']?>年 <?=$emperior['month']?>月)</font>
         </td>
     </tr>
     <tr>
         <td id=bg1 align=center width=80>국 력</td>
-        <td align=center width=170>{$emperior['power']}</td>
+        <td align=center width=170><?=$emperior['power']?></td>
         <td id=bg1 align=center width=80>장 수</td>
-        <td align=center width=170>{$emperior['gennum']}</td>
+        <td align=center width=170><?=$emperior['gennum']?></td>
         <td id=bg1 align=center width=80>속 령</td>
-        <td align=center width=170>{$emperior['citynum']}</td>
+        <td align=center width=170><?=$emperior['citynum']?></td>
         <td id=bg1 align=center width=80>성 향</td>
-        <td align=center width=170>{$emperior['type']}</td>
+        <td align=center width=170><?=$emperior['type']?></td>
     </tr>
     <tr>
         <td id=bg1 align=center>황 제</td>
-        <td align=center>{$emperior['l12name']}</td>
+        <td align=center><?=$emperior['l12name']?></td>
         <td id=bg1 align=center>승 상</td>
-        <td align=center>{$emperior['l11name']}</td>
+        <td align=center><?=$emperior['l11name']?></td>
         <td id=bg1 align=center>위 장 군</td>
-        <td align=center>{$emperior['l10name']}</td>
+        <td align=center><?=$emperior['l10name']?></td>
         <td id=bg1 align=center>사 공</td>
-        <td align=center>{$emperior['l9name']}</td>
+        <td align=center><?=$emperior['l9name']?></td>
     </tr>
 </table>
-</form>
+
+
+
+<?php
+    }
+?>
 <table align=center width=1000 class='tb_layout bg0'>
     <tr><td><?=closeButton()?></td></tr>
     <tr><td><?=banner()?></td></tr>
 </table>
 </body>
-</html>";
-    }
+</html>
+<?php
     die();
 }
 
diff --git a/hwe/a_history.php b/hwe/a_history.php
index 22ec17da..2a4c1d82 100644
--- a/hwe/a_history.php
+++ b/hwe/a_history.php
@@ -17,7 +17,13 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-increaseRefresh("연감", 1);
+if(!$serverID){
+    $serverID = UniqueConst::$serverID;
+}
+
+if($serverID === UniqueConst::$serverID){
+    increaseRefresh("연감", 1);
+}
 
 $admin = $gameStor->getValues(['startyear','year','month']);
 
@@ -31,9 +37,7 @@ if ($con >= 2) {
     exit();
 }
 
-if(!$serverID){
-    $serverID = UniqueConst::$serverID;
-}
+
 
 [$s_year, $s_month] = $db->queryFirstList('SELECT year, month FROM history WHERE server_id = %s ORDER BY year ASC, month ASC LIMIT 1', $serverID);
 $s = $s_year * 12 + $s_month;
@@ -42,7 +46,11 @@ $s = $s_year * 12 + $s_month;
 $e = $e_year * 12 + $e_month;
 
 //FIXME: $yearmonth가 올바르지 않을 경우에 처리가 필요.
-if (!$yearmonth) {
+if($serverID !== UniqueConst::$serverID && !$yearmonth){
+    $year = $s_year;
+    $month = $s_month;
+}
+else if (!$yearmonth) {
     $year = $admin['year'];
     $month = $admin['month'] - 1;
 } else {