From fec250809101982a77023a3134de0d23153d8ab0 Mon Sep 17 00:00:00 2001
From: sars <sarsntony@gmail.com>
Date: Wed, 16 Mar 2022 23:10:54 -0700
Subject: [PATCH] =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20?=
 =?UTF-8?q?=ED=95=98=EC=9D=B4=EB=9D=BC=EC=9D=B4=ED=8A=B8=EC=99=80=20?=
 =?UTF-8?q?=ED=86=A0=EB=84=88=EB=A8=BC=ED=8A=B8=20=EC=95=A1=ED=8B=B0?=
 =?UTF-8?q?=EB=B8=8C=EB=A5=BC=20=EB=94=B0=EB=A1=9C=20=EB=B3=80=EC=88=98?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_template.php | 2 +-
 hwe/index.php         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hwe/func_template.php b/hwe/func_template.php
index 09e6eece..372c9177 100644
--- a/hwe/func_template.php
+++ b/hwe/func_template.php
@@ -168,7 +168,7 @@ function commandButton(array $opts = [])
     $showSecret = false;
     $permission = checkSecretPermission($me);
     $btnClassForTournament = $opts['btnClass'];
-    if ($opts['isTournamentActive']) {
+    if ($opts['isTournamentApplicationOpen']) {
       if ($btnClassForTournament != 'dropdown-item') {
         $btnClassForTournament = 'toolbarButton2';
       }
diff --git a/hwe/index.php b/hwe/index.php
index ff3e890e..269d28e4 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -88,7 +88,8 @@ $serverName = UniqueConst::$serverName;
 $serverCnt = $gameStor->server_cnt;
 
 $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
-$isTournamentActive = $gameStor->tournament == 1;
+$isTournamentActive = $gameStor->tournament > 0;
+$isTournamentApplicationOpen = $gameStor->tournament == 1;
 $isBettingActive = $gameStor->tournament == 6;
 
 $myNationStatic = getNationStaticInfo($generalObj->getNationID());
@@ -257,7 +258,7 @@ if (!$otherTextInfo) {
                 <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
                 <div id="general-position"><?php generalInfo($generalObj); ?></div>
                 <div id="generalCommandButton" class="row gx-0">
-                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?></div>
+                    <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
                 </div>
             </div>
         </div>
@@ -357,7 +358,7 @@ if (!$otherTextInfo) {
                             국가 메뉴
                         </div>
                         <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
-                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?>
+                            <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
                         </ul>
                     </li>
                     <li class="nav-item dropup">