game,fix: 백이병 vs 정란, 벽력거 공격 상성 관련 문제 수정

Reviewed-on: https://storage.hided.net/gitea/devsam/core/pulls/209

.babelrc

@@ -0,0 +1,15 @@
+{
+    "presets": [
+        [
+            "@babel/preset-env",
+            {
+                "useBuiltIns": "usage",
+                "corejs": 3,
+                "modules": false
+            }
+        ]
+    ],
+    "plugins": [
+        "lodash"
+    ]
+}

.eslintrc.cjs

@@ -0,0 +1,42 @@
+module.exports = {
+    root: true,
+    parser: "vue-eslint-parser",
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    ignorePatterns: ['*.test.ts', '.eslintrc.cjs', 'postcss.config.cjs', 'webpack.config.cjs', '*.js'],
+    overrides: [{
+        files: ['*.ts', '*.tsx', "*.vue"],
+    }],
+    plugins: [
+        "@typescript-eslint"
+    ],
+
+    extends: [
+        "eslint:recommended",
+        "plugin:vue/vue3-essential",
+        "plugin:@typescript-eslint/recommended"
+    ],
+    parserOptions: {
+        "sourceType": "module",
+        "project": "./tsconfig.json",
+        "ecmaVersion": 2021,
+        "parser": "@typescript-eslint/parser",
+        extraFileExtensions: ['.vue']
+    },
+    rules: {
+        '@typescript-eslint/no-floating-promises': 'error',
+    },
+    settings: {
+        'import/resolver': {
+            alias: {
+                map: [
+                    ['@', './hwe/ts'],
+                    ['@util', './hwe/ts/util'],
+                    ['@scss', './hwe/scss'],
+                ]
+            }
+        }
+    },
+};

.gitignore

@@ -4,8 +4,7 @@
 !.vscode/launch.json
 !.vscode/extensions.json
 
-
-
+/node_modules
 
 # 체섭 ignore
 *.log
@@ -16,25 +15,37 @@ d_log/*.zip
 sess_*
 */logs/*.txt
 */logs/*/*.txt
+*/logs/preserved
 err.txt
-che/.htaccess
-kwe/.htaccess
-pwe/.htaccess
-twe/.htaccess
+
 hwe/.htaccess
 
 d_shared
 
+/d_pic
 d_pic/*.jpg
 d_pic/*.gif
 d_pic/*.png
+d_pic/*.webp
+d_pic/uploaded_image
+
+*/dist_misc/*
+*/dist_js/*
+*/dist_css/*
+/dist_misc/*
+/dist_js/*
+/dist_css/*
 
 d_setting/*.php
 */d_setting/*.php
+*/d_setting/*.json
 */d_setting/templates/*.php
+!*.orig.php
+
+*/data/file_cache
 
 **/old/*
-test.php
+test.*
 
 /che
 /kwe
@@ -43,6 +54,13 @@ test.php
 /pya
 /twe
 
+/hwe/data
+
+/vendor
 phpinfo.php
-vendor/ezyang/htmlpurifier/library/HTMLPurifier/DefinitionCache/*
 *.sqlite3
+
+ingame/js/*
+ingame/css/*
+gateway/js/*
+gateway/css/*

.mocharc.json

@@ -0,0 +1,12 @@
+{
+    "extension": ["ts"],
+    "spec": "hwe/test-ts/**/*.test.ts",
+    "require": [
+        "ts-node/register",
+        "tsconfig-paths/register"
+    ],
+    "node-option": [
+        "experimental-specifier-resolution=node",
+        "loader=ts-node/esm"
+    ]
+  }

.phan/config.php

@@ -2,44 +2,145 @@
 
 /**
  * This configuration will be read and overlaid on top of the
- * default configuration. Command line arguments will be applied
+ * default configuration. Command-line arguments will be applied
  * after this file is read.
  */
 return [
-
-    // Supported values: '7.0', '7.1', '7.2', null.
-    // If this is set to null,
+    // Supported values: `'5.6'`, `'7.0'`, `'7.1'`, `'7.2'`, `'7.3'`,
+    // `'7.4'`, `'8.0'`, `'8.1'`, `null`.
+    // If this is set to `null`,
     // then Phan assumes the PHP version which is closest to the minor version
-    // of the php executable used to execute phan.
-    "target_php_version" => '7.0',
-    'backward_compatibility_checks ' => false,
-    'ignore_undeclared_variables_in_global_scope' => false,
-    'minimum_severity'=>\Phan\Issue::SEVERITY_LOW,
+    // of the php executable used to execute Phan.
+    //
+    // Note that the **only** effect of choosing `'5.6'` is to infer
+    // that functions removed in php 7.0 exist.
+    // (See `backward_compatibility_checks` for additional options)
+    "target_php_version" => '8.0',
+    'backward_compatibility_checks ' => true,
+    'minimum_severity' => \Phan\Issue::SEVERITY_NORMAL,
 
     'file_list' => [
         'f_config/config.php',
-        'hwe/MYDB.php',
-        'hwe/lib.php',
+        'hwe/_119_b.php',
+        'hwe/_119.php',
+        'hwe/a_bestGeneral.php',
+        'hwe/_admin1.php',
+        'hwe/_admin1_submit.php',
+        'hwe/_admin2.php',
+        'hwe/_admin2_submit.php',
+        'hwe/_admin4.php',
+        'hwe/_admin4_submit.php',
+        'hwe/_admin5.php',
+        'hwe/_admin5_submit.php',
+        'hwe/_admin7.php',
+        'hwe/_admin8.php',
+        'hwe/_admin_force_rehall.php',
+        'hwe/a_emperior_detail.php',
+        'hwe/a_emperior.php',
+        'hwe/a_genList.php',
+        'hwe/a_hallOfFame.php',
+        'hwe/a_history.php',
+        'hwe/a_kingdomList.php',
+        'hwe/a_npcList.php',
+        'hwe/api.php',
+        'hwe/a_status.php',
+        'hwe/a_traffic.php',
+        'hwe/a_vote.php',
+        'hwe/battle_simulator.php',
+        'hwe/b_auction.php',
+        'hwe/b_battleCenter.php',
+        'hwe/b_betting.php',
+        'hwe/v_chiefCenter.php',
+        'hwe/b_currentCity.php',
+        'hwe/v_nationStratFinan.php',
+        'hwe/b_diplomacy.php',
+        'hwe/b_genList.php',
+        'hwe/b_myBossInfo.php',
+        'hwe/b_myCityInfo.php',
+        'hwe/b_myGenInfo.php',
+        'hwe/b_myKingdomInfo.php',
+        'hwe/b_myPage.php',
+        'hwe/v_processing.php',
+        'hwe/b_tournament.php',
+        'hwe/b_troop.php',
+        'hwe/c_auction.php',
+        'hwe/c_tournament.php',
+        'hwe/c_vote.php',
         'hwe/func_auction.php',
         'hwe/func_command.php',
         'hwe/func_converter.php',
-        'hwe/func_diplomacy.php',
         'hwe/func_gamerule.php',
         'hwe/func_history.php',
         'hwe/func_legacy.php',
         'hwe/func_map.php',
         'hwe/func_message.php',
-        'hwe/func_npc.php',
-        'hwe/func_process_chief.php',
-        'hwe/func_process_personnel.php',
-        'hwe/func_process_sabotage.php',
+        'hwe/func.php',
         'hwe/func_process.php',
         'hwe/func_string.php',
         'hwe/func_template.php',
         'hwe/func_time_event.php',
         'hwe/func_tournament.php',
+        'hwe/index.php',
+        'hwe/install_db.php',
+        'hwe/install.php',
+        'hwe/j_adjust_icon.php',
+        'hwe/j_autoreset.php',
+        'hwe/j_basic_info.php',
+        'hwe/j_betting.php',
+        'hwe/j_board_article_add.php',
+        'hwe/j_board_comment_add.php',
+        'hwe/j_board_get_articles.php',
+        'hwe/j_die_immediately.php',
+        'hwe/j_diplomacy_destroy_letter.php',
+        'hwe/j_diplomacy_get_letter.php',
+        'hwe/j_diplomacy_respond_letter.php',
+        'hwe/j_diplomacy_rollback_letter.php',
+        'hwe/j_diplomacy_send_letter.php',
+        'hwe/j_export_simulator_object.php',
+        'hwe/j_general_log_old.php',
+        'hwe/j_general_set_permission.php',
+        'hwe/j_get_basic_general_list.php',
+        'hwe/j_get_city_list.php',
+        'hwe/j_get_general_list.php',
+        'hwe/j_get_nation_general_list.php',
+        'hwe/j_get_select_npc_token.php',
+        'hwe/j_get_select_pool.php',
+        'hwe/j_image_upload.php',
+        'hwe/j_install_db.php',
+        'hwe/j_install.php',
+        'hwe/j_load_scenarios.php',
+        'hwe/j_map_history.php',
+        'hwe/j_map.php',
+        'hwe/j_map_recent.php',
+        'hwe/j_msg_contact_list.php',
+        'hwe/j_msg_decide_opt.php',
+        'hwe/j_msg_delete.php',
+        'hwe/j_msg_get_old.php',
+        'hwe/j_msg_get_recent.php',
+        'hwe/j_msg_submit.php',
+        'hwe/j_myBossInfo.php',
+        'hwe/j_raise_event.php',
+        'hwe/j_select_npc.php',
+        'hwe/j_select_picked_general.php',
+        'hwe/j_server_basic_info.php',
+        'hwe/j_set_my_setting.php',
+        'hwe/j_set_npc_control.php',
+        'hwe/j_simulate_battle.php',
+        'hwe/j_troop.php',
+        'hwe/j_update_picked_general.php',
+        'hwe/j_vacation.php',
+        'hwe/lib.php',
         'hwe/process_war.php',
-        'hwe/func.php'
+        'hwe/proc.php',
+        'hwe/readme.php',
+        'hwe/recent_map.php',
+        'hwe/select_general_from_pool.php',
+        'hwe/select_npc.php',
+        'hwe/t_diplomacy.php',
+        'hwe/v_board.php',
+        'hwe/v_inheritPoint.php',
+        'hwe/v_join.php',
+        'hwe/v_NPCControl.php',
     ],
 
     // A list of directories that should be parsed for class and
@@ -74,6 +175,11 @@ return [
         'vendor/'
     ],
 
+    'suppress_issue_types' => [
+        'PhanUnreferencedUseNormal',
+        'PhanTypeArraySuspiciousNullable',
+    ],
+
     // A list of plugin files to execute.
     // See https://github.com/phan/phan/tree/master/.phan/plugins for even more.
     // (Pass these in as relative paths.

.vscode/settings.json

@@ -25,4 +25,8 @@
         "/pya":true,
         "/twe":true,
     },
+    "cSpell.words": [
+        "josa",
+        "sammo"
+    ]
 }

403.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>닫혀 있습니다.</title>
+        <script>
+            setTimeout(function(){
+                window.location.href = '../';
+            }, 5000);
+        </script>
+        <style>
+            html, body{
+                background-color:black;
+                color:yellow;
+            }
+
+        </style>
+    </head>
+    <body>
+        서버가 닫혀있습니다.<br>
+        잠시 뒤에 입구로 이동합니다.
+    </body>
+</html>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2018 Hide_D, 62che
+Copyright (c) 2022 Hide_D, 62che
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,34 +5,44 @@
 
 ## 요구사항
 
-* Apache2
-  * <code>mpm_event</code> 권장
-* PHP 7.2 이상 
-  * <code>php-fpm</code> 권장
-  * php에서 curl을 실행가능해야 합니다.
-* MySQL 5.6 이상, 또는 MariaDB 10.0 이상
-* <code>git</code>
-* <code>curl</code>
+* Apache2 또는 nginx
+  * Apache2인 경우 `mpm_event` 권장
+* PHP 8.0 이상
+  * `php-fpm` 권장
+  * php에서 curl, pdo-sqlite을 실행가능해야 합니다.
+  * mysqli, mysqlnd
+  * gd
+  * mbstring
+* NodeJS 14 이상
+  * 내부의 git을 통해 upgrade 때 `webpack build` 용도로 필요합니다.
+* MariaDB 10.2.1 이상
+  * 현재 MySQL은 지원하지 않습니다.
+* `git`
+* `curl`
 
-Linux는 Ubuntu 16.04, Windows는 Windows 10에서 XAMPP를 사용한 환경에서 테스트되었습니다.
+Linux는 Ubuntu 18.04, 20.04, Windows는 WSL2를 사용한 환경에서 테스트되었습니다.
 
-Docker를 이용한 설치는 계획중입니다.
+Docker를 이용한 설치도 제공하고 있습니다.
 
-## 설치
+## Docker를 이용한 설치
+
+https://storage.hided.net/gitea/devsam/docker 를 참고해 주세요.
+
+## 수동 설치
 
 본 게임은 <code>git</code>을 이용한 업그레이드 시스템을 구현하였으므로, <code>git</code>이 필요합니다.
-또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>, <code>apache</code>)에게 디렉토리 권한이 주어져야합니다.
+또한 웹 서비스 데몬을 운영중인 사용자(일반적으로 <code>www-data</code>)에게 디렉토리 권한이 주어져야합니다.
 
 ### 다운로드
 
 웹 데몬 user가 <code>www-data</code>인 경우 다음과 같이 입력하여 최신 배포버전과 이미지 파일을 얻을 수 있습니다.
 
 ```
-sudo -u www-data git clone ssh://git@storage.hided.net:2525/devsam/core.git
-git clone ssh://git@storage.hided.net:2525/devsam/image.git
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/core.git
+sudo -u www-data git clone https://storage.hided.net/gitea/devsam/image.git
 ```
 
-> 이미지는 git hook을 이용한 업데이트 기능을 제공하지만 아직 범용성 있는 설계가 되어있진 않습니다.
+> 이미지는 hook/git_hook.php을 통해 동기화되며, 서버 설치 과정에 이미지 갱신 키를 지정하는 것으로 '훼' 서버 업데이트 시 동기화됩니다. 이미지 서버가 게임 서버와 별개여도 동작하나, php와 git을 지원해야합니다.
 
 ### 설치
 
@@ -45,9 +55,9 @@ Database 수는 로그인 관리 서버 1개, 내부 서버 7개로, 총 8개의
 
 ## 카카오로그인 연동
 
-현재 카카오로그인 API KEY를 입력하는 작업이 설치과정에 추가되어있지 않습니다.
+서버 설치 시 카카오 로그인 연동을 위한 API KEY를 입력받습니다.
 
-<code>f_install/templates/KakaoKey.orig.php</code> 를 <code>d_setting/KakaoKey.php</code>로 복사한 후 API 키를 입력하여야 합니다.
+만약 설치 이후 API KEY를 변경하고자 하는 경우 <code>d_setting/KakaoKey.php</code>에서 API키를 변경해야 합니다.
 
 
 ## 라이선스

api.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace sammo;
+
+require(__DIR__ . '/vendor/autoload.php');
+
+
+if (!class_exists('\\sammo\\RootDB')) {
+    Json::dieWithReason('No DB');
+}
+
+APIHelper::launch(dirname(__FILE__), $_GET['path']??null);

composer.json

@@ -6,12 +6,16 @@
        "GPL-2.0-or-later",
        "proprietary"
     ],
+    "config": {
+        "platform": {
+            "php": "8.0"
+        }
+    },
     "require": {
         "brandonwamboldt/utilphp": "^1.1",
         "sergeytsalkov/meekrodb": "^2.3",
         "league/plates": "^3.3",
         "guzzlehttp/guzzle": "^6.3",
-        "leafo/scssphp": "^0.7.5",
         "monolog/monolog": "^1.23",
         "firephp/firephp-core": "^0.4.0",
         "vlucas/valitron": "^1.4",
@@ -20,26 +24,33 @@
         "symfony/lock": "^4.1",
         "ezyang/htmlpurifier": "^4.10",
         "xemlock/htmlpurifier-html5": "^0.1.7",
-        "catfan/medoo": "^1.5"
+        "catfan/medoo": "^1.5",
+        "phan/phan": "*",
+        "erusev/parsedown-extra": "^0.8.1",
+        "nette/caching": "^3.0",
+        "illuminate/database": "^8.61",
+        "illuminate/events": "^8.61",
+        "spatie/data-transfer-object": "^3.7"
     },
     "autoload": {
         "psr-4": {
             "sammo\\": [
+                "d_setting",
                 "src/sammo"
             ],
             "kakao\\": [
+                "d_setting",
                 "src/kakao"
             ]
         },
-        "classmap": [
-            "d_setting/"
-        ],
         "exclude-from-classmap": [
             "**/*.orig.php"
         ],
         "files":[
             "f_config/config.php"
         ]
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5"
     }
-    
 }

css/config.css

@@ -1,24 +1,37 @@
 @charset "utf-8";
-
 body {
-    color:white; background-color:black; font-family: '맑은 고딕';
+    color: white;
+    background-color: black;
+    font-family: 'Pretendard';
 }
 
 table {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';
 }
-th, td      {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+
+th,
+td {
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';
 }
 
 a.just_link {
@@ -39,19 +52,25 @@ a.just_link {
 .section_title {
     height: 50px;
     line-height: 50px;
-    font-size: 30px; font-weight: bold;
+    font-size: 30px;
+    font-weight: bold;
     text-align: center;
     color: white;
     padding: 0;
 }
 
 .legacy_layout div {
-    border: solid 1px; border-spacing: 0px; border-collapse: separate; border-top-color: gray; border-left-color: gray; border-right-color: black; border-bottom-color: black;
+    border: solid 1px;
+    border-spacing: 0px;
+    border-collapse: separate;
+    border-top-color: gray;
+    border-left-color: gray;
+    border-right-color: black;
+    border-bottom-color: black;
     padding: 0px;
-    font-size: 13px;
+    font-size: 14px;
     word-break: break-all;
     text-align: center;
-    font-family: '맑은 고딕';;
 }
 
 .obj_fill {
@@ -62,9 +81,9 @@ a.just_link {
 
 button.with_skin {
     padding: 0 4px;
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
+    background-color: black;
+    color: white;
+    font-size: 14px;
 }
 
 button.with_skin:disabled {
@@ -72,27 +91,43 @@ button.with_skin:disabled {
 }
 
 input.with_skin {
-    background-color: black; color: white;
-    font-family: '맑은 고딕';
-    font-size: 13px;
+    background-color: black;
+    color: white;
+    font-size: 14px;
 }
 
 input.with_skin:disabled {
     background-color: #333333;
 }
 
-.font0  { font-size: 10px; }
-.font1  { font-size: 13px; }
-.font2  { font-size: 15px; }
-.font3  { font-size: 20px; }
-.font4  { font-size: 30px; }
-.font5  { font-size: 50px; }
+.font0 {
+    font-size: 10px;
+}
+
+.font1 {
+    font-size: 14px;
+}
+
+.font2 {
+    font-size: 15px;
+}
+
+.font3 {
+    font-size: 20px;
+}
+
+.font4 {
+    font-size: 30px;
+}
+
+.font5 {
+    font-size: 50px;
+}
 
 caption.section_title {
     caption-side: top;
 }
 
-
 .samButton {
     float: left;
     display: block;
@@ -123,7 +158,6 @@ a.samButton.disabled {
     border: inset 2px white;
 }
 
-
 .samButtonInner {
     display: table-cell;
     vertical-align: middle;
@@ -165,3 +199,37 @@ a.samButton.disabled {
 .samCommandButton.disabled>.samButtonOuter>.samButtonInner::after {
     content: '】'
 }
+
+.tooltip_copyable_info .tooltiptext {
+    display: inline;
+    color: rgba(0, 0, 0, 0);
+    font-size: 0;
+}
+
+.tooltiptext {
+    display: none;
+}
+
+.hidden_but_copyable {
+    color: rgba(0, 0, 0, 0);
+    font-size: 0;
+}
+
+.vertical_flex {
+    height: 100%;
+    display: flex;
+    align-content: center;
+    flex-direction: column;
+    align-items: stretch;
+}
+
+.vertical_flex .item {
+    display: block;
+    flex-grow: 1;
+}
+
+.fill_box {
+    display: block;
+    width: 100%;
+    height: 100%;
+}

css/entrance.css

@@ -1,5 +1,4 @@
 @charset "utf-8";
-
 body {
     line-height: 1.3;
 }
@@ -25,18 +24,6 @@ body{
     height: 66px;
 }
 
-#server_list .server_create_and_select .general_create,
-#server_list .server_create_and_select .general_select {
-    width: 120px; height: 33px;
-    float: left;
-}
-
-#server_list .general_create,
-#server_list .general_login {
-    width: 120px; height: 66px;
-    float: left;
-}
-
 .ignore_border {
     border: 0;
     margin: 0;
@@ -45,10 +32,10 @@ body{
 
 #user_info {
     margin-top: 20px;
-    width: 800px; height: 130px;
+    width: 800px;
+    height: 130px;
 }
 
-
 #user_info button {
     width: 200px;
     height: 50px;
@@ -60,82 +47,110 @@ body{
 }
 
 .Entrance_ServerList {
-    width: 800px; height: 64px;
+    width: 800px;
+    height: 64px;
     border: none;
     float: left;
 }
 
 .Entrance_ServerListServer {
-    width: 98px; height: 64px;
+    width: 98px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListDown {
-    width: 698px; height: 64px;
+    width: 698px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListInfo {
-    width: 398px; height: 64px;
+    width: 398px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListBlock {
-    width: 298px; height: 64px;
+    width: 298px;
+    height: 64px;
     float: left;
     line-height: 64px;
 }
 
 .Entrance_ServerListCharacter {
-    width: 64px; height: 64px;
+    width: 64px;
+    height: 64px;
     float: left;
 }
 
 .Entrance_ServerListName {
-    width: 112px; height: 64px;
+    width: 112px;
+    height: 64px;
     float: left;
     line-height: 64px;
 }
 
-
 .Entrance_ServerListSelect {
-    width: 120px; height: 32px;
+    width: 120px;
+    height: 32px;
     float: left;
 }
 
 #Entrance_000003 {
-    width: 798px; height: 155px;
+    width: 798px;
+    height: 155px;
     text-align: left;
 }
 
 .Entrance_Alert {
-    color: red; font-size: 15px; font-weight: bold;
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Che {
-    color: white; font-size: 15px; font-weight: bold;
+    color: white;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Kwe {
-    color: yellow; font-size: 15px; font-weight: bold;
+    color: yellow;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Pwe {
-    color: orange; font-size: 15px; font-weight: bold;
+    color: orange;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Twe {
-    color: magenta; font-size: 15px; font-weight: bold;
+    color: magenta;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Nya {
-    color: #e67e22; font-size: 15px; font-weight: bold;
+    color: #e67e22;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Pya {
-    color: #9b59b6; font-size: 15px; font-weight: bold;
+    color: #9b59b6;
+    font-size: 15px;
+    font-weight: bold;
 }
 
 .Entrance_Hwe {
-    color: red; font-size: 15px; font-weight: bold;
+    color: red;
+    font-size: 15px;
+    font-weight: bold;
+}
+
+.BtnPlate {
+    height: inherit;
 }

css/install.css

@@ -9,7 +9,7 @@ body, html{
 
 h1.title {
    font-size: 50px;
-   font-family: 'Passion One', cursive; 
+   font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
    font-weight: 400;
 }
 

css/join.css

@@ -9,7 +9,7 @@
 
 h1.title {
    font-size: 50px;
-   font-family: 'Passion One', cursive; 
+   font-family: 'Pretendard', 'Apple SD Gothic Neo', 'Noto Sans KR', 'Malgun Gothic';
    font-weight: 400;
 }
 

css/login.css

@@ -1,127 +0,0 @@
-body, html{
-    height: 100%;
-    background-repeat: no-repeat;
-}
-
-.main{
-    margin-top: 70px;
-}
-
-h1.title { 
-   font-size: 50px;
-   font-family: 'Passion One', cursive; 
-   font-weight: 400; 
-}
-
-hr{
-   width: 10%;
-   /*color: #fff;*/
-}
-
-.form-group{
-   margin-bottom: 15px;
-}
-
-label{
-   margin-bottom: 15px;
-}
-
-input,
-input::-webkit-input-placeholder {
-   font-size: 11px;
-   padding-top: 3px;
-}
-
-.main-login{
-    /*background-color: #fff;*/
-   /* shadows and rounded borders */
-   -moz-border-radius: 2px;
-   -webkit-border-radius: 2px;
-   border-radius: 2px;
-   -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-   box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
-
-}
-
-.main-center{
-    margin-top: 30px;
-    margin: 0 auto;
-    max-width: 330px;
-   padding: 40px 40px;
-
-}
-
-.login-button{
-   margin-top: 5px;
-}
-
-.login-register{
-   font-size: 11px;
-   text-align: center;
-}
-
-
-.col-form-label{
-    text-align:center;
-}
-
-.terms{
-    max-height: 200px; overflow-y: auto;
-}
-
-.terms pre{
-    width:100%;
-    white-space: pre-wrap;       /* Since CSS 2.1 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-}
-
-.vertical-center {
-    min-height: 100%;  /* Fallback for browsers do NOT support vh unit */
-    min-height: 100vh; /* These two lines are counted as one :-)       */
-
-    display: flex;
-    align-items: center;
-}
-
-.full-content {
-    position:fixed;
-    left:0;
-    top:0;
-    width:100%;
-    height:100%;
-    margin:0;
-    padding:0;
-    z-index:800;
-}
-
-#btn_kakao_login{
-    cursor: pointer;
-    height:46px;
-    width:116px;
-    background-color: transparent;
-    color:transparent;
-    border:0;
-    background-size: 100%; /* To fill the dimensions of container (button), or */
-    background-repeat: no-repeat;
-    background-position: bottom center;
-    margin-top:5px;
-    background-image:url('../oauth_kakao/kakao_login_join.png');
-}
-
-#btn_kakao_login:hover {
-    background-image:url('../oauth_kakao/kakao_login_join_ov.png');
-} 
-
-#bottom_box{
-    position:fixed;
-    bottom:0;
-    width:100%;
-    left:0;
-}
-#bottom_box .container{
-    text-align:center;
-}

e_lib/download2.js

@@ -1,132 +0,0 @@
-//download.js v3.0, by dandavis; 2008-2014. [CCBY2] see http://danml.com/download.html for tests/usage
-// v1 landed a FF+Chrome compat way of downloading strings to local un-named files, upgraded to use a hidden frame and optional mime
-// v2 added named files via a[download], msSaveBlob, IE (10+) support, and window.URL support for larger+faster saves than dataURLs
-// v3 added dataURL and Blob Input, bind-toggle arity, and legacy dataURL fallback was improved with force-download mime and base64 support
-
-// data can be a string, Blob, File, or dataURL
-
-		 
-						 
-						 
-function download(data, strFileName, strMimeType) {
-	
-	var self = window, // this script is only for browsers anyway...
-		u = "application/octet-stream", // this default mime also triggers iframe downloads
-		m = strMimeType || u, 
-		x = data,
-		D = document,
-		a = D.createElement("a"),
-		z = function(a){return String(a);},
-		
-		
-		B = self.Blob || self.MozBlob || self.WebKitBlob || z,
-		BB = self.MSBlobBuilder || self.WebKitBlobBuilder || self.BlobBuilder,
-		fn = strFileName || "download",
-		blob, 
-		b,
-		ua,
-		fr;
-
-	//if(typeof B.bind === 'function' ){ B=B.bind(self); }
-	
-	if(String(this)==="true"){ //reverse arguments, allowing download.bind(true, "text/xml", "export.xml") to act as a callback
-		x=[x, m];
-		m=x[0];
-		x=x[1]; 
-	}
-	
-	
-	
-	//go ahead and download dataURLs right away
-	if(String(x).match(/^data\:[\w+\-]+\/[\w+\-]+[,;]/)){
-		return navigator.msSaveBlob ?  // IE10 can't do a[download], only Blobs:
-			navigator.msSaveBlob(d2b(x), fn) : 
-			saver(x) ; // everyone else can save dataURLs un-processed
-	}//end if dataURL passed?
-	
-	try{
-	
-		blob = x instanceof B ? 
-			x : 
-			new B([x], {type: m}) ;
-	}catch(y){
-		if(BB){
-			b = new BB();
-			b.append([x]);
-			blob = b.getBlob(m); // the blob
-		}
-		
-	}
-	
-	
-	
-	function d2b(u) {
-		var p= u.split(/[:;,]/),
-		t= p[1],
-		dec= p[2] == "base64" ? atob : decodeURIComponent,
-		bin= dec(p.pop()),
-		mx= bin.length,
-		i= 0,
-		uia= new Uint8Array(mx);
-
-		for(i;i<mx;++i) uia[i]= bin.charCodeAt(i);
-
-		return new B([uia], {type: t});
-	 }
-	  
-	function saver(url, winMode){
-		
-		
-		if ('download' in a) { //html5 A[download] 			
-			a.href = url;
-			a.setAttribute("download", fn);
-			a.innerHTML = "downloading...";
-			D.body.appendChild(a);
-			setTimeout(function() {
-				a.click();
-				D.body.removeChild(a);
-				if(winMode===true){setTimeout(function(){ self.URL.revokeObjectURL(a.href);}, 250 );}
-			}, 66);
-			return true;
-		}
-		
-		//do iframe dataURL download (old ch+FF):
-		var f = D.createElement("iframe");
-		D.body.appendChild(f);
-		if(!winMode){ // force a mime that will download:
-			url="data:"+url.replace(/^data:([\w\/\-\+]+)/, u);
-		}
-		 
-	
-		f.src = url;
-		setTimeout(function(){ D.body.removeChild(f); }, 333);
-		
-	}//end saver 
-		
-
-	if (navigator.msSaveBlob) { // IE10+ : (has Blob, but not a[download] or URL)
-		return navigator.msSaveBlob(blob, fn);
-	} 	
-	
-	if(self.URL){ // simple fast and modern way using Blob and URL:
-		saver(self.URL.createObjectURL(blob), true);
-	}else{
-		// handle non-Blob()+non-URL browsers:
-		if(typeof blob === "string" || blob.constructor===z ){
-			try{
-				return saver( "data:" +  m   + ";base64,"  +  self.btoa(blob)  ); 
-			}catch(y){
-				return saver( "data:" +  m   + "," + encodeURIComponent(blob)  ); 
-			}
-		}
-		
-		// Blob but not URL:
-		fr=new FileReader();
-		fr.onload=function(e){
-			saver(this.result); 
-		};
-		fr.readAsDataURL(blob);
-	}	
-	return true;
-} /* end download() */
-

e_lib/jquery.redirect.js

@@ -1,152 +0,0 @@
-/*
-jQuery Redirect v1.1.1
-
-Copyright (c) 2013-2017 Miguel Galante
-Copyright (c) 2011-2013 Nemanja Avramovic, www.avramovic.info
-
-Licensed under CC BY-SA 4.0 License: http://creativecommons.org/licenses/by-sa/4.0/
-
-This means everyone is allowed to:
-
-Share - copy and redistribute the material in any medium or format
-Adapt - remix, transform, and build upon the material for any purpose, even commercially.
-Under following conditions:
-
-Attribution - You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests the licensor endorses you or your use.
-ShareAlike - If you remix, transform, or build upon the material, you must distribute your contributions under the same license as the original.
-
-*/
-(function ($) {
-    'use strict';
-
-    /**
-     * jQuery Redirect
-     * @param {string} url - Url of the redirection
-     * @param {Object} values - (optional) An object with the data to send. If not present will look for values as QueryString in the target url.
-     * @param {string} method - (optional) The HTTP verb can be GET or POST (defaults to POST)
-     * @param {string} target - (optional) The target of the form. "_blank" will open the url in a new window.
-     * @param {boolean} traditional - (optional) This provides the same function as jquery's ajax function. The brackets are omitted on the field name if its an array.  This allows arrays to work with MVC.net among others.
-     * @param {boolean} redirectTop - (optional) If its called from a iframe, force to navigate the top window. 
-     */
-    $.redirect = function (url, values, method, target, traditional, redirectTop) {
-        redirectTop = redirectTop || false;
-        var generatedForm = $.redirect.getForm(url, values, method, target, traditional);
-        $('body', redirectTop ? window.top.document : undefined).append(generatedForm.form);
-        generatedForm.submit();
-    };
-
-
-    $.redirect.getForm = function (url, values, method, target, traditional) {
-        method = (method && ["GET", "POST", "PUT", "DELETE"].indexOf(method.toUpperCase()) !== -1) ? method.toUpperCase() : 'POST';
-
-        url = url.split("#");
-        var hash = url[1] ? ("#" + url[1]) : "";
-        url = url[0];
-
-        if (!values) {
-            var obj = $.parseUrl(url);
-            url = obj.url;
-            values = obj.params;
-        }
-
-        values = removeNulls(values);
-
-        var form = $('<form>')
-            .attr("method", method)
-            .attr("action", url + hash);
-
-
-        if (target) {
-            form.attr("target", target);
-        }
-
-        var submit = form[0].submit;
-        iterateValues(values, [], form, null, traditional);
-
-        return { form: form, submit: function () { submit.call(form[0]); } };
-    }
-    //Utility Functions
-    /**
-     * Url and QueryString Parser.
-     * @param {string} url - a Url to parse.
-     * @returns {object} an object with the parsed url with the following structure {url: URL, params:{ KEY: VALUE }}
-     */
-    $.parseUrl = function (url) {
-
-        if (url.indexOf('?') === -1) {
-            return {
-                url: url,
-                params: {}
-            };
-        }
-        var parts = url.split('?'),
-            query_string = parts[1],
-            elems = query_string.split('&');
-        url = parts[0];
-
-        var i, pair, obj = {};
-        for (i = 0; i < elems.length; i += 1) {
-            pair = elems[i].split('=');
-            obj[pair[0]] = pair[1];
-        }
-
-        return {
-            url: url,
-            params: obj
-        };
-    };
-
-    //Private Functions
-    var getInput = function (name, value, parent, array, traditional) {
-        var parentString;
-        if (parent.length > 0) {
-            parentString = parent[0];
-            var i;
-            for (i = 1; i < parent.length; i += 1) {
-                parentString += "[" + parent[i] + "]";
-            }
-
-            if (array) {
-                if (traditional)
-                    name = parentString;
-                else
-                    name = parentString + "[" + name + "]";
-            } else {
-                name = parentString + "[" + name + "]";
-            }
-        }
-
-        return $("<input>").attr("type", "hidden")
-            .attr("name", name)
-            .attr("value", value);
-    };
-
-    var iterateValues = function (values, parent, form, isArray, traditional) {
-        var i, iterateParent = [];
-        Object.keys(values).forEach(function (i) {
-            if (typeof values[i] === "object") {
-                iterateParent = parent.slice();
-                iterateParent.push(i);
-                iterateValues(values[i], iterateParent, form, Array.isArray(values[i]), traditional);
-            } else {
-                form.append(getInput(i, values[i], parent, isArray, traditional));
-            }
-        });
-    };
-
-    var removeNulls = function (values) {
-        var propNames = Object.getOwnPropertyNames(values);
-        for (var i = 0; i < propNames.length; i++) {
-            var propName = propNames[i];
-            if (values[propName] === null || values[propName] === undefined) {
-                delete values[propName];
-            } else if (typeof values[propName] === 'object') {
-                values[propName] = removeNulls(values[propName]);
-            } else if (values[propName].length < 1) {
-                delete values[propName];
-            }
-        }
-        return values;
-    };
-
-}(window.jQuery || window.Zepto || window.jqlite));

e_lib/license.txt

@@ -1 +0,0 @@
-TODO : adobdb5, phpmailer5(?), plates, utilphp

e_lib/select2/i18n/ko.js

@@ -0,0 +1,3 @@
+/*! Select2 4.0.13 | https://github.com/select2/select2/blob/master/LICENSE.md */
+
+!function(){if(jQuery&&jQuery.fn&&jQuery.fn.select2&&jQuery.fn.select2.amd)var n=jQuery.fn.select2.amd;n.define("select2/i18n/ko",[],function(){return{errorLoading:function(){return"결과를 불러올 수 없습니다."},inputTooLong:function(n){return"너무 깁니다. "+(n.input.length-n.maximum)+" 글자 지워주세요."},inputTooShort:function(n){return"너무 짧습니다. "+(n.minimum-n.input.length)+" 글자 더 입력해주세요."},loadingMore:function(){return"불러오는 중…"},maximumSelected:function(n){return"최대 "+n.maximum+"개까지만 선택 가능합니다."},noResults:function(){return"결과가 없습니다."},searching:function(){return"검색 중…"},removeAllItems:function(){return"모든 항목 삭제"}}}),n.define,n.require}();

e_lib/select2/select2-bootstrap4.css

@@ -0,0 +1,553 @@
+/* select2-bootstrap4 with Darkly */
+
+.select2-container--bootstrap4 {
+    color: black;
+}
+
+.select2-container--bootstrap4 .select2-selection {
+    background-color: #fff;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+    color: #495057;
+    font-size: 1rem;
+    outline: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection.form-control {
+    border-radius: 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-search--dropdown .select2-search__field {
+    background-color: #fff;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+    color: #495057;
+    font-size: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-search__field {
+    outline: 0;
+}
+
+.select2-container--bootstrap4 .select2-search__field::-webkit-input-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-search__field:-moz-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-search__field::-moz-placeholder {
+    color: #6c757d;
+    opacity: 1;
+}
+
+.select2-container--bootstrap4 .select2-search__field:-ms-input-placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-results__option {
+    padding: 0.75rem 0.375rem;
+    font-size: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option[role=group] {
+    padding: 0;
+}
+
+.select2-container--bootstrap4 .select2-results__option[aria-disabled=true] {
+    color: #6c757d;
+    cursor: not-allowed;
+}
+
+.select2-container--bootstrap4 .select2-results__option[aria-selected=true] {
+    background-color: #f8f9fa;
+    color: #16181b;
+}
+
+.select2-container--bootstrap4 .select2-results__option--highlighted[aria-selected] {
+    background-color: #007bff;
+    color: #fff;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option {
+    padding: 0.75rem 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -0.375rem;
+    padding-left: 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -0.75rem;
+    padding-left: 1.125rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.125rem;
+    padding-left: 1.5rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.5rem;
+    padding-left: 1.875rem;
+}
+
+.select2-container--bootstrap4 .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1.875rem;
+    padding-left: 2.25rem;
+}
+
+.select2-container--bootstrap4 .select2-results__group {
+    color: #6c757d;
+    display: block;
+    padding: 0.75rem 0.375rem;
+    font-size: 75%;
+    line-height: 1;
+    white-space: nowrap;
+}
+
+.select2-container--bootstrap4.select2-container--focus .select2-selection,
+.select2-container--bootstrap4.select2-container--open .select2-selection {
+    transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+    border-color: #80bdff;
+}
+
+@media screen and (prefers-reduced-motion: reduce) {
+    .select2-container--bootstrap4.select2-container--focus .select2-selection,
+    .select2-container--bootstrap4.select2-container--open .select2-selection {
+        transition: none;
+    }
+}
+
+.select2-container--bootstrap4.select2-container--open .select2-selection .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.25rem 0.25rem 0.25rem;
+}
+
+.select2-container--bootstrap4.select2-container--open.select2-container--below .select2-selection {
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    border-bottom-color: transparent;
+}
+
+.select2-container--bootstrap4.select2-container--open.select2-container--above .select2-selection {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border-top-color: transparent;
+}
+
+.select2-container--bootstrap4 .select2-selection__clear {
+    color: #6c757d;
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px;
+}
+
+.select2-container--bootstrap4 .select2-selection__clear:hover {
+    color: #343a40;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection {
+    border-color: #ced4da;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
+.select2-container--bootstrap4.select2-container--disabled .select2-search__field {
+    cursor: not-allowed;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection,
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice {
+    background-color: #e9ecef;
+}
+
+.select2-container--bootstrap4.select2-container--disabled .select2-selection__clear,
+.select2-container--bootstrap4.select2-container--disabled .select2-selection--multiple .select2-selection__choice__remove {
+    display: none;
+}
+
+.select2-container--bootstrap4 .select2-dropdown {
+    border-color: #80bdff;
+    border-width: 1px;
+    overflow-x: hidden;
+    margin-top: -1px;
+}
+
+.select2-container--bootstrap4 .select2-dropdown--above {
+    margin-top: 1px;
+}
+
+.select2-container--bootstrap4 .select2-results>.select2-results__options {
+    max-height: 200px;
+    overflow-y: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--single {
+    height: calc(2.25rem + 2px);
+    line-height: 1;
+    padding: 0.75rem 1.125rem 0.75rem 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    position: absolute;
+    bottom: 0;
+    right: 0.375rem;
+    top: 0;
+    width: 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-color: #6c757d transparent transparent transparent;
+    border-style: solid;
+    border-width: 0.25rem 0.25rem 0 0.25rem;
+    height: 0;
+    left: 0;
+    margin-left: -0.25rem;
+    margin-top: -0.125rem;
+    position: absolute;
+    top: 50%;
+    width: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__rendered {
+    color: #495057;
+    padding: 0;
+}
+
+.select2-container--bootstrap4 .select2-selection--single .select2-selection__placeholder {
+    color: #6c757d;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.25rem + 2px);
+    padding: 0;
+    height: auto;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    display: block;
+    line-height: 1;
+    list-style: none;
+    margin: 0;
+    overflow: hidden;
+    padding: 0.75rem 0.375rem 0 0.75rem;
+    width: 100%;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__placeholder {
+    color: #6c757d;
+    float: left;
+    margin-top: 5px;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    color: #495057;
+    background: transparent;
+    border: 1px solid #343a40;
+    border-radius: 0.25rem;
+    cursor: default;
+    float: left;
+    margin: -0.25rem 0 0 0.1875rem;
+    padding: 0 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    background: transparent;
+    padding: 0 0.375rem;
+    height: calc(2.25rem + 2px)-2;
+    line-height: 1;
+    margin-top: 0;
+    min-width: 5em;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove {
+    color: #6c757d;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 0.375rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice__remove:hover {
+    color: #343a40;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.75rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.2rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px);
+    line-height: 1;
+    padding: 0.5rem 1rem 0.5rem 0.25rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-sm .select2-selection__arrow b,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    margin-left: -0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(1.8125rem + 2px);
+    border-radius: 0.2rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__rendered,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__rendered {
+    padding: 0.5rem 0.25rem 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__choice,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 75%;
+    line-height: 1;
+    margin: 0 0 0 0.125rem;
+    padding: 0 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-search--inline .select2-search__field,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.25rem;
+    font-size: 75%;
+    height: calc(1.8125rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-sm .select2-selection__clear,
+.input-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-sm .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single {
+    border-radius: 0.3rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px);
+    line-height: 1;
+    padding: 1rem 1.4375rem 1rem 0.5rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow {
+    width: 0.3125rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--single.input-lg .select2-selection__arrow b,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--single .select2-selection__arrow b {
+    border-width: 0.3125rem 0.3125rem 0 0.3125rem;
+    margin-left: -0.3125rem;
+    margin-left: -1rem;
+    margin-top: -0.15625rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple {
+    min-height: calc(2.875rem + 2px);
+    border-radius: 0.3rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__choice,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__choice {
+    font-size: 1.25rem;
+    line-height: 1;
+    border-radius: 0.25rem;
+    margin: 0rem 0 0 0.25rem;
+    padding: 0 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-search--inline .select2-search__field,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-search--inline .select2-search__field {
+    padding: 0 0.5rem;
+    font-size: 1.25rem;
+    height: calc(2.875rem + 2px)-2;
+    line-height: 1;
+}
+
+.select2-container--bootstrap4 .select2-selection--multiple.input-lg .select2-selection__clear,
+.input-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear,
+.form-group-lg .select2-container--bootstrap4 .select2-selection--multiple .select2-selection__clear {
+    margin-top: 1rem;
+}
+
+.select2-container--bootstrap4 .select2-selection.input-lg.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.input-group-lg .select2-container--bootstrap4 .select2-selection.select2-container--open .select2-selection--single .select2-selection__arrow b {
+    border-color: transparent transparent #6c757d transparent;
+    border-width: 0 0.3125rem 0.3125rem 0.3125rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single {
+    padding-left: 1.125rem;
+    padding-right: 0.375rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 0;
+    padding-left: 0;
+    text-align: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__clear {
+    float: left;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+    left: 0.375rem;
+    right: auto;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--single .select2-selection__arrow b {
+    margin-left: 0;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+    float: right;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+    margin-left: 0;
+    margin-right: 0.1875rem;
+}
+
+.select2-container--bootstrap4[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+    margin-left: 2px;
+    margin-right: auto;
+}
+
+.has-warning .select2-dropdown,
+.has-warning .select2-selection {
+    border-color: #ffc107;
+}
+
+.has-warning .select2-container--focus .select2-selection,
+.has-warning .select2-container--open .select2-selection {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active {
+    border-color: #d39e00;
+}
+
+.has-warning.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #d39e00;
+}
+
+.has-error .select2-dropdown,
+.has-error .select2-selection {
+    border-color: #dc3545;
+}
+
+.has-error .select2-container--focus .select2-selection,
+.has-error .select2-container--open .select2-selection {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active {
+    border-color: #bd2130;
+}
+
+.has-error.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #bd2130;
+}
+
+.has-success .select2-dropdown,
+.has-success .select2-selection {
+    border-color: #28a745;
+}
+
+.has-success .select2-container--focus .select2-selection,
+.has-success .select2-container--open .select2-selection {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active {
+    border-color: #1e7e34;
+}
+
+.has-success.select2-drop-active.select2-drop.select2-drop-above {
+    border-top-color: #1e7e34;
+}
+
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:first-child+.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child)+.select2-container--bootstrap4:not(:last-child)>.selection>.select2-selection.form-control {
+    border-radius: 0;
+}
+
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection,
+.input-group>.select2-hidden-accessible:not(:first-child):not(:last-child)+.select2-container--bootstrap4:last-child>.selection>.select2-selection.form-control {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.input-group>.select2-container--bootstrap4 {
+    display: table;
+    table-layout: fixed;
+    position: relative;
+    z-index: 2;
+    width: 100%;
+    margin-bottom: 0;
+}
+
+.input-group>.select2-container--bootstrap4>.selection>.select2-selection.form-control {
+    float: none;
+}
+
+.input-group>.select2-container--bootstrap4.select2-container--open,
+.input-group>.select2-container--bootstrap4.select2-container--focus {
+    z-index: 3;
+}
+
+.input-group>.select2-container--bootstrap4,
+.input-group>.select2-container--bootstrap4 .input-group-btn,
+.input-group>.select2-container--bootstrap4 .input-group-btn .btn {
+    vertical-align: top;
+}
+
+.form-control.select2-hidden-accessible {
+    position: absolute !important;
+    width: 1px !important;
+}
+
+@media (min-width: 576px) {
+    .form-inline .select2-container--bootstrap4 {
+        display: inline-block;
+    }
+}

e_lib/select2/select2.css

@@ -0,0 +1,481 @@
+.select2-container {
+  box-sizing: border-box;
+  display: inline-block;
+  margin: 0;
+  position: relative;
+  vertical-align: middle; }
+  .select2-container .select2-selection--single {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    height: 28px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--single .select2-selection__rendered {
+      display: block;
+      padding-left: 8px;
+      padding-right: 20px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+    .select2-container .select2-selection--single .select2-selection__clear {
+      position: relative; }
+  .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered {
+    padding-right: 8px;
+    padding-left: 20px; }
+  .select2-container .select2-selection--multiple {
+    box-sizing: border-box;
+    cursor: pointer;
+    display: block;
+    min-height: 32px;
+    user-select: none;
+    -webkit-user-select: none; }
+    .select2-container .select2-selection--multiple .select2-selection__rendered {
+      display: inline-block;
+      overflow: hidden;
+      padding-left: 8px;
+      text-overflow: ellipsis;
+      white-space: nowrap; }
+  .select2-container .select2-search--inline {
+    float: left; }
+    .select2-container .select2-search--inline .select2-search__field {
+      box-sizing: border-box;
+      border: none;
+      font-size: 100%;
+      margin-top: 5px;
+      padding: 0; }
+      .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button {
+        -webkit-appearance: none; }
+
+.select2-dropdown {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  left: -100000px;
+  width: 100%;
+  z-index: 1051; }
+
+.select2-results {
+  display: block; }
+
+.select2-results__options {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+
+.select2-results__option {
+  padding: 6px;
+  user-select: none;
+  -webkit-user-select: none; }
+  .select2-results__option[aria-selected] {
+    cursor: pointer; }
+
+.select2-container--open .select2-dropdown {
+  left: 0; }
+
+.select2-container--open .select2-dropdown--above {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--open .select2-dropdown--below {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-search--dropdown {
+  display: block;
+  padding: 4px; }
+  .select2-search--dropdown .select2-search__field {
+    padding: 4px;
+    width: 100%;
+    box-sizing: border-box; }
+    .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button {
+      -webkit-appearance: none; }
+  .select2-search--dropdown.select2-search--hide {
+    display: none; }
+
+.select2-close-mask {
+  border: 0;
+  margin: 0;
+  padding: 0;
+  display: block;
+  position: fixed;
+  left: 0;
+  top: 0;
+  min-height: 100%;
+  min-width: 100%;
+  height: auto;
+  width: auto;
+  opacity: 0;
+  z-index: 99;
+  background-color: #fff;
+  filter: alpha(opacity=0); }
+
+.select2-hidden-accessible {
+  border: 0 !important;
+  clip: rect(0 0 0 0) !important;
+  -webkit-clip-path: inset(50%) !important;
+  clip-path: inset(50%) !important;
+  height: 1px !important;
+  overflow: hidden !important;
+  padding: 0 !important;
+  position: absolute !important;
+  width: 1px !important;
+  white-space: nowrap !important; }
+
+.select2-container--default .select2-selection--single {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  border-radius: 4px; }
+  .select2-container--default .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--default .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold; }
+  .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--default .select2-selection--single .select2-selection__arrow {
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px; }
+    .select2-container--default .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  left: 1px;
+  right: auto; }
+
+.select2-container--default.select2-container--disabled .select2-selection--single {
+  background-color: #eee;
+  cursor: default; }
+  .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear {
+    display: none; }
+
+.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b {
+  border-color: transparent transparent #888 transparent;
+  border-width: 0 4px 5px 4px; }
+
+.select2-container--default .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text; }
+  .select2-container--default .select2-selection--multiple .select2-selection__rendered {
+    box-sizing: border-box;
+    list-style: none;
+    margin: 0;
+    padding: 0 5px;
+    width: 100%; }
+    .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
+      list-style: none; }
+  .select2-container--default .select2-selection--multiple .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-top: 5px;
+    margin-right: 10px;
+    padding: 1px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
+    color: #999;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #333; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline {
+  float: right; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: solid black 1px;
+  outline: 0; }
+
+.select2-container--default.select2-container--disabled .select2-selection--multiple {
+  background-color: #eee;
+  cursor: default; }
+
+.select2-container--default.select2-container--disabled .select2-selection__choice__remove {
+  display: none; }
+
+.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--default .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa; }
+
+.select2-container--default .select2-search--inline .select2-search__field {
+  background: transparent;
+  border: none;
+  outline: 0;
+  box-shadow: none;
+  -webkit-appearance: textfield; }
+
+.select2-container--default .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--default .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--default .select2-results__option[aria-disabled=true] {
+  color: #999; }
+
+.select2-container--default .select2-results__option[aria-selected=true] {
+  background-color: #ddd; }
+
+.select2-container--default .select2-results__option .select2-results__option {
+  padding-left: 1em; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__group {
+    padding-left: 0; }
+  .select2-container--default .select2-results__option .select2-results__option .select2-results__option {
+    margin-left: -1em;
+    padding-left: 2em; }
+    .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+      margin-left: -2em;
+      padding-left: 3em; }
+      .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+        margin-left: -3em;
+        padding-left: 4em; }
+        .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+          margin-left: -4em;
+          padding-left: 5em; }
+          .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option {
+            margin-left: -5em;
+            padding-left: 6em; }
+
+.select2-container--default .select2-results__option--highlighted[aria-selected] {
+  background-color: #5897fb;
+  color: white; }
+
+.select2-container--default .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic .select2-selection--single {
+  background-color: #f7f7f7;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  outline: 0;
+  background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%);
+  background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+  .select2-container--classic .select2-selection--single:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--single .select2-selection__rendered {
+    color: #444;
+    line-height: 28px; }
+  .select2-container--classic .select2-selection--single .select2-selection__clear {
+    cursor: pointer;
+    float: right;
+    font-weight: bold;
+    margin-right: 10px; }
+  .select2-container--classic .select2-selection--single .select2-selection__placeholder {
+    color: #999; }
+  .select2-container--classic .select2-selection--single .select2-selection__arrow {
+    background-color: #ddd;
+    border: none;
+    border-left: 1px solid #aaa;
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+    height: 26px;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    width: 20px;
+    background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);
+    background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);
+    background-repeat: repeat-x;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); }
+    .select2-container--classic .select2-selection--single .select2-selection__arrow b {
+      border-color: #888 transparent transparent transparent;
+      border-style: solid;
+      border-width: 5px 4px 0 4px;
+      height: 0;
+      left: 50%;
+      margin-left: -4px;
+      margin-top: -2px;
+      position: absolute;
+      top: 50%;
+      width: 0; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear {
+  float: left; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow {
+  border: none;
+  border-right: 1px solid #aaa;
+  border-radius: 0;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
+  left: 1px;
+  right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--single {
+  border: 1px solid #5897fb; }
+  .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow {
+    background: transparent;
+    border: none; }
+    .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b {
+      border-color: transparent transparent #888 transparent;
+      border-width: 0 4px 5px 4px; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%);
+  background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%);
+  background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); }
+
+.select2-container--classic .select2-selection--multiple {
+  background-color: white;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  cursor: text;
+  outline: 0; }
+  .select2-container--classic .select2-selection--multiple:focus {
+    border: 1px solid #5897fb; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__rendered {
+    list-style: none;
+    margin: 0;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__clear {
+    display: none; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice {
+    background-color: #e4e4e4;
+    border: 1px solid #aaa;
+    border-radius: 4px;
+    cursor: default;
+    float: left;
+    margin-right: 5px;
+    margin-top: 5px;
+    padding: 0 5px; }
+  .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove {
+    color: #888;
+    cursor: pointer;
+    display: inline-block;
+    font-weight: bold;
+    margin-right: 2px; }
+    .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover {
+      color: #555; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice {
+  float: right;
+  margin-left: 5px;
+  margin-right: auto; }
+
+.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove {
+  margin-left: 2px;
+  margin-right: auto; }
+
+.select2-container--classic.select2-container--open .select2-selection--multiple {
+  border: 1px solid #5897fb; }
+
+.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple {
+  border-top: none;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0; }
+
+.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple {
+  border-bottom: none;
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0; }
+
+.select2-container--classic .select2-search--dropdown .select2-search__field {
+  border: 1px solid #aaa;
+  outline: 0; }
+
+.select2-container--classic .select2-search--inline .select2-search__field {
+  outline: 0;
+  box-shadow: none; }
+
+.select2-container--classic .select2-dropdown {
+  background-color: white;
+  border: 1px solid transparent; }
+
+.select2-container--classic .select2-dropdown--above {
+  border-bottom: none; }
+
+.select2-container--classic .select2-dropdown--below {
+  border-top: none; }
+
+.select2-container--classic .select2-results > .select2-results__options {
+  max-height: 200px;
+  overflow-y: auto; }
+
+.select2-container--classic .select2-results__option[role=group] {
+  padding: 0; }
+
+.select2-container--classic .select2-results__option[aria-disabled=true] {
+  color: grey; }
+
+.select2-container--classic .select2-results__option--highlighted[aria-selected] {
+  background-color: #3875d7;
+  color: white; }
+
+.select2-container--classic .select2-results__group {
+  cursor: default;
+  display: block;
+  padding: 6px; }
+
+.select2-container--classic.select2-container--open .select2-dropdown {
+  border-color: #5897fb; }

e_lib/summernote/lang/summernote-ko-KR.js

@@ -1,155 +0,0 @@
-(function($) {
-  $.extend($.summernote.lang, {
-    'ko-KR': {
-      font: {
-        bold: '굵게',
-        italic: '기울임꼴',
-        underline: '밑줄',
-        clear: '글자 효과 없애기',
-        height: '줄간격',
-        name: '글꼴',
-        superscript: '위 첨자',
-        subscript: '아래 첨자',
-        strikethrough: '취소선',
-        size: '글자 크기'
-      },
-      image: {
-        image: '사진',
-        insert: '사진 추가',
-        resizeFull: '100% 크기로 변경',
-        resizeHalf: '50% 크기로 변경',
-        resizeQuarter: '25% 크기로 변경',
-        floatLeft: '왼쪽 정렬',
-        floatRight: '오른쪽 정렬',
-        floatNone: '정렬하지 않음',
-        shapeRounded: '스타일: 둥근 모서리',
-        shapeCircle: '스타일: 원형',
-        shapeThumbnail: '스타일: 액자',
-        shapeNone: '스타일: 없음',
-        dragImageHere: '텍스트 혹은 사진을 이곳으로 끌어오세요',
-        dropImage: '텍스트 혹은 사진을 내려놓으세요',
-        selectFromFiles: '파일 선택',
-        maximumFileSize: 'Maximum file size',
-        maximumFileSizeError: 'Maximum file size exceeded.',
-        url: '사진 URL',
-        remove: '사진 삭제',
-        original: 'Original'
-      },
-      video: {
-        video: '동영상',
-        videoLink: '동영상 링크',
-        insert: '동영상 추가',
-        url: '동영상 URL',
-        providers: '(YouTube, Vimeo, Vine, Instagram, DailyMotion, Youku 사용 가능)'
-      },
-      link: {
-        link: '링크',
-        insert: '링크 추가',
-        unlink: '링크 삭제',
-        edit: '수정',
-        textToDisplay: '링크에 표시할 내용',
-        url: '이동할 URL',
-        openInNewWindow: '새창으로 열기'
-      },
-      table: {
-        table: '테이블',
-        addRowAbove: 'Add row above',
-        addRowBelow: 'Add row below',
-        addColLeft: 'Add column left',
-        addColRight: 'Add column right',
-        delRow: 'Delete row',
-        delCol: 'Delete column',
-        delTable: 'Delete table'
-      },
-      hr: {
-        insert: '구분선 추가'
-      },
-      style: {
-        style: '스타일',
-        p: '본문',
-        blockquote: '인용구',
-        pre: '코드',
-        h1: '제목 1',
-        h2: '제목 2',
-        h3: '제목 3',
-        h4: '제목 4',
-        h5: '제목 5',
-        h6: '제목 6'
-      },
-      lists: {
-        unordered: '글머리 기호',
-        ordered: '번호 매기기'
-      },
-      options: {
-        help: '도움말',
-        fullscreen: '전체 화면',
-        codeview: '코드 보기'
-      },
-      paragraph: {
-        paragraph: '문단 정렬',
-        outdent: '내어쓰기',
-        indent: '들여쓰기',
-        left: '왼쪽 정렬',
-        center: '가운데 정렬',
-        right: '오른쪽 정렬',
-        justify: '양쪽 정렬'
-      },
-      color: {
-        recent: '마지막으로 사용한 색',
-        more: '다른 색 선택',
-        background: '배경색',
-        foreground: '글자색',
-        transparent: '투명',
-        setTransparent: '투명',
-        reset: '취소',
-        resetToDefault: '기본 값으로 변경'
-      },
-      shortcut: {
-        shortcuts: '키보드 단축키',
-        close: '닫기',
-        textFormatting: '글자 스타일 적용',
-        action: '기능',
-        paragraphFormatting: '문단 스타일 적용',
-        documentStyle: '문서 스타일 적용',
-        extraKeys: 'Extra keys'
-      },
-      help: {
-        'insertParagraph': 'Insert Paragraph',
-        'undo': 'Undoes the last command',
-        'redo': 'Redoes the last command',
-        'tab': 'Tab',
-        'untab': 'Untab',
-        'bold': 'Set a bold style',
-        'italic': 'Set a italic style',
-        'underline': 'Set a underline style',
-        'strikethrough': 'Set a strikethrough style',
-        'removeFormat': 'Clean a style',
-        'justifyLeft': 'Set left align',
-        'justifyCenter': 'Set center align',
-        'justifyRight': 'Set right align',
-        'justifyFull': 'Set full align',
-        'insertUnorderedList': 'Toggle unordered list',
-        'insertOrderedList': 'Toggle ordered list',
-        'outdent': 'Outdent on current paragraph',
-        'indent': 'Indent on current paragraph',
-        'formatPara': 'Change current block\'s format as a paragraph(P tag)',
-        'formatH1': 'Change current block\'s format as H1',
-        'formatH2': 'Change current block\'s format as H2',
-        'formatH3': 'Change current block\'s format as H3',
-        'formatH4': 'Change current block\'s format as H4',
-        'formatH5': 'Change current block\'s format as H5',
-        'formatH6': 'Change current block\'s format as H6',
-        'insertHorizontalRule': 'Insert horizontal rule',
-        'linkDialog.show': 'Show Link Dialog'
-      },
-      history: {
-        undo: '실행 취소',
-        redo: '다시 실행'
-      },
-      specialChar: {
-        specialChar: '특수문자',
-        select: '특수문자를 선택하세요'
-      }
-    }
-  });
-})(jQuery);

e_lib/summernote/plugin/databasic/summernote-ext-databasic.css

@@ -1,16 +0,0 @@
-.ext-databasic {
-	position: relative;
-	display: block;
-	min-height: 50px;
-	background-color: cyan;
-	text-align: center;
-	padding: 20px;
-	border: 1px solid white;
-	border-radius: 10px;
-}
-
-.ext-databasic p {
-	color: white;
-	font-size: 1.2em;
-	margin: 0;
-}

e_lib/summernote/plugin/databasic/summernote-ext-databasic.js

@@ -1,292 +0,0 @@
-(function(factory) {
-  /* global define */
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['jquery'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // Node/CommonJS
-    module.exports = factory(require('jquery'));
-  } else {
-    // Browser globals
-    factory(window.jQuery);
-  }
-}(function($) {
-  // pull in some summernote core functions
-  var ui = $.summernote.ui;
-  var dom = $.summernote.dom;
-
-  // define the popover plugin
-  var DataBasicPlugin = function(context) {
-    var self = this;
-    var options = context.options;
-    var lang = options.langInfo;
-
-    self.icon = '<i class="fa fa-object-group"/>';
-
-    // add context menu button for dialog
-    context.memo('button.databasic', function() {
-      return ui.button({
-        contents: self.icon,
-        tooltip: lang.databasic.insert,
-        click: context.createInvokeHandler('databasic.showDialog')
-      }).render();
-    });
-
-    // add popover edit button
-    context.memo('button.databasicDialog', function() {
-      return ui.button({
-        contents: self.icon,
-        tooltip: lang.databasic.edit,
-        click: context.createInvokeHandler('databasic.showDialog')
-      }).render();
-    });
-
-    //  add popover size buttons
-    context.memo('button.databasicSize100', function() {
-      return ui.button({
-        contents: '<span class="note-fontsize-10">100%</span>',
-        tooltip: lang.image.resizeFull,
-        click: context.createInvokeHandler('editor.resize', '1')
-      }).render();
-    });
-    context.memo('button.databasicSize50', function() {
-      return ui.button({
-        contents: '<span class="note-fontsize-10">50%</span>',
-        tooltip: lang.image.resizeHalf,
-        click: context.createInvokeHandler('editor.resize', '0.5')
-      }).render();
-    });
-    context.memo('button.databasicSize25', function() {
-      return ui.button({
-        contents: '<span class="note-fontsize-10">25%</span>',
-        tooltip: lang.image.resizeQuarter,
-        click: context.createInvokeHandler('editor.resize', '0.25')
-      }).render();
-    });
-
-    self.events = {
-      'summernote.init': function(we, e) {
-        // update existing containers
-        $('data.ext-databasic', e.editable).each(function() { self.setContent($(this)); });
-        // TODO: make this an undo snapshot...
-      },
-      'summernote.keyup summernote.mouseup summernote.change summernote.scroll': function() {
-        self.update();
-      },
-      'summernote.dialog.shown': function() {
-        self.hidePopover();
-      }
-    };
-
-    self.initialize = function() {
-      // create dialog markup
-      var $container = options.dialogsInBody ? $(document.body) : context.layoutInfo.editor;
-
-      var body = '<div class="form-group row-fluid">' +
-          '<label>' + lang.databasic.testLabel + '</label>' +
-          '<input class="ext-databasic-test form-control" type="text" />' +
-          '</div>';
-      var footer = '<button href="#" class="btn btn-primary ext-databasic-save">' + lang.databasic.insert + '</button>';
-
-      self.$dialog = ui.dialog({
-        title: lang.databasic.name,
-        fade: options.dialogsFade,
-        body: body,
-        footer: footer
-      }).render().appendTo($container);
-
-      // create popover
-      self.$popover = ui.popover({
-        className: 'ext-databasic-popover'
-      }).render().appendTo('body');
-      var $content = self.$popover.find('.popover-content');
-
-      context.invoke('buttons.build', $content, options.popover.databasic);
-    };
-
-    self.destroy = function() {
-      self.$popover.remove();
-      self.$popover = null;
-      self.$dialog.remove();
-      self.$dialog = null;
-    };
-
-    self.update = function() {
-      // Prevent focusing on editable when invoke('code') is executed
-      if (!context.invoke('editor.hasFocus')) {
-        self.hidePopover();
-        return;
-      }
-
-      var rng = context.invoke('editor.createRange');
-      var visible = false;
-
-      if (rng.isOnData()) {
-        var $data = $(rng.sc).closest('data.ext-databasic');
-
-        if ($data.length) {
-          var pos = dom.posFromPlaceholder($data[0]);
-
-          self.$popover.css({
-            display: 'block',
-            left: pos.left,
-            top: pos.top
-          });
-
-          // save editor target to let size buttons resize the container
-          context.invoke('editor.saveTarget', $data[0]);
-
-          visible = true;
-        }
-      }
-
-      // hide if not visible
-      if (!visible) {
-        self.hidePopover();
-      }
-    };
-
-    self.hidePopover = function() {
-      self.$popover.hide();
-    };
-
-    // define plugin dialog
-    self.getInfo = function() {
-      var rng = context.invoke('editor.createRange');
-
-      if (rng.isOnData()) {
-        var $data = $(rng.sc).closest('data.ext-databasic');
-
-        if ($data.length) {
-          // Get the first node on range(for edit).
-          return {
-            node: $data,
-            test: $data.attr('data-test')
-          };
-        }
-      }
-
-      return {};
-    };
-
-    self.setContent = function($node) {
-      $node.html('<p contenteditable="false">' + self.icon + ' ' + lang.databasic.name + ': ' +
-        $node.attr('data-test') + '</p>');
-    };
-
-    self.updateNode = function(info) {
-      self.setContent(info.node
-        .attr('data-test', info.test));
-    };
-
-    self.createNode = function(info) {
-      var $node = $('<data class="ext-databasic"></data>');
-
-      if ($node) {
-        // save node to info structure
-        info.node = $node;
-        // insert node into editor dom
-        context.invoke('editor.insertNode', $node[0]);
-      }
-
-      return $node;
-    };
-
-    self.showDialog = function() {
-      var info = self.getInfo();
-      var newNode = !info.node;
-      context.invoke('editor.saveRange');
-
-      self
-        .openDialog(info)
-        .then(function(dialogInfo) {
-          // [workaround] hide dialog before restore range for IE range focus
-          ui.hideDialog(self.$dialog);
-          context.invoke('editor.restoreRange');
-
-          // insert a new node
-          if (newNode) {
-            self.createNode(info);
-          }
-
-          // update info with dialog info
-          $.extend(info, dialogInfo);
-
-          self.updateNode(info);
-        })
-        .fail(function() {
-          context.invoke('editor.restoreRange');
-        });
-    };
-
-    self.openDialog = function(info) {
-      return $.Deferred(function(deferred) {
-        var $inpTest = self.$dialog.find('.ext-databasic-test');
-        var $saveBtn = self.$dialog.find('.ext-databasic-save');
-        var onKeyup = function(event) {
-          if (event.keyCode === 13) {
-            $saveBtn.trigger('click');
-          }
-        };
-
-        ui.onDialogShown(self.$dialog, function() {
-          context.triggerEvent('dialog.shown');
-
-          $inpTest.val(info.test).on('input', function() {
-            ui.toggleBtn($saveBtn, $inpTest.val());
-          }).trigger('focus').on('keyup', onKeyup);
-
-          $saveBtn
-            .text(info.node ? lang.databasic.edit : lang.databasic.insert)
-            .click(function(event) {
-              event.preventDefault();
-
-              deferred.resolve({ test: $inpTest.val() });
-            });
-
-          // init save button
-          ui.toggleBtn($saveBtn, $inpTest.val());
-        });
-
-        ui.onDialogHidden(self.$dialog, function() {
-          $inpTest.off('input keyup');
-          $saveBtn.off('click');
-
-          if (deferred.state() === 'pending') {
-            deferred.reject();
-          }
-        });
-
-        ui.showDialog(self.$dialog);
-      });
-    };
-  };
-
-  // Extends summernote
-  $.extend(true, $.summernote, {
-    plugins: {
-      databasic: DataBasicPlugin
-    },
-
-    options: {
-      popover: {
-        databasic: [
-          ['databasic', ['databasicDialog', 'databasicSize100', 'databasicSize50', 'databasicSize25']]
-        ]
-      }
-    },
-
-    // add localization texts
-    lang: {
-      'en-US': {
-        databasic: {
-          name: 'Basic Data Container',
-          insert: 'insert basic data container',
-          edit: 'edit basic data container',
-          testLabel: 'test input'
-        }
-      }
-    }
-
-  });
-}));

e_lib/summernote/plugin/hello/summernote-ext-hello.js

@@ -1,81 +0,0 @@
-(function(factory) {
-  /* global define */
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['jquery'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // Node/CommonJS
-    module.exports = factory(require('jquery'));
-  } else {
-    // Browser globals
-    factory(window.jQuery);
-  }
-}(function($) {
-  // Extends plugins for adding hello.
-  //  - plugin is external module for customizing.
-  $.extend($.summernote.plugins, {
-    /**
-     * @param {Object} context - context object has status of editor.
-     */
-    'hello': function(context) {
-      var self = this;
-
-      // ui has renders to build ui elements.
-      //  - you can create a button with `ui.button`
-      var ui = $.summernote.ui;
-
-      // add hello button
-      context.memo('button.hello', function() {
-        // create button
-        var button = ui.button({
-          contents: '<i class="fa fa-child"/> Hello',
-          tooltip: 'hello',
-          click: function() {
-            self.$panel.show();
-            self.$panel.hide(500);
-            // invoke insertText method with 'hello' on editor module.
-            context.invoke('editor.insertText', 'hello');
-          }
-        });
-
-        // create jQuery object from button instance.
-        var $hello = button.render();
-        return $hello;
-      });
-
-      // This events will be attached when editor is initialized.
-      this.events = {
-        // This will be called after modules are initialized.
-        'summernote.init': function(we, e) {
-          console.log('summernote initialized', we, e);
-        },
-        // This will be called when user releases a key on editable.
-        'summernote.keyup': function(we, e) {
-          console.log('summernote keyup', we, e);
-        }
-      };
-
-      // This method will be called when editor is initialized by $('..').summernote();
-      // You can create elements for plugin
-      this.initialize = function() {
-        this.$panel = $('<div class="hello-panel"/>').css({
-          position: 'absolute',
-          width: 100,
-          height: 100,
-          left: '50%',
-          top: '50%',
-          background: 'red'
-        }).hide();
-
-        this.$panel.appendTo('body');
-      };
-
-      // This methods will be called when editor is destroyed by $('..').summernote('destroy');
-      // You should remove elements on `initialize`.
-      this.destroy = function() {
-        this.$panel.remove();
-        this.$panel = null;
-      };
-    }
-  });
-}));

e_lib/summernote/plugin/specialchars/summernote-ext-specialchars.js

@@ -1,312 +0,0 @@
-(function(factory) {
-  /* global define */
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as an anonymous module.
-    define(['jquery'], factory);
-  } else if (typeof module === 'object' && module.exports) {
-    // Node/CommonJS
-    module.exports = factory(require('jquery'));
-  } else {
-    // Browser globals
-    factory(window.jQuery);
-  }
-}(function($) {
-  $.extend($.summernote.plugins, {
-    'specialchars': function(context) {
-      var self = this;
-      var ui = $.summernote.ui;
-
-      var $editor = context.layoutInfo.editor;
-      var options = context.options;
-      var lang = options.langInfo;
-
-      var KEY = {
-        UP: 38,
-        DOWN: 40,
-        LEFT: 37,
-        RIGHT: 39,
-        ENTER: 13
-      };
-      var COLUMN_LENGTH = 15;
-      var COLUMN_WIDTH = 35;
-
-      var currentColumn = 0;
-      var currentRow = 0;
-      var totalColumn = 0;
-      var totalRow = 0;
-
-      // special characters data set
-      var specialCharDataSet = [
-        '"', '&', '<', '>', '¡', '¢',
-        '£', '¤', '¥', '¦', '§',
-        '¨', '©', 'ª', '«', '¬',
-        '®', '¯', '°', '±', '²',
-        '³', '´', 'µ', '¶', '·',
-        '¸', '¹', 'º', '»', '¼',
-        '½', '¾', '¿', '×', '÷',
-        'ƒ', 'ˆ', '˜', '–', '—',
-        '‘', '’', '‚', '“', '”',
-        '„', '†', '‡', '•', '…',
-        '‰', '′', '″', '‹', '›',
-        '‾', '⁄', '€', 'ℑ', '℘',
-        'ℜ', '™', 'ℵ', '←', '↑',
-        '→', '↓', '↔', '↵', '⇐',
-        '⇑', '⇒', '⇓', '⇔', '∀',
-        '∂', '∃', '∅', '∇', '∈',
-        '∉', '∋', '∏', '∑', '−',
-        '∗', '√', '∝', '∞', '∠',
-        '∧', '∨', '∩', '∪', '∫',
-        '∴', '∼', '≅', '≈', '≠',
-        '≡', '≤', '≥', '⊂', '⊃',
-        '⊄', '⊆', '⊇', '⊕', '⊗',
-        '⊥', '⋅', '⌈', '⌉', '⌊',
-        '⌋', '◊', '♠', '♣', '♥',
-        '♦'
-      ];
-
-      context.memo('button.specialchars', function() {
-        return ui.button({
-          contents: '<i class="fa fa-font fa-flip-vertical">',
-          tooltip: lang.specialChar.specialChar,
-          click: function() {
-            self.show();
-          }
-        }).render();
-      });
-
-      /**
-       * Make Special Characters Table
-       *
-       * @member plugin.specialChar
-       * @private
-       * @return {jQuery}
-       */
-      this.makeSpecialCharSetTable = function() {
-        var $table = $('<table/>');
-        $.each(specialCharDataSet, function(idx, text) {
-          var $td = $('<td/>').addClass('note-specialchar-node');
-          var $tr = (idx % COLUMN_LENGTH === 0) ? $('<tr/>') : $table.find('tr').last();
-
-          var $button = ui.button({
-            callback: function($node) {
-              $node.html(text);
-              $node.attr('title', text);
-              $node.attr('data-value', encodeURIComponent(text));
-              $node.css({
-                width: COLUMN_WIDTH,
-                'margin-right': '2px',
-                'margin-bottom': '2px'
-              });
-            }
-          }).render();
-
-          $td.append($button);
-
-          $tr.append($td);
-          if (idx % COLUMN_LENGTH === 0) {
-            $table.append($tr);
-          }
-        });
-
-        totalRow = $table.find('tr').length;
-        totalColumn = COLUMN_LENGTH;
-
-        return $table;
-      };
-
-      this.initialize = function() {
-        var $container = options.dialogsInBody ? $(document.body) : $editor;
-
-        var body = '<div class="form-group row-fluid">' + this.makeSpecialCharSetTable()[0].outerHTML + '</div>';
-
-        this.$dialog = ui.dialog({
-          title: lang.specialChar.select,
-          body: body
-        }).render().appendTo($container);
-      };
-
-      this.show = function() {
-        var text = context.invoke('editor.getSelectedText');
-        context.invoke('editor.saveRange');
-        this.showSpecialCharDialog(text).then(function(selectChar) {
-          context.invoke('editor.restoreRange');
-
-          // build node
-          var $node = $('<span></span>').html(selectChar)[0];
-
-          if ($node) {
-            // insert video node
-            context.invoke('editor.insertNode', $node);
-          }
-        }).fail(function() {
-          context.invoke('editor.restoreRange');
-        });
-      };
-
-      /**
-       * show image dialog
-       *
-       * @param {jQuery} $dialog
-       * @return {Promise}
-       */
-      this.showSpecialCharDialog = function(text) {
-        return $.Deferred(function(deferred) {
-          var $specialCharDialog = self.$dialog;
-          var $specialCharNode = $specialCharDialog.find('.note-specialchar-node');
-          var $selectedNode = null;
-          var ARROW_KEYS = [KEY.UP, KEY.DOWN, KEY.LEFT, KEY.RIGHT];
-          var ENTER_KEY = KEY.ENTER;
-
-          function addActiveClass($target) {
-            if (!$target) {
-              return;
-            }
-            $target.find('button').addClass('active');
-            $selectedNode = $target;
-          }
-
-          function removeActiveClass($target) {
-            $target.find('button').removeClass('active');
-            $selectedNode = null;
-          }
-
-          // find next node
-          function findNextNode(row, column) {
-            var findNode = null;
-            $.each($specialCharNode, function(idx, $node) {
-              var findRow = Math.ceil((idx + 1) / COLUMN_LENGTH);
-              var findColumn = ((idx + 1) % COLUMN_LENGTH === 0) ? COLUMN_LENGTH : (idx + 1) % COLUMN_LENGTH;
-              if (findRow === row && findColumn === column) {
-                findNode = $node;
-                return false;
-              }
-            });
-            return $(findNode);
-          }
-
-          function arrowKeyHandler(keyCode) {
-            // left, right, up, down key
-            var $nextNode;
-            var lastRowColumnLength = $specialCharNode.length % totalColumn;
-
-            if (KEY.LEFT === keyCode) {
-              if (currentColumn > 1) {
-                currentColumn = currentColumn - 1;
-              } else if (currentRow === 1 && currentColumn === 1) {
-                currentColumn = lastRowColumnLength;
-                currentRow = totalRow;
-              } else {
-                currentColumn = totalColumn;
-                currentRow = currentRow - 1;
-              }
-            } else if (KEY.RIGHT === keyCode) {
-              if (currentRow === totalRow && lastRowColumnLength === currentColumn) {
-                currentColumn = 1;
-                currentRow = 1;
-              } else if (currentColumn < totalColumn) {
-                currentColumn = currentColumn + 1;
-              } else {
-                currentColumn = 1;
-                currentRow = currentRow + 1;
-              }
-            } else if (KEY.UP === keyCode) {
-              if (currentRow === 1 && lastRowColumnLength < currentColumn) {
-                currentRow = totalRow - 1;
-              } else {
-                currentRow = currentRow - 1;
-              }
-            } else if (KEY.DOWN === keyCode) {
-              currentRow = currentRow + 1;
-            }
-
-            if (currentRow === totalRow && currentColumn > lastRowColumnLength) {
-              currentRow = 1;
-            } else if (currentRow > totalRow) {
-              currentRow = 1;
-            } else if (currentRow < 1) {
-              currentRow = totalRow;
-            }
-
-            $nextNode = findNextNode(currentRow, currentColumn);
-
-            if ($nextNode) {
-              removeActiveClass($selectedNode);
-              addActiveClass($nextNode);
-            }
-          }
-
-          function enterKeyHandler() {
-            if (!$selectedNode) {
-              return;
-            }
-
-            deferred.resolve(decodeURIComponent($selectedNode.find('button').attr('data-value')));
-            $specialCharDialog.modal('hide');
-          }
-
-          function keyDownEventHandler(event) {
-            event.preventDefault();
-            var keyCode = event.keyCode;
-            if (keyCode === undefined || keyCode === null) {
-              return;
-            }
-            // check arrowKeys match
-            if (ARROW_KEYS.indexOf(keyCode) > -1) {
-              if ($selectedNode === null) {
-                addActiveClass($specialCharNode.eq(0));
-                currentColumn = 1;
-                currentRow = 1;
-                return;
-              }
-              arrowKeyHandler(keyCode);
-            } else if (keyCode === ENTER_KEY) {
-              enterKeyHandler();
-            }
-            return false;
-          }
-
-          // remove class
-          removeActiveClass($specialCharNode);
-
-          // find selected node
-          if (text) {
-            for (var i = 0; i < $specialCharNode.length; i++) {
-              var $checkNode = $($specialCharNode[i]);
-              if ($checkNode.text() === text) {
-                addActiveClass($checkNode);
-                currentRow = Math.ceil((i + 1) / COLUMN_LENGTH);
-                currentColumn = (i + 1) % COLUMN_LENGTH;
-              }
-            }
-          }
-
-          ui.onDialogShown(self.$dialog, function() {
-            $(document).on('keydown', keyDownEventHandler);
-
-            self.$dialog.find('button').tooltip();
-
-            $specialCharNode.on('click', function(event) {
-              event.preventDefault();
-              deferred.resolve(decodeURIComponent($(event.currentTarget).find('button').attr('data-value')));
-              ui.hideDialog(self.$dialog);
-            });
-          });
-
-          ui.onDialogHidden(self.$dialog, function() {
-            $specialCharNode.off('click');
-
-            self.$dialog.find('button').tooltip('destroy');
-
-            $(document).off('keydown', keyDownEventHandler);
-
-            if (deferred.state() === 'pending') {
-              deferred.reject();
-            }
-          });
-
-          ui.showDialog(self.$dialog);
-        });
-      };
-    }
-  });
-}));

f_config/config.php

@@ -1,20 +1,20 @@
 <?php
+
 namespace sammo;
 
-define('ROOT', realpath(__dir__.'/..'));
+define('ROOT', realpath(__DIR__ . '/..'));
 setlocale(LC_ALL, 'ko_KR.UTF-8');
 date_default_timezone_set('Asia/Seoul');
 mb_internal_encoding("UTF-8");
 mb_http_output('UTF-8');
 mb_regex_encoding('UTF-8');
 
-ini_set("session.cache_expire", 10080);      // minutes
-ini_set("session.gc_maxlifetime", 604800);    // seconds
+ini_set("session.cache_expire", '10080');      // minutes
+ini_set("session.gc_maxlifetime", '604800');    // seconds
 
 function getFriendlyErrorType($type)
 {
-    switch($type) 
-    { 
+    switch ($type) {
         case E_ERROR: // 1 //
             return 'E_ERROR';
         case E_WARNING: // 2 //
@@ -49,7 +49,8 @@ function getFriendlyErrorType($type)
     return "{$type}";
 }
 
-function getExceptionTraceAsString($exception) {
+function getExceptionTraceAsString($exception)
+{
     //https://gist.github.com/abtris/1437966
     $rtn = "";
     $count = 0;
@@ -77,34 +78,47 @@ function getExceptionTraceAsString($exception) {
             }
             $args = join(", ", $args);
         }
-        $rtn[] = sprintf( "#%s %s:%s %s(%s)",
+        $rtn[] = sprintf(
+            "#%s %s:%s %s(%s)",
             $count,
             isset($frame['file']) ? $frame['file'] : 'unknown file',
             isset($frame['line']) ? $frame['line'] : 'unknown line',
             (isset($frame['class']))  ? $frame['class'] . $frame['type'] . $frame['function'] : $frame['function'],
-                                 $args );
+            $args
+        );
         $count++;
     }
     return $rtn;
 }
 
-function logError(string $err, string $errstr, array $trace){
+function logError(string $err, string $errstr, string $errpath, array $trace)
+{
     $fdb = FileDB::db(ROOT . '/d_log/err_log.sqlite3', ROOT . '/f_install/sql/err_log.sql');
     $date = date("Ymd_His");
 
+    $errpath = str_replace(ROOT, '{ROOT}', $errpath);
     $trace = array_map(function (string $text) {
         return str_replace(ROOT, '{ROOT}', $text);
     }, $trace);
 
+    $owner = Util::get_client_ip();
+    $session = Session::getInstance();
+    if ($session->isLoggedIn(true)) {
+        $owner .= '(' . $session->getUserID() . ',' . $session->userName . ')';
+    }
+
     $fdb->insert('err_log', [
         'date' => $date,
         'err' => $err,
         'errstr' => $errstr,
-        'trace'=>Json::encode($trace)
+        'errpath' => $errpath,
+        'trace' => Json::encode($trace),
+        'webuser' => $owner
     ]);
 }
 
-function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext){
+function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, int $errline, array $errcontext=null)
+{
     if (!(error_reporting() & $errno)) {
         // This error code is not included in error_reporting, so let it fall
         // through to the standard PHP error handler
@@ -116,16 +130,20 @@ function logErrorByCustomHandler(int $errno, string $errstr, string $errfile, in
     logError(
         getFriendlyErrorType($errno),
         $errstr,
+        $errfile . ':' . $errline,
         getExceptionTraceAsString($e)
     );
 }
-set_error_handler("\sammo\logErrorByCustomHandler");
+set_error_handler("\\sammo\\logErrorByCustomHandler");
 
 
-function logExceptionByCustomHandler(\Throwable $e){
+function logExceptionByCustomHandler(\Throwable $e)
+{
+
     logError(
         get_class($e),
         $e->getMessage(),
+        $e->getFile() . ':' . $e->getLine(),
         getExceptionTraceAsString($e)
     );
 
@@ -133,3 +151,28 @@ function logExceptionByCustomHandler(\Throwable $e){
     throw $e;
 }
 set_exception_handler('\\sammo\\logExceptionByCustomHandler');
+
+function getAPIExecutorClass($path){
+
+    static $basePath = __NAMESPACE__.'\\API\\';
+    if(is_string($path)){
+    }
+    else if(is_array($path)){
+        $path = join('\\', $path);
+    }
+    else{
+        throw new \InvalidArgumentException("{$path}는 올바른 API 지시자가 아님");
+    }
+
+    $classPath = str_replace('/', '\\', $basePath.$path);
+
+    if(class_exists($classPath)){
+        return $classPath;
+    }
+    throw new \InvalidArgumentException("{$path}는 올바른 API 경로가 아님");
+}
+
+function buildAPIExecutorClass($type, string $rootPath, array $args):\sammo\BaseAPI{
+    $class = getAPIExecutorClass($type);
+    return new $class($rootPath, $args);
+}

f_install/install.php

@@ -1,25 +1,32 @@
 <?php
+
 namespace sammo;
 
-require(__dir__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');
 
 ?>
 <!DOCTYPE html>
 <html lang="ko">
+
 <head>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <title>설치</title>
-    <?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-    <?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-    <?=WebUtil::printJS('../e_lib/jquery.validate.min.js')?>
-    <?=WebUtil::printJS('../e_lib/sha512.min.js')?>
-    <?=WebUtil::printJS('../js/common.js')?>
-    <?=WebUtil::printJS('../js/install.js')?>
-    <?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+    <?php /* NOTE: 설치 이전에는 ServConfig가 준비되어있지 않으므로 예외로 수동 지정 */ ?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/vendors.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/vendor.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/common_ts.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/common_ts.css') ?>
+    <?= WebUtil::printJS('../dist_js/gateway/install.js') ?>
+    <?= WebUtil::printCSS('../dist_js/gateway/install.css') ?>
+
     <?= WebUtil::printCSS('../css/install.css') ?>
+
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <div class="container">
         <h1 class="row justify-content-md-center">삼국지 모의전투 HiDCHe 설치</h1>
@@ -35,16 +42,14 @@ require(__dir__.'/../vendor/autoload.php');
                             <div class="form-group row">
                                 <label for="db_host" class="col-sm-4 col-form-label">DB호스트</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_host" id="db_host" 
-                             placeholder="호스트" value="localhost" />
+                                    <input type="text" class="form-control" name="db_host" id="db_host" placeholder="호스트" value="localhost" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="db_port" class="col-sm-4 col-form-label">DB포트</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_port" id="db_port" 
-                             placeholder="접속 포트" value="3306" />
+                                    <input type="text" class="form-control" name="db_port" id="db_port" placeholder="접속 포트" value="3306" />
                                 </div>
                             </div>
 
@@ -59,55 +64,74 @@ require(__dir__.'/../vendor/autoload.php');
                             <div class="form-group row">
                                 <label for="db_pw" class="col-sm-4 col-form-label">DB비밀번호</label>
                                 <div class="col-sm-8">
-                            <input type="password" class="form-control" name="db_pw" id="db_pw" 
-                             placeholder="DB비밀번호"/>
+                                    <input type="password" class="form-control" name="db_pw" id="db_pw" placeholder="DB비밀번호" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="db_name" class="col-sm-4 col-form-label">DB명</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="db_name" id="db_name" 
-                             placeholder="DB명(예:sammo)"/>
+                                    <input type="text" class="form-control" name="db_name" id="db_name" placeholder="DB명(예:sammo)" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="serv_host" class="col-sm-4 col-form-label">접속 경로</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="serv_host" id="serv_host" 
-                            placeholder="접속경로(예:http://www.example.com)"/>
+                                    <input type="text" class="form-control" name="serv_host" id="serv_host" placeholder="접속경로(예:http://www.example.com)" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="shared_icon_path" class="col-sm-4 col-form-label">공용 아이콘 주소</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path" 
-                            placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/icons" />
+                                    <input type="text" class="form-control" name="shared_icon_path" id="shared_icon_path" placeholder="공용 아이콘 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/icons" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="game_image_path" class="col-sm-4 col-form-label">게임 이미지 주소</label>
                                 <div class="col-sm-8">
-                            <input type="text" class="form-control" name="game_image_path" id="game_image_path" 
-                            placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)"
-                            value="../image/game" />
+                                    <input type="text" class="form-control" name="game_image_path" id="game_image_path" placeholder="게임 이미지 주소(웹 주소, 또는 접속 경로에 따른 상대 주소)" value="../image/game" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="image_request_key" class="col-sm-4 col-form-label">이미지 갱신 키</label>
+                                <div class="input-group col-sm-8">
+                                    <input type="text" class="form-control" name="image_request_key" id="image_request_key" placeholder="이미지 서버의 hook/HashKey.php의 값과 동일하게" value="" />
+                                    <div class="input-group-text">
+                                        <button id="btn_random_generate_key" class="btn btn-secondary" type="button">랜덤 생성</button>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <hr style="width:100%; border-top: 1px solid lightgray;">
+
+                            <div class="form-group row">
+                                <label for="kakao_rest_key" class="col-sm-4 col-form-label">카카오 API Rest Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_rest_key" id="kakao_rest_key" placeholder="카카오톡 API의 Rest Key" value="" />
+                                </div>
+                            </div>
+
+                            <div class="form-group row">
+                                <label for="kakao_admin_key" class="col-sm-4 col-form-label">카카오 API Admin Key</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" name="kakao_admin_key" id="kakao_admin_key" placeholder="카카오톡 API의 Admin Key" value="" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <div class="col-sm-4"></div>
                                 <div class="col-sm-8">
-                            <button type="submit" 
-                            class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">설정 파일 생성</button>
                                 </div>
                             </div>
                         </form>
                     </div>
-        </div><!--DB 폼 끝-->
+                </div>
+                <!--DB 폼 끝-->
 
                 <div class="card" id="admin_form_card" style="display:none">
                     <h3 class="card-header">
@@ -118,8 +142,7 @@ require(__dir__.'/../vendor/autoload.php');
                             <div class="form-group row">
                                 <label for="username" class="col-sm-3 col-form-label">계정명</label>
                                 <div class="col-sm-9">
-                            <input type="text" class="form-control" name="username" id="username"
-                              placeholder="계정명"/>
+                                    <input type="text" class="form-control" name="username" id="username" placeholder="계정명" />
                                 </div>
                             </div>
 
@@ -127,24 +150,21 @@ require(__dir__.'/../vendor/autoload.php');
                             <div class="form-group row">
                                 <label for="password" class="col-sm-3 col-form-label">비밀번호</label>
                                 <div class="col-sm-9">
-                            <input type="password" class="form-control" name="password" id="password" 
-                             placeholder="비밀번호"/>
+                                    <input type="password" class="form-control" name="password" id="password" placeholder="비밀번호" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="confirm_password" class="col-sm-3 col-form-label">비밀번호 확인</label>
                                 <div class="col-sm-9">
-                            <input type="password" class="form-control" name="confirm_password" id="confirm_password" 
-                             placeholder="비밀번호 확인"/>
+                                    <input type="password" class="form-control" name="confirm_password" id="confirm_password" placeholder="비밀번호 확인" />
                                 </div>
                             </div>
 
                             <div class="form-group row">
                                 <label for="nickname" class="col-sm-3 col-form-label">닉네임</label>
                                 <div class="col-sm-9">
-                            <input type="text" class="form-control" name="nickname" id="nickname" 
-                             placeholder="닉네임" value="운영자"/>
+                                    <input type="text" class="form-control" name="nickname" id="nickname" placeholder="닉네임" value="운영자" />
                                 </div>
                             </div>
 
@@ -153,13 +173,13 @@ require(__dir__.'/../vendor/autoload.php');
                             <div class="form-group row">
                                 <div class="col-sm-3"></div>
                                 <div class="col-sm-9">
-                            <button type="submit"
-                             class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
+                                    <button type="submit" class="btn btn-primary btn-lg btn-block login-button">관리자 계정 생성</button>
                                 </div>
                             </div>
                         </form>
                     </div>
-        </div><!--ADMIN 폼 끝-->
+                </div>
+                <!--ADMIN 폼 끝-->
 
                 <!-- TODO: conf_kakao.php -->
 
@@ -167,4 +187,5 @@ require(__dir__.'/../vendor/autoload.php');
         </div>
     </div>
 </body>
+
 </html>

f_install/j_create_admin.php

@@ -1,14 +1,15 @@
 <?php
+
 namespace sammo;
 
-require(__dir__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');
 
 session_start();
 session_destroy();
 
-$username = mb_strtolower(Util::getReq('username'), 'utf-8');
-$password = Util::getReq('password', 'string');
-$nickname = Util::getReq('nickname');
+$username = mb_strtolower(Util::getPost('username'), 'utf-8');
+$password = Util::getPost('password', 'string');
+$nickname = Util::getPost('nickname');
 
 if (!$username || !$password || !$nickname) {
     Json::die([
@@ -46,12 +47,13 @@ if($memberCnt > 0){
 
 $userSalt = bin2hex(random_bytes(8));
 $finalPassword = Util::hashPassword($userSalt, $password);
-$nowDate = TimeUtil::DatetimeNow();
+$nowDate = TimeUtil::now();
 
 $rootDB->insert('member', [
     'oauth_type' => 'NONE',
     'id' => $username,
     'email' => null,
+    'token_valid_until' => '2999-01-01 00:00:00',
     'pw' => $finalPassword,
     'salt' => $userSalt,
     'grade' => 6,

f_install/j_install_status.php

@@ -1,7 +1,13 @@
 <?php
+
 namespace sammo;
 
-require(__dir__.'/../vendor/autoload.php');
+if(!file_exists(__DIR__ . '/../vendor/autoload.php')){
+    http_response_code(503);
+    die('not_ready');
+}
+
+require(__DIR__ . '/../vendor/autoload.php');
 
 if (!class_exists('\\sammo\\RootDB')) {
     Json::die([

f_install/j_setup_db.php

@@ -1,16 +1,22 @@
 <?php
+
 namespace sammo;
 
-require(__dir__.'/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/autoload.php');
+
+$host = Util::getPost('db_host');
+$port = Util::getPost('db_port', 'int');
+$username = Util::getPost('db_id');
+$password = Util::getPost('db_pw');
+$dbName = Util::getPost('db_name');
+$servHost = Util::getPost('serv_host');
+$sharedIconPath = Util::getPost('shared_icon_path');
+$gameImagePath = Util::getPost('game_image_path');
+$imageRequestKey = Util::getPost('image_request_key');
+
+$kakaoRESTKey = Util::getPost('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getPost('kakao_admin_key', 'string', '');
 
-$host = Util::getReq('db_host');
-$port = Util::getReq('db_port', 'int');
-$username = Util::getReq('db_id');
-$password = Util::getReq('db_pw');
-$dbName = Util::getReq('db_name');
-$servHost = Util::getReq('serv_host');
-$sharedIconPath = Util::getReq('shared_icon_path');
-$gameImagePath = Util::getReq('game_image_path');
 
 if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
     Json::die([
@@ -69,7 +75,8 @@ if (file_exists(ROOT.'/d_setting') && !is_dir(ROOT.'/d_setting')) {
     ]);
 }
 
-if (!file_exists(ROOT.'/d_log')
+if (
+    !file_exists(ROOT . '/d_log')
     || !file_exists(ROOT . '/d_shared')
     || !file_exists(ROOT . '/d_setting')
     || !file_exists(AppConf::getUserIconPathFS())
@@ -160,7 +167,7 @@ $rootDB->error_handler = function ($params) {
 
 $mysqli_obj = $rootDB->get(); //로그인에 실패할 경우 자동으로 dbConnFail()이 실행됨.
 
-if ($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/common_schema.sql'))) {
+if ($mysqli_obj->multi_query(file_get_contents(__DIR__ . '/sql/common_schema.sql'))) {
     while (true) {
         if (!$mysqli_obj->more_results()) {
             break;
@@ -174,8 +181,8 @@ if ($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/common_schema.sql')
 $rootDB->insert('system', array(
     'REG'     => 'N',
     'LOGIN'    => 'N',
-    'CRT_DATE' => TimeUtil::DatetimeNow(),
-    'MDF_DATE' => TimeUtil::DatetimeNow()
+    'CRT_DATE' => TimeUtil::now(),
+    'MDF_DATE' => TimeUtil::now()
 ));
 
 $globalSalt = bin2hex(random_bytes(16));
@@ -186,18 +193,34 @@ $globalSalt = bin2hex(random_bytes(16));
 
 $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
 $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+$imageRequestPath = WebUtil::resolveRelativePath($gameImagePath . '/../hook/git_pull.php', $servHost);
+$imageKeyInstallPath = WebUtil::resolveRelativePath($gameImagePath . '/../hook/InstallKey.php', $servHost);
 
 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/ServConfig.orig.php',
+    __DIR__ . '/templates/ServConfig.orig.php',
     ROOT . '/d_setting/ServConfig.php',
     [
         'serverBasePath' => $servHost,
         'sharedIconPath' => $sharedIconPath,
-        'gameImagePath'=>$gameImagePath
+        'gameImagePath' => $gameImagePath,
+        'imageRequestPath' => $imageRequestPath,
+        'imageRequestKey' => $imageRequestKey,
+        'serverList' => [
+            ['che', '체', 'white'],
+            ['kwe', '퀘', 'yellow'],
+            ['pwe', '풰', 'orange'],
+            ['twe', '퉤', 'magenta'],
+            ['nya', '냐', '#e67e22'],
+            ['pya', '퍄', '#9b59b6']
+        ]
     ],
     true
 );
 
+if ($imageRequestKey) {
+    @file_get_contents($imageKeyInstallPath . '?key=' . $imageRequestKey);
+}
+
 if ($result !== true) {
     Json::die([
         'result' => false,
@@ -206,7 +229,7 @@ if ($result !== true) {
 }
 
 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/common_path.orig.js',
+    __DIR__ . '/templates/common_path.orig.js',
     ROOT . '/d_shared/common_path.js',
     [
         'serverBasePath' => $servHost,
@@ -217,8 +240,8 @@ $result = Util::generateFileUsingSimpleTemplate(
 );
 
 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/menu.orig.js',
-    ROOT.'/d_shared/menu.js',
+    __DIR__ . '/templates/menu.orig.json',
+    ROOT . '/d_shared/menu.json',
     [],
     true
 );
@@ -232,7 +255,7 @@ if ($result !== true) {
 
 
 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/common.orig.css',
+    __DIR__ . '/templates/common.orig.css',
     ROOT . '/d_shared/common.css',
     [
         'serverBasePath' => $servHost,
@@ -251,7 +274,7 @@ if ($result !== true) {
 
 
 $result = Util::generateFileUsingSimpleTemplate(
-    __dir__.'/templates/RootDB.orig.php',
+    __DIR__ . '/templates/RootDB.orig.php',
     ROOT . '/d_setting/RootDB.php',
     [
         'host' => $host,
@@ -263,6 +286,19 @@ $result = Util::generateFileUsingSimpleTemplate(
     ]
 );
 
+$kakaoRedirectURI = WebUtil::resolveRelativePath('oauth_kakao/oauth.php', $servHost . '/');
+
+Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/KakaoKey.orig.php',
+    ROOT . '/d_setting/KakaoKey.php',
+    [
+        'REST_API_KEY' => $kakaoRESTKey,
+        'ADMIN_KEY' => $kakaoAdminKey,
+        'REDIRECT_URI' => $kakaoRedirectURI
+    ],
+    true
+);
+
 if ($result !== true) {
     Json::die([
         'result' => false,
@@ -272,5 +308,6 @@ if ($result !== true) {
 
 Json::die([
     'result' => true,
-    'reason'=>'success'
+    'reason' => 'success',
+    'globalSalt' => $globalSalt
 ]);

f_install/j_update_js_css_path.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace sammo;
+
+require(__DIR__ . '/../vendor/autoload.php');
+
+$session = Session::requireLogin([])->setReadOnly();
+if ($session->userGrade < 6) {
+    Json::die([
+        'result' => false,
+        'reason' => '관리자 아님'
+    ]);
+}
+
+$servHost = Util::getPost('serv_host');
+$sharedIconPath = Util::getPost('shared_icon_path');
+$gameImagePath = Util::getPost('game_image_path');
+
+if ($servHost) {
+    if (!$sharedIconPath || $gameImagePath) {
+        Json::die([
+            'result' => false,
+            'reason' => 'serv_host가 지정된 경우, sharedIconPath와 gameImagePath가 모두 지정되어야합니다.'
+        ]);
+    }
+
+    $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __DIR__ . '/templates/ServConfig.orig.php',
+        ROOT . '/d_setting/ServConfig.php',
+        [
+            'serverBasePath' => $servHost,
+            'sharedIconPath' => $sharedIconPath,
+            'gameImagePath' => $gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result' => false,
+            'reason' => $result
+        ]);
+    }
+} else if ($sharedIconPath || $gameImagePath) {
+    $servHost = ServConfig::$serverWebPath;
+    if ($sharedIconPath) {
+        $sharedIconPath = WebUtil::resolveRelativePath($sharedIconPath, $servHost);
+    } else {
+        $sharedIconPath = ServConfig::$sharedIconPath;
+    }
+
+    if ($gameImagePath) {
+        $gameImagePath = WebUtil::resolveRelativePath($gameImagePath, $servHost);
+    } else {
+        $gameImagePath = ServConfig::$gameImagePath;
+    }
+
+    $result = Util::generateFileUsingSimpleTemplate(
+        __DIR__ . '/templates/ServConfig.orig.php',
+        ROOT . '/d_setting/ServConfig.php',
+        [
+            'serverBasePath' => $servHost,
+            'sharedIconPath' => $sharedIconPath,
+            'gameImagePath' => $gameImagePath
+        ],
+        true
+    );
+
+    if ($result !== true) {
+        Json::die([
+            'result' => false,
+            'reason' => $result
+        ]);
+    }
+} else {
+    $servHost = ServConfig::$serverWebPath;
+    $sharedIconPath = ServConfig::$sharedIconPath;
+    $gameImagePath = ServConfig::$gameImagePath;
+}
+
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common_path.orig.js',
+    ROOT . '/d_shared/common_path.js',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+
+$result = Util::generateFileUsingSimpleTemplate(
+    __DIR__ . '/templates/common.orig.css',
+    ROOT . '/d_shared/common.css',
+    [
+        'serverBasePath' => $servHost,
+        'sharedIconPath' => $sharedIconPath,
+        'gameImagePath' => $gameImagePath
+    ],
+    true
+);
+
+if ($result !== true) {
+    Json::die([
+        'result' => false,
+        'reason' => $result
+    ]);
+}

f_install/sql/common_schema.sql

@@ -14,22 +14,25 @@ CREATE TABLE `system` (
 	`MDF_DATE` DATETIME NULL DEFAULT NULL,
 	PRIMARY KEY (`NO`)
 )
-ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ENGINE=Aria DEFAULT CHARSET=utf8mb4;
 
 -- 회원 테이블
 CREATE TABLE `member` (
 	`NO` INT(11) NOT NULL AUTO_INCREMENT,
 	`oauth_id` BIGINT(20) NULL DEFAULT NULL,
-	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
 	`ID` VARCHAR(64) NOT NULL,
 	`EMAIL` VARCHAR(64) NULL DEFAULT NULL,
+	`oauth_type` ENUM('NONE','KAKAO') NOT NULL,
+	`oauth_info` TEXT NOT NULL DEFAULT '{}',
+	`token_valid_until` DATETIME NULL DEFAULT NULL,
 	`PW` CHAR(128) NOT NULL,
 	`salt` CHAR(16) NOT NULL,
 	`third_use` INT(1) NOT NULL DEFAULT '0',
 	`NAME` VARCHAR(64) NOT NULL,
 	`PICTURE` VARCHAR(64) NULL DEFAULT 'default.jpg',
 	`IMGSVR` INT(1) NULL DEFAULT '0',
-	`acl` text NOT NULL DEFAULT '{}' COMMENT 'json',
+	`acl` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
+	`penalty` TEXT NOT NULL DEFAULT '{}' COMMENT 'json',
 	`GRADE` INT(1) NULL DEFAULT '1',
 	`REG_NUM` INT(3) NULL DEFAULT '0',
 	`REG_DATE` DATETIME NOT NULL,
@@ -42,7 +45,7 @@ CREATE TABLE `member` (
 	UNIQUE INDEX `kauth_id` (`oauth_id`),
 	INDEX `delete_after` (`delete_after`)
 )
-ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+ENGINE=Aria DEFAULT CHARSET=utf8mb4;
 
 -- 로그인 로그 테이블
 CREATE TABLE `member_log` (
@@ -55,7 +58,7 @@ CREATE TABLE `member_log` (
 	INDEX `action` (`member_no`, `action_type`, `date`),
 	INDEX `member` (`member_no`, `date`)
 )
-ENGINE=MyISAM DEFAULT CHARSET=utf8mb4;
+ENGINE=Aria DEFAULT CHARSET=utf8mb4;
 
 ###################
 # KV storage
@@ -69,4 +72,19 @@ CREATE TABLE if not exists `storage` (
 	UNIQUE INDEX `key` (`namespace`, `key`)
 )
 COLLATE='utf8mb4_general_ci'
-ENGINE=MyISAM
+ENGINE=Aria;
+
+CREATE TABLE `login_token` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`user_id` INT(11) NOT NULL,
+	`base_token` VARCHAR(20) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_ip` VARCHAR(40) NOT NULL COLLATE 'utf8mb4_general_ci',
+	`reg_date` DATETIME NOT NULL,
+	`expire_date` DATETIME NOT NULL,
+	PRIMARY KEY (`id`),
+	UNIQUE INDEX `by_token` (`base_token`),
+	INDEX `by_date` (`user_id`, `expire_date`)
+)
+COLLATE='utf8mb4_general_ci'
+ENGINE=Aria
+;

f_install/sql/err_log.sql

@@ -3,7 +3,9 @@ CREATE TABLE IF NOT EXISTS `err_log` (
 	`date`	TEXT NOT NULL,
 	`err`	TEXT NOT NULL,
 	`errstr`	TEXT NOT NULL,
-	`trace`	TEXT NOT NULL
+	`errpath`  TEXT NOT NULL,
+	`trace`	TEXT NOT NULL,
+	`webuser`  TEXT NULL
 );
 CREATE INDEX IF NOT EXISTS `date` ON `err_log` (
 	`date`	DESC

f_install/templates/KakaoKey.orig.php

@@ -1,6 +1,7 @@
 <?php
 namespace kakao;
 
+// @suppress PhanRedefineClass
 class KakaoKey{
     const REST_KEY = '_tK_REST_API_KEY_';
     const ADMIN_KEY = '_tK_ADMIN_KEY_';

f_install/templates/RootDB.orig.php

@@ -1,9 +1,16 @@
 <?php
+
 namespace sammo;
 
+//https://hub.packtpub.com/eloquent-without-laravel/
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Events\Dispatcher;
+use Illuminate\Container\Container;
+
 class RootDB
 {
     private static $uDB = null;
+    private static ?Capsule $uIlluminate = null;
 
     private static $host = '_tK_host_';
     private static $user = '_tK_user_';
@@ -11,6 +18,8 @@ class RootDB
     private static $dbName = '_tK_dbName_';
     private static $port = _tK_port_;
     private static $encoding = 'utf8mb4';
+    private static $collation = 'utf8mb4_general_ci';
+
 
     private static $globalSalt = '_tK_globalSalt_';
 
@@ -18,6 +27,29 @@ class RootDB
     {
     }
 
+    public static function illuminate(): Capsule
+    {
+        if(self::$uIlluminate !== null){
+            return self::$uIlluminate;
+        }
+        $capsule = new Capsule;
+
+        $capsule->addConnection([
+            'driver'   => 'mysql',
+            'host'     => self::$host,
+            'database' => self::$dbName,
+            'username' => self::$user,
+            'password' => self::$password,
+            'charset'   => self::$encoding,
+            'collation' => self::$collation,
+        ], 'root');
+
+        $capsule->setEventDispatcher(new Dispatcher(new Container));
+        $capsule->bootEloquent();
+        self::$uIlluminate = $capsule;
+        return $capsule;
+    }
+
     /**
      * DB 객체 생성
      *
@@ -30,7 +62,8 @@ class RootDB
             self::$uDB = new \MeekroDB(self::$host, self::$user, self::$password, self::$dbName, self::$port, self::$encoding);
             self::$uDB->connect_options[MYSQLI_OPT_INT_AND_FLOAT_NATIVE] = true;
 
-            self::$uDB->error_handler= function(){};
+            self::$uDB->error_handler = function () {
+            };
             self::$uDB->throw_exception_on_error = true;
             self::$uDB->throw_exception_on_nonsql_error = true;
         }

f_install/templates/ServConfig.orig.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 class ServConfig
@@ -10,6 +11,9 @@ class ServConfig
     public static $serverWebPath = '_tK_serverBasePath_';
     public static $sharedIconPath = '_tK_sharedIconPath_';
     public static $gameImagePath = "_tK_gameImagePath_";
+    public static $imageRequestPath = "_tK_imageRequestPath_";
+    public static $imageRequestKey = '_tK_imageRequestKey_';
+    private static $serverList = null;
 
     public static function getSharedIconPath(string $filepath = ''): string
     {
@@ -32,6 +36,31 @@ class ServConfig
         return static::$gameImagePath;
     }
 
+    public static function getImagePullURI(): string
+    {
+        $now = time();
+        $req_hash = Util::hashPassword(sprintf("%016x", $now), static::$imageRequestKey);
+        return static::$imageRequestPath . "?req={$req_hash}&time={$now}";
+    }
+
+    /**
+     * 서버 설정 반환
+     *
+     * @return \sammo\Setting[]
+     */
+    public static function getServerList(): array{
+        $servKeyList = [/*_tK_serverList_*/];
+        $servKeyList[] = ['hwe', '훼', 'red'];
+
+        if (self::$serverList === null) {
+            self::$serverList = [];
+            foreach($servKeyList as [$servKey, $servNick, $servColor]){
+                self::$serverList[$servKey] = new Setting(ROOT.'/'.$servKey, $servNick, $servColor);
+            }
+        }
+        return self::$serverList;
+    }
+
 
     /**
      * 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함

f_install/templates/common.orig.css

@@ -6,11 +6,6 @@
 
 .img_back {background-image:url('_tK_gameImagePath_/back.jpg'); }
 
-/* 레거시. */
-#bg0    { background-image:url('_tK_gameImagePath_/back_walnut.jpg'); }
-#bg1    { background-image:url('_tK_gameImagePath_/back_green.jpg'); }
-#bg2    { background-image:url('_tK_gameImagePath_/back_blue.jpg'); }
-
 .map_detail .map_title{
     background:
         url('_tK_gameImagePath_/ltitle.jpg') no-repeat left,
@@ -88,6 +83,59 @@
     background-size: 700px 500px;
 }
 
+
+/*미니체 지도*/
+.map_theme_miniche_b.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_b .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+/*미니체 지도*/
+.map_theme_miniche_clean.map_spring .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_spring.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_summer .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_summer.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_fall .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_fall.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean.map_winter .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/che/bg_winter.jpg') no-repeat;
+    background-size: 700px 500px;
+}
+
+.map_theme_miniche_clean .map_bgroad{
+    background: url('_tK_gameImagePath_/map/che/miniche_road.png') no-repeat;
+    background-size: 700px 500px;
+}
+
 /*루드라사움 지도*/
 .map_theme_ludo_rathowm .map_bglayer1{
     background: url('_tK_gameImagePath_/map/ludo_rathowm/back.jpg') no-repeat;
@@ -99,28 +147,21 @@
     background-size: 700px 500px;
 }
 
-.map_theme_ludo_rathowm.map_detail.map_spring .map_title_text{
-    background:
-        url('_tK_gameImagePath_/spring.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_summer .map_title_text{
-    background:
-        url('_tK_gameImagePath_/summer.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_fall .map_title_text{
-    background:
-        url('_tK_gameImagePath_/fall.gif') no-repeat right;
-}
-
-.map_theme_ludo_rathowm.map_detail.map_winter .map_title_text{
-    background:
-        url('_tK_gameImagePath_/winter.gif') no-repeat right;
-}
-
 .world_map.map_theme_ludo_rathowm .map_title .map_title_text::before {
     color:white;
     content:'LP';
     margin-right:1ch;
 }
+
+/*체스판 지도*/
+.map_theme_chess .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/chess/chessboard.png') no-repeat;
+    background-size: 700px 500px;
+}
+
+
+/*포켓몬 v1 지도*/
+.map_theme_pokemon_v1 .map_bglayer1{
+    background: url('_tK_gameImagePath_/map/pokemon_v1/back_pal8.png') no-repeat;
+    background-size: 700px 500px;
+}

f_install/templates/menu.orig.js

@@ -1,8 +0,0 @@
-window.sammo_menu = [
-    ['/bbs/board', '삼모게시판', '_blank'],
-    ['/bbs/tip', '팁/강좌', '_blank'],
-    ['/bbs/news', '삼국 일보', '_blank'],
-    ['/bbs/history2', '개인 열전', '_blank'],
-    ['/bbs/history3', '국가 열전', '_blank'],
-    ['/bbs/patch', '패치 내역', '_blank']
-];

f_install/templates/menu.orig.json

@@ -0,0 +1,8 @@
+[
+    ["/bbs/board", "삼모게시판", "_blank"],
+    ["/bbs/tip", "팁/강좌", "_blank"],
+    ["/bbs/news", "삼국 일보", "_blank"],
+    ["/bbs/history2", "개인 열전", "_blank"],
+    ["/bbs/history3", "국가 열전", "_blank"],
+    ["/bbs/patch", "패치 내역", "_blank"]
+]

hwe/MYDB.php

@@ -1,30 +0,0 @@
-<?php
-namespace sammo;
-
-function MYDB_query($query, $connect)
-{
-    return mysqli_query($connect, $query);
-}
-
-function MYDB_num_rows(\mysqli_result $result) : int
-{
-    return mysqli_num_rows($result);
-}
-
-/**
- * @return mixed[]
- */
-function MYDB_fetch_array(\mysqli_result $result)
-{
-    return mysqli_fetch_array($result);
-}
-
-function MYDB_fetch_row(\mysqli_result $result)
-{
-    return mysqli_fetch_row($result);
-}
-
-function MYDB_error($connect)
-{
-    return mysqli_error($connect);
-}

hwe/_119.php

@@ -6,35 +6,15 @@ include "func.php";
 
 $session = Session::requireGameLogin()->setReadOnly();
 if($session->userGrade < 4) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 [$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
 
-$query = "select plock from plock";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$plock = MYDB_fetch_array($result);
+$plock = $db->queryFirstField('SELECT plock FROM plock');
 ?>
 <!DOCTYPE html>
 <html>
@@ -44,15 +24,15 @@ $plock = MYDB_fetch_array($result);
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
     <form action=_119_b.php method=post>
     시간조정 : <input type=text size=3 name=minute><input type=submit name=btn value='분당김'><input type=submit name=btn value='분지연'> 최종갱신 : <?=$turntime?><br>
     시간조정 : <input type=text size=3 name=minute2><input type=submit name=btn value='토너분당김'><input type=submit name=btn value='토너분지연'> 토너먼트 : <?=$tnmt_time?><br>
     봉급지급 : <input type=submit name=btn value='금지급'><input type=submit name=btn value='쌀지급'><br>
-    락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock['plock']>0?"동결중":"가동중"?><br>
+    락 풀 기 : <input type=submit name=btn value='락걸기'><input type=submit name=btn value='락풀기'> 현재 : <?=$plock>0?"동결중":"가동중"?><br>
     </form>
 </body>
 </html>
-

hwe/_119_b.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -20,39 +21,57 @@ if(!$v->validate()){
     Error($v->errorStr());
 }
 
-$btn = Util::getReq('btn');
-$minute = Util::getReq('minute', 'int');
-$minute2 = Util::getReq('minute2', 'int');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$minute = Util::getPost('minute', 'int');
+$minute2 = Util::getPost('minute2', 'int');
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 switch ($btn) {
     case "분당김":
+        $locked = false;
+        for ($i = 0; $i < 10; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }
+
         $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
         $turntime = (new \DateTimeImmutable($gameStor->turntime))->sub(new \DateInterval("PT{$minute}M"));
         $starttime = (new \DateTimeImmutable($gameStor->starttime))->sub(new \DateInterval("PT{$minute}M"));
         $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->sub(new \DateInterval("PT{$minute}M"));
 
-    $gameStor->turntime = $turntime->format('Y-m-d H:i:s');
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
         $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
         $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
 
         $db->update('general', [
-        'turntime'=>$db->sqleval('DATE_ADD(turntime, INTERVAL %i MINUTE)', $minute)
+            'turntime' => $db->sqleval('DATE_SUB(turntime, INTERVAL %i MINUTE)', $minute)
         ], true);
         $db->update('auction', [
-        'expire'=>$db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
+            'expire' => $db->sqleval('DATE_SUB(expire, INTERVAL %i MINUTE)', $minute)
         ], true);
+        if ($locked) {
+            unlock();
+        }
         break;
     case "분지연":
+        $locked = false;
+        for ($i = 0; $i < 5; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }
         $gameStor->cacheValues(['turntime', 'starttime', 'tnmt_time']);
         $turntime = (new \DateTimeImmutable($gameStor->turntime))->add(new \DateInterval("PT{$minute}M"));
         $starttime = (new \DateTimeImmutable($gameStor->starttime))->add(new \DateInterval("PT{$minute}M"));
         $tnmt_time = (new \DateTimeImmutable($gameStor->tnmt_time))->add(new \DateInterval("PT{$minute}M"));
 
-    $gameStor->turntime = $turntime->format('Y-m-d H:i:s');
+        $gameStor->turntime = $turntime->format('Y-m-d H:i:s.u');
         $gameStor->starttime = $starttime->format('Y-m-d H:i:s');
         $gameStor->tnmt_time = $tnmt_time->format('Y-m-d H:i:s');
 
@@ -62,6 +81,9 @@ case "분지연":
         $db->update('auction', [
             'expire' => $db->sqleval('DATE_ADD(expire, INTERVAL %i MINUTE)', $minute)
         ], true);
+        if ($locked) {
+            unlock();
+        }
         break;
     case "토너분당김":
         $tnmt_time = new \DateTime($gameStor->tnmt_time);
@@ -80,11 +102,17 @@ case "쌀지급":
         processRiceIncome();
         break;
     case "락걸기":
-    $db->update('plock', ['plock'=>1], true);
+        for ($i = 0; $i < 10; $i++) {
+            if (tryLock()) {
+                $locked = true;
+                break;
+            }
+            usleep(500000);
+        }
         break;
     case "락풀기":
-    $db->update('plock', ['plock'=>0], true);
+        unlock();
         break;
 }
 
-header('Location:_119.php');
+header('Location:_119.php', true, 303);

hwe/_admin1.php

@@ -7,28 +7,10 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
-$connect=$db->get();
 
 $admin = getAdmin();
 ?>
@@ -40,7 +22,8 @@ $admin = getAdmin();
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=1024" />
 <?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
+<?= WebUtil::printDist('ts', 'common', true) ?>
+<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
 <body>
 <table align=center width=1000 class="tb_layout bg0">
@@ -56,7 +39,7 @@ $admin = getAdmin();
     </tr>
     <tr>
         <td width=110 align=right>시작시간변경</td>
-        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=$admin['starttime']?>'><input type=submit name=btn value=변경1></td>
+        <td width=285><input type=text size=20 maxlength=20 style=color:white;background-color:black;text-align:right; name=starttime value='<?=substr($admin['starttime'], 0, 19)?>'><input type=submit name=btn value=변경1></td>
         <td width=110 align=right>현재도시훈사</td>
         <td width=285><?=$admin['city_rate']?></td>
     </tr>
@@ -66,12 +49,6 @@ $admin = getAdmin();
         <td width=110 align=right>최대 국가</td>
         <td width=285><input type=text size=3 maxlength=2 style=color:white;background-color:black;text-align:right; name=maxnation value=<?=$admin['maxnation']?>><input type=submit name=btn value=변경3></td>
     </tr>
-    <tr>
-        <td width=110 align=right></td>
-        <td width=285></td>
-        <td width=110 align=right>현재 수입률</td>
-        <td width=285><?=$admin['gold_rate']?>%</td>
-    </tr>
     <tr>
         <td width=110 align=right>시작 년도</td>
         <td width=285><input type=text size=3 maxlength=3 style=color:white;background-color:black;text-align:right; name=startyear value='<?=$admin['startyear']?>'><input type=submit name=btn value=변경4></td>

hwe/_admin1_submit.php

@@ -22,19 +22,16 @@ if (!$v->validate()) {
     Error($v->errorStr());
 }
 
-$msg = Util::getReq('msg');
-$btn = Util::getReq('btn');
-$log = Util::getReq('log');
-$starttime = Util::getReq('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s'));
-$maxgeneral = Util::getReq('maxgeneral', 'int', GameConst::$defaultMaxGeneral);
-$maxnation = Util::getReq('maxnation', 'int', GameConst::$defaultMaxNation);
-$startyear = Util::getReq('startyear', 'int', GameConst::$defaultStartYear);
-
-extractMissingPostToGlobals();
+$msg = Util::getPost('msg');
+$btn = Util::getPost('btn');
+$log = Util::getPost('log');
+$starttime = Util::getPost('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s'));
+$maxgeneral = Util::getPost('maxgeneral', 'int', GameConst::$defaultMaxGeneral);
+$maxnation = Util::getPost('maxnation', 'int', GameConst::$defaultMaxNation);
+$startyear = Util::getPost('startyear', 'int', GameConst::$defaultStartYear);
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 $admin = getAdmin();
 
@@ -43,11 +40,7 @@ switch ($btn) {
         $gameStor->msg = $msg;
         break;
     case "로그쓰기":
-        $lognum = $admin['historyindex'] + 1;
-        if ($lognum >= 29) {
-            $lognum = 0;
-        }
-        pushWorldHistory(["<R>★</><S>{$log}</>"]);
+        pushGlobalHistoryLog(["<R>★</><S>{$log}</>"]);
         break;
     case "변경1":
         $gameStor->starttime = (new \DateTime($starttime))->format('Y-m-d H:i:s');
@@ -69,6 +62,7 @@ switch ($btn) {
     case "30분턴":
     case "60분턴":
     case "120분턴":
+        $admin = $gameStor->getValues(['turntime', 'turnterm', 'year', 'startyear', 'month']);
         switch ($btn) {
         case   "1분턴": $turnterm = 1; break;
         case   "2분턴": $turnterm = 2; break;
@@ -79,40 +73,28 @@ switch ($btn) {
         case  "60분턴": $turnterm = 60; break;
         case "120분턴": $turnterm = 120; break;
         }
+        $oldunit = $admin['turnterm'] * 60;
         $unit = $turnterm * 60;
+
+        $unitDiff = $unit / $oldunit;
+
+        $servTurnTime = new \DateTimeImmutable($admin['turntime']);
+        foreach ($db->query('SELECT no,turntime FROM general') as $gen) {
+            $genTurnTime = new \DateTimeImmutable($gen['turntime']);
+            $timeDiff = TimeUtil::DateIntervalToSeconds($genTurnTime->diff($servTurnTime));
+            $timeDiff *= $unitDiff;
+            $newGenTurnTime = $servTurnTime->add(TimeUtil::secondsToDateInterval($timeDiff));
+
+            $db->update('general', [
+                'turntime'=>$newGenTurnTime->format('Y-m-d H:i:s.u')
+            ], 'no=%i', $gen['no']);
+        }
         $turn = ($admin['year'] - $admin['startyear']) * 12 + $admin['month'] - 1;
-        $starttime = date("Y-m-d H:i:s", strtotime($admin['turntime']) - $turn * $unit);
-        $starttime = cutTurn($starttime, $turnterm);
+        $starttime = $servTurnTime->sub(TimeUtil::secondsToDateInterval($turn * $unit))->format('Y-m-d H:i:s');
+        $starttime = cutTurn($starttime, $turnterm, false);
         $gameStor->turnterm = $turnterm;
         $gameStor->starttime = $starttime;
-        // 턴시간이 길어지는 경우 랜덤턴 배정
-        if ($turnterm < $admin['turnterm']) {
-            $query = "select no from general";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            $count = MYDB_num_rows($result);
-            for ($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $turntime = getRandTurn($turnterm);
-                $query = "update general set turntime='$turntime' where no='{$gen['no']}'";
-                MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            }
-            // 턴시간이 너무 멀리 떨어진 선수 제대로 보정
-        } else {
-            $query = "select no,turntime from general";
-            $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-            $count = MYDB_num_rows($result);
-            for ($i=0; $i < $count; $i++) {
-                $gen = MYDB_fetch_array($result);
-                $num = intdiv((strtotime($gen['turntime']) - strtotime($admin['turntime'])), $unit);
-                if ($num > 0) {
-                    $gen['turntime'] = date("Y-m-d H:i:s", strtotime($gen['turntime']) - $unit * $num);
-                    $query = "update general set turntime='{$gen['turntime']}' where no='{$gen['no']}'";
-                    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-                }
-            }
-        }
-        
-        pushWorldHistory(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
+        pushGlobalHistoryLog(["<R>★</>턴시간이 <C>$btn</>으로 변경됩니다."]);
         break;
 }
 

hwe/_admin2.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -7,24 +8,7 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
@@ -32,17 +16,22 @@ $db = DB::db();
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>회원관리</title>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>회 원 관 리<br><?=backButton()?></td></tr>
+        <tr>
+            <td>회 원 관 리<br><?= backButton() ?></td>
+        </tr>
     </table>
     <form name=form1 method=post action=_admin2_submit.php>
         <table align=center width=1000 class='tb_layout bg0'>
@@ -53,19 +42,28 @@ $db = DB::db();
         </table>
         <table align=center width=1000 class='tb_layout bg0'>
             <tr>
-        <td width=80 align=center rowspan=12>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
+                <td width=80 align=center rowspan=12>회원선택<br><br>
+                    <font color=cyan>NPC</font><br>
+                    <font color=skyblue>NPC유저</font><br>
+                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
+                </td>
                 <td width=105 rowspan=12>
                     <?php
 
                     echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
                     $generalList = $db->query('SELECT `no`, `name`, npc, `block` FROM general ORDER BY npc, binary(`name`)');
 
                     foreach ($generalList as $general) {
                         $style = "style=;";
-    if($general['block']         > 0) { $style .= "background-color:red;"; }
-    if($general['npc']          >= 2) { $style .= "color:cyan;"; }
-    elseif($general['npc']      == 1) { $style .= "color:skyblue;"; }
+                        if ($general['block']         > 0) {
+                            $style .= "background-color:red;";
+                        }
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
+                        }
 
                         echo "
                 <option value={$general['no']} $style>{$general['name']}</option>";
@@ -76,7 +74,18 @@ echo "
         </td>
         <td width=100 align=center>아이템 지급</td>
         <td width=504>
-            <select name=weap size=1 style='color:white;background-color:black;font-size:13px'>";
+            <select name=weapon size=1 style='color:white;background-color:black;font-size:14px'>";
+                    foreach (GameConst::$allItems as $itemCategories) {
+                        foreach ($itemCategories as $item => $cnt) {
+                            if ($cnt == 0) {
+                                continue;
+                            }
+                            $itemObj = buildItemClass($item);
+                            if ($itemObj->isBuyable()) {
+                                continue;
+                            }
+                        }
+                    }
                     for ($i = 0; $i < 27; $i++) {
                         echo "
                 <option value={$i}>{$i}</option>";
@@ -113,12 +122,12 @@ for($i=0; $i < 27; $i++) {
                 <td><input type=submit name=btn value='접속 허용'><input type=submit name=btn value='접속 제한'></td>
             </tr>
             <tr>
-        <td align=center>턴설정</td>
+                <td align=center>턴 시각 설정</td>
                 <td><input type=submit name=btn value='00턴'><input type=submit name=btn value='랜덤턴'></td>
             </tr>
             <tr>
-        <td align=center>NPC해제</td>
-        <td><input type=submit name=btn value='NPC해제'><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'><input type=submit name=btn value='NPC설정'></td>
+                <td align=center>명령 설정</td>
+                <td><input type=submit name=btn value='하야입력'><input type=submit name=btn value='방랑해산'></td>
             </tr>
             <tr>
                 <td align=center>메세지 전달</td>
@@ -127,8 +136,13 @@ for($i=0; $i < 27; $i++) {
         </table>
     </form>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/_admin2_submit.php

@@ -1,15 +1,14 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-$btn = Util::getReq('btn');
-$weap = Util::getReq('weap', 'int');
-$genlist = Util::getReq('genlist', 'array_int');
-$msg = Util::getReq('msg', 'string');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$item = Util::getPost('item', 'string');
+$genlist = Util::getPost('genlist', 'array_int');
+$msg = Util::getPost('msg', 'string');
 
 //로그인 검사
 $session = Session::requireLogin()->loginGame()->setReadOnly();
@@ -26,10 +25,15 @@ if(!$generalID){
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 $src = MessageTarget::buildQuick($session->generalID);
 
+$genObjList = [];
+$env = [];
+if ($genlist) {
+    $genObjList = General::createGeneralObjListFromDB($genlist);
+    $env = $gameStor->cacheAll();
+}
 switch ($btn) {
     case "전체 접속허용":
         $db->update('general', [
@@ -48,7 +52,7 @@ switch($btn) {
         DB::db()->query('update general set block=0 where no IN %li', $genlist);
         break;
     case "1단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db->update('general', [
             'block' => 1,
             'killturn' => 24
@@ -60,7 +64,7 @@ switch($btn) {
         ], 'id IN %li', $uid);
         break;
     case "2단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db->update('general', [
             'gold' => 0,
             'rice' => 0,
@@ -74,7 +78,7 @@ switch($btn) {
         ], 'id IN %li', $uid);
         break;
     case "3단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db->update('general', [
             'gold' => 0,
             'rice' => 0,
@@ -93,30 +97,36 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "강제 사망":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now(true);
         $db->update('general', [
-            'turn0'=>EncodeCommand(0, 0, 0, 0),
             'killturn' => 0,
             'turntime' => $date,
         ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => '휴식',
+            'arg' => '{}',
+            'brief' => '휴식',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
         break;
     case "특기 부여":
         [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
         $text = "특기 부여!";
 
-        foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
+        foreach ($db->query("SELECT `no`,leadership,strength,intel,dex1,dex2,dex3,dex4,dex5 FROM general WHERE `no` IN %li", $genlist) as $general) {
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($general['no']), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
 
-            $specialWar = SpecialityConst::pickSpecialWar($general);
+            $specialWar = SpecialityHelper::pickSpecialWar($general);
             $db->update('general', [
                 'specage2' => $db->sqleval('age'),
                 'special2' => $specialWar
             ], 'no=%i', $general['no']);
-            $specialWarName = SpecialityConst::WAR[$specialWar][0];
+            $specialWarName = buildGeneralSpecialWarClass($specialWar)->getName();
             $josaUl = JosaUtil::pick($specialWarName, '을');
-            pushGeneralHistory($general, "<C>●</>{$year}년 {$month}월:특기 【<b><C>{$specialWarName}</></b>】{$josaUl} 습득");
-            pushGenLog($general, ["<C>●</>특기 【<b><L>{$specialWarName}</></b>】{$josaUl} 익혔습니다!"]);
+            $logger = new ActionLogger($general['no'], 0, $year, $month);
+            $logger->pushGeneralHistoryLog("특기 【<b><C>{$specialWarName}</></b>】{$josaUl} 습득");
+            $logger->pushGeneralActionLog("특기 【<b><L>{$specialWarName}</></b>】{$josaUl} 익혔습니다!",ActionLogger::PLAIN);
+            $logger->flush();
         }
 
         break;
@@ -149,7 +159,7 @@ switch($btn) {
             $msg->send(true);
         }
         $db->update('general', [
-            'dex0'=>$db->sqleval('dex0+10000')
+            'dex1' => $db->sqleval('dex1+10000')
         ], '`no` IN %li', $genlist);
         break;
     case "궁숙10000":
@@ -159,7 +169,7 @@ switch($btn) {
             $msg->send(true);
         }
         $db->update('general', [
-            'dex10'=>$db->sqleval('dex10+10000')
+            'dex2' => $db->sqleval('dex2+10000')
         ], '`no` IN %li', $genlist);
         break;
     case "기숙10000":
@@ -170,7 +180,7 @@ switch($btn) {
             $msg->send(true);
         }
         $db->update('general', [
-            'dex20'=>$db->sqleval('dex20+10000')
+            'dex3' => $db->sqleval('dex3+10000')
         ], '`no` IN %li', $genlist);
         break;
     case "귀숙10000":
@@ -181,7 +191,7 @@ switch($btn) {
             $msg->send(true);
         }
         $db->update('general', [
-            'dex30'=>$db->sqleval('dex30+10000')
+            'dex4' => $db->sqleval('dex4+10000')
         ], '`no` IN %li', $genlist);
         break;
     case "차숙10000":
@@ -192,7 +202,7 @@ switch($btn) {
             $msg->send(true);
         }
         $db->update('general', [
-            'dex40'=>$db->sqleval('dex40+10000')
+            'dex5' => $db->sqleval('dex5+10000')
         ], '`no` IN %li', $genlist);
         break;
     case "접속 허용":
@@ -206,7 +216,7 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "메세지 전달":
-        $text = $msg;
+        $text = $msg ?? '';
         foreach ($genlist as $generalID) {
             $msg = new Message(Message::MSGTYPE_PRIVATE, $src, MessageTarget::buildQuick($generalID), $text, new \DateTime(), new \DateTime('9999-12-31'), []);
             $msg->send(true);
@@ -214,11 +224,10 @@ switch($btn) {
         break;
     case "무기지급":
 
-        if($weap == 0) {
+        if ($item == 'None') {
             $text = "무기 회수!";
-        }
-        else { 
-            $text = getWeapName($weap)." 지급!"; 
+        } else {
+            $text = getItemName($item) . " 지급!";
         }
 
         foreach ($genlist as $generalID) {
@@ -226,23 +235,21 @@ switch($btn) {
             $msg->send(true);
         }
 
-        if($weap == 0){
+        if ($item === 'None') {
             $db->update('general', [
-                'weap'=>0
+                'weapon' => 'None'
             ], '`no` IN %li', $genlist);
-        }
-        else{
+        } else {
             $db->update('general', [
-                'weap'=>$weap
-            ], '`no` IN %li AND weap < %i', $genlist, $weap);
+                'weapon' => $item
+            ], '`no` IN %li', $genlist, $item);
         }
         break;
     case "책지급":
-        if($weap == 0) {
+        if ($item == 'None') {
             $text = "책 회수!";
-        }
-        else { 
-            $text = getBookName($weap)." 지급!"; 
+        } else {
+            $text = getItemName($item) . " 지급!";
         }
 
         foreach ($genlist as $generalID) {
@@ -250,23 +257,21 @@ switch($btn) {
             $msg->send(true);
         }
 
-        if($weap == 0){
+        if ($item == 'None') {
             $db->update('general', [
-                'book'=>0
+                'book' => 'None'
             ], '`no` IN %li', $genlist);
-        }
-        else{
+        } else {
             $db->update('general', [
-                'book'=>$weap
-            ], '`no` IN %li AND book < %i', $genlist, $weap);
+                'book' => $item
+            ], '`no` IN %li', $genlist);
         }
         break;
     case "말지급":
-        if($weap == 0) {
+        if ($item == 'None') {
             $text = "말 회수!";
-        }
-        else { 
-            $text = getHorseName($weap)." 지급!"; 
+        } else {
+            $text = getItemName($item) . " 지급!";
         }
 
         foreach ($genlist as $generalID) {
@@ -274,23 +279,21 @@ switch($btn) {
             $msg->send(true);
         }
 
-        if($weap == 0){
+        if ($item == 'None') {
             $db->update('general', [
-                'horse'=>0
+                'horse' => 'None'
             ], '`no` IN %li', $genlist);
-        }
-        else{
+        } else {
             $db->update('general', [
-                'horse'=>$weap
-            ], '`no` IN %li AND horse < %i', $genlist, $weap);
+                'horse' => $item
+            ], '`no` IN %li', $genlist);
         }
         break;
     case "도구지급":
-        if($weap == 0) {
+        if ($item == 'None') {
             $text = "특수도구 회수!";
-        }
-        else { 
-            $text = getItemName($weap)." 지급!"; 
+        } else {
+            $text = getItemName($item) . " 지급!";
         }
 
         foreach ($genlist as $generalID) {
@@ -298,37 +301,34 @@ switch($btn) {
             $msg->send(true);
         }
 
-        if($weap == 0){
+        if ($item == 'None') {
             $db->update('general', [
-                'item'=>0
+                'item' => 'None'
             ], '`no` IN %li', $genlist);
-        }
-        else{
+        } else {
             $db->update('general', [
-                'item'=>$weap
-            ], '`no` IN %li AND item < %i', $genlist, $weap);
+                'item' => $item
+            ], '`no` IN %li AND item < %i', $genlist, $item);
         }
         break;
-    case "NPC해제":
-        $db->update('general', [
-            'npc'=>1
-        ], '`no` IN %li', $genlist);
-        break;
     case "하야입력":
-        $db->update('general', [
-            'turn0'=>EncodeCommand(0, 0, 0, 45)
-        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => 'che_하야',
+            'arg' => '{}',
+            'brief' => '하야',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
         break;
     case "방랑해산":
-        $db->update('general', [
-            'turn0'=>EncodeCommand(0, 0, 0, 47),
-            'turn1'=>EncodeCommand(0, 0, 0, 56)
-        ], '`no` IN %li', $genlist);
-        break;
-    case "NPC설정":
-        $db->update('general', [
-            'npc'=>2
-        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => 'che_방랑',
+            'arg' => '{}',
+            'brief' => '방랑',
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
+        $db->update('general_turn', [
+            'action' => 'che_해산',
+            'arg' => '{}',
+            'brief' => '해산',
+        ], 'general_id IN %li AND turn_idx = 1', $genlist);
         break;
     case "00턴":
         $turnterm = $gameStor->turnterm;
@@ -337,11 +337,12 @@ switch($btn) {
             $turntime = getRandTurn($turnterm);
             $cutTurn = cutTurn($turntime, $turnterm);
             $db->update('general', [
-                'turntime'=>$curTurn
+                'turntime' => $cutTurn
             ], '`no` IN %li', $genlist);
         }
         break;
     case "랜덤턴":
+        $turnterm = $gameStor->turnterm;
         foreach ($genlist as $generalID) {
             $turntime = getRandTurn($turnterm);
             $db->update('general', [

hwe/_admin4.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -7,62 +8,73 @@ include "func.php";
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 $conlimit = $gameStor->conlimit;
+
+$ipGroupList = Util::arrayGroupBy(
+    $db->query(
+        'SELECT name,ip,lastconnect,owner,block,substring_index(ip,".",3) as ip_c from general WHERE ip!="" and npc<2'
+    ),
+    'ip_c'
+);
+
+function colorBlockedName($general)
+{
+    if (!$general['blocked']) {
+        return $general['name'];
+    }
+    return "<span style='color:magenta;'>{$general['name']}</span>";
+}
+
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>멀티관리</title>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>멀 티 관 리<br><?=backButton()?></td></tr>
+        <tr>
+            <td>멀 티 관 리<br><?= backButton() ?></td>
+        </tr>
     </table>
     <form name=form1 method=post action=_admin4_submit.php>
         <table align=center width=1000 class='tb_layout bg0'>
             <tr>
-        <td width=80 align=center rowspan=3>회원선택<br><br><font color=cyan>NPC</font><br><font color=skyblue>NPC유저</font><br><font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b></td>
+                <td width=80 align=center rowspan=3>회원선택<br><br>
+                    <font color=cyan>NPC</font><br>
+                    <font color=skyblue>NPC유저</font><br>
+                    <font color=red>접속제한</font><br><b style=background-color:red;>블럭회원</b>
+                </td>
                 <td width=105 rowspan=3>
                     <?php
 
                     echo "
-            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:13px'>";
+            <select name=genlist[] size=20 multiple style='color:white;background-color:black;font-size:14px'>";
 
                     foreach ($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general) {
                         $style = "style=;";
-    if($general['block']         > 0) { $style .= "background-color:red;"; }
-    if($general['npc']          >= 2) { $style .= "color:cyan;"; }
-    elseif($general['npc']      == 1) { $style .= "color:skyblue;"; }
-    if($general['con'] > $conlimit) { $style .= "color:red;"; }
+                        if ($general['block']         > 0) {
+                            $style .= "background-color:red;";
+                        }
+
+                        $npcColor = getNPCColor($general['npc']);
+                        if($npcColor !== null){
+                            $style .= "color:{$npcColor};";
+                        }
 
                         echo "
                 <option value={$general['no']} $style>{$general['name']}</option>";
@@ -94,49 +106,27 @@ echo "
                 <td align=center width=129>IP</td>
                 <td align=center width=100>ID</td>
             </tr>
+            <?php foreach ($ipGroupList as $ipGroupC => $users) : ?>
                 <tr>
-<?php
-$query = "select substring_index(ip,'.',3) as ip2 from general where ip!='' and npc<2 group by ip2 having count(*)>1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$ipCount = MYDB_num_rows($result);
-$genName = "";
-$genDate = "";
-$genIP   = "";
-$genID   = "";
-for($i=0; $i < $ipCount; $i++) {
-    $ip = MYDB_fetch_array($result);
-
-    $query = "select name,ip,lastconnect,owner,block from general where ip like '{$ip['ip2']}%' and npc<2 order by ip";
-    $genResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $genCount = MYDB_num_rows($genResult);
-    for($k=0; $k < $genCount; $k++) {
-        $gen = MYDB_fetch_array($genResult);
-        if($gen['block'] > 0) $genName .= "<font color=magenta>{$gen['name']}</font><br>";
-        else $genName .= $gen['name']."<br>";
-        $genDate .= $gen['lastconnect']."<br>";
-        $genIP   .= $gen['ip']."<br>";
-        $genID   .= $gen['owner']."<br>";
-    }
-    $genName .= "<br>";
-    $genDate .= "<br>";
-    $genIP   .= "<br>";
-    $genID   .= "<br>";
-}
-echo "
-        <td align=right>$genName</td>
-        <td>$genDate</td>
-        <td>$genIP</td>
-        <td>$genID</td>";
-?>
+                    <td><?= join('<br>', array_map('\sammo\colorBlockedName', $users)) ?></td>
+                    <td><?= join('<br>', array_column($users, 'lastconnect')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'ip')) ?></td>
+                    <td><?= join('<br>', array_column($users, 'owner')) ?></td>
                 </tr>
+            <?php endforeach; ?>
         </table>
         <?php
         //NOTE: password의 md5 해시가 같은지 확인하는 방식으로는 앞으로 잡아낼 수 없다. 폐기
         ?>
     </form>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=backButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= backButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/_admin4_submit.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -11,11 +12,9 @@ if($session->userGrade < 5) {
     die();
 }
 
-$btn = Util::getReq('btn');
-$genlist = Util::getReq('genlist', 'array_int');
-$msg = Util::getReq('msg','string', '메시지');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$genlist = Util::getPost('genlist', 'array_int');
+$msg = Util::getPost('msg', 'string', '메시지');
 
 $db = DB::db();
 
@@ -26,7 +25,7 @@ switch($btn) {
         DB::db()->query('update general set block=0 where no IN %li', $genlist);
         break;
     case "1단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db = DB::db();
         $db->query('update general set block=1,killturn=24 where no IN %li', $genlist);
         //FIXME: subquery로 하는게 더 빠를 듯.
@@ -34,14 +33,14 @@ switch($btn) {
         RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
         break;
     case "2단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db = DB::db();
         $db->query('update general set block=2,killturn=24 where no IN %li', $genlist);
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
         RootDB::db()->query('update member set block_num=block_num+1,block_date=%s where id IN %ls', $date, $uid);
         break;
     case "3단계 블럭":
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $db = DB::db();
         $db->query('update general set block=3,killturn=24 where no IN %li', $genlist);
         $uid = $db->queryFirstColumn('select owner from general where no IN %li', $genlist);
@@ -51,20 +50,27 @@ switch($btn) {
         DB::db()->query('update general set killturn=8000 where no IN %li', $genlist);
         break;
     case "강제 사망":
-        $date = date('Y-m-d H:i:s');
-        DB::db()->query('update general set turn0=%s,killturn=0,turntime=%s where no IN %li',EncodeCommand(0, 0, 0, 0),$date, $genlist);
+        $date = TimeUtil::now(true);
+        $db->update('general', [
+            'killturn' => 0,
+            'turntime' => $date,
+        ], '`no` IN %li', $genlist);
+        $db->update('general_turn', [
+            'action' => '휴식',
+            'arg' => '{}',
+            'brief' => '휴식'
+        ], 'general_id IN %li AND turn_idx = 0', $genlist);
         break;
     case "메세지 전달":
-    //TODO:새 갠메 시스템으로 변경
-        $date = date('Y-m-d H:i:s');
+        $date = TimeUtil::now();
         $src = MessageTarget::buildQuick($session->generalID);
-        for($i=0; $i < count($genlist); $i++) {
+        foreach($genlist as $generalID){
             $msgObj = new Message(
                 Message::MSGTYPE_PRIVATE,
                 $src,
-                MessageTarget::buildQuick($genlist[$i]),
+                MessageTarget::buildQuick($generalID),
                 $msg,
-                new DateTime(),
+                new \DateTime(),
                 new \DateTime('9999-12-31'),
                 []
             );
@@ -76,4 +82,3 @@ switch($btn) {
 }
 
 header('location:_admin4.php');
-

hwe/_admin5.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-$type = Util::getReq('type', 'int', 0);
-$type2 = Util::getReq('type2', 'int', 0);
+$type = Util::getPost('type', 'int', 0);
+$type2 = Util::getPost('type2', 'int', 0);
 
 if ($type < 0 || $type > 17) {
     $type = 0;
@@ -14,34 +15,14 @@ if($type2 < 0 || $type2 > 6){
     $type2 = 0;
 }
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
-$connect=$db->get();
 
 $sel = [];
 $sel2 = [];
@@ -51,18 +32,24 @@ $sel2[$type2] = "selected";
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>일제정보</title>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>일 제 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
+        <tr>
+            <td>일 제 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
                 <form name=form1 method=post>정렬순서 :
                     <select name=type size=1>
                         <option <?= $sel[0] ?? '' ?> value=0>국력</option>
@@ -99,11 +86,7 @@ $sel2[$type2] = "selected";
                     <select name=nation size=1 style=color:white;background-color:black>";
                         <option value=0>재야</option>";
                         <?php
-$query = "select nation,name,color,scout,scoutmsg,gennum from nation order by power";
-$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
-$count = MYDB_num_rows($result);
-for($i=1; $i <= $count; $i++) {
-    $nation = MYDB_fetch_array($result);
+                        foreach ($db->query('SELECT nation,name,color,scout,gennum from nation order by power DESC') as $nation) {
 
                             echo "
             <option value={$nation['nation']}>{$nation['name']}</option>";
@@ -112,16 +95,16 @@ for($i=1; $i <= $count; $i++) {
                     </select>
                     <input type=submit name=btn value='국가변경'>
                 </form>
-    </td></tr>
+            </td>
+        </tr>
     </table>
 
     <table align=center width=1600 class="tb_layout bg0">
-    <tr id=bg1>
+        <tr class='bg1'>
             <td align=center>국명</td>
             <td align=center>접률</td>
             <td align=center>단접</td>
             <td align=center>국력</td>
-        <td align=center>단합</td>
             <td align=center>장수</td>
             <td align=center>속령</td>
             <td align=center>기술</td>
@@ -155,73 +138,101 @@ SELECT
     A.nation,
     A.name,
     A.power,
-    A.chemi,
     A.color,
     A.tech,
-    A.sabotagelimit,
+    A.strategic_cmd_limit,
     A.gold,
     A.rice,
     COUNT(B.nation) AS gennum,
     ROUND(AVG(B.connect), 1) AS connect,
     ROUND(AVG(B.con), 1) AS con,
-    ROUND(AVG(B.dex0)) AS dex0,
-    ROUND(AVG(B.dex10)) AS dex10,
-    ROUND(AVG(B.dex20)) AS dex20,
-    ROUND(AVG(B.dex30)) AS dex30,
-    ROUND(AVG(B.dex40)) AS dex40
+    ROUND(AVG(B.dex1)) AS dex1,
+    ROUND(AVG(B.dex2)) AS dex2,
+    ROUND(AVG(B.dex3)) AS dex3,
+    ROUND(AVG(B.dex4)) AS dex4,
+    ROUND(AVG(B.dex5)) AS dex5
 FROM nation A, general B
 WHERE A.nation=B.nation
 GROUP BY B.nation
 ";
 
         switch ($type) {
-    case  0: $query .= " order by power desc"; break;
-    case  1: $query .= " order by gennum desc"; break;
-    case  2: $query .= " order by A.tech desc"; break;
-    case  3: $query .= " order by A.gold desc"; break;
-    case  4: $query .= " order by A.rice desc"; break;
-    case  5: $query .= " order by avg(B.gold) desc"; break;
-    case  6: $query .= " order by avg(B.rice) desc"; break;
-    case  7: $query .= " order by avg(B.leader) desc"; break;
-    case  8: $query .= " order by avg(B.power) desc"; break;
-    case  9: $query .= " order by avg(B.intel) desc"; break;
-    case 10: $query .= " order by avg(B.explevel) desc"; break;
-    case 11: $query .= " order by avg(B.connect) desc"; break;
-    case 12: $query .= " order by avg(B.con) desc"; break;
-    case 13: $query .= " order by avg(B.dex0) desc"; break;
-    case 14: $query .= " order by avg(B.dex10) desc"; break;
-    case 15: $query .= " order by avg(B.dex20) desc"; break;
-    case 16: $query .= " order by avg(B.dex30) desc"; break;
-    case 17: $query .= " order by avg(B.dex40) desc"; break;
+            case  0:
+                $query .= " order by power desc";
+                break;
+            case  1:
+                $query .= " order by gennum desc";
+                break;
+            case  2:
+                $query .= " order by A.tech desc";
+                break;
+            case  3:
+                $query .= " order by A.gold desc";
+                break;
+            case  4:
+                $query .= " order by A.rice desc";
+                break;
+            case  5:
+                $query .= " order by avg(B.gold) desc";
+                break;
+            case  6:
+                $query .= " order by avg(B.rice) desc";
+                break;
+            case  7:
+                $query .= " order by avg(B.leadership) desc";
+                break;
+            case  8:
+                $query .= " order by avg(B.strength) desc";
+                break;
+            case  9:
+                $query .= " order by avg(B.intel) desc";
+                break;
+            case 10:
+                $query .= " order by avg(B.explevel) desc";
+                break;
+            case 11:
+                $query .= " order by avg(B.connect) desc";
+                break;
+            case 12:
+                $query .= " order by avg(B.con) desc";
+                break;
+            case 13:
+                $query .= " order by avg(B.dex1) desc";
+                break;
+            case 14:
+                $query .= " order by avg(B.dex2) desc";
+                break;
+            case 15:
+                $query .= " order by avg(B.dex3) desc";
+                break;
+            case 16:
+                $query .= " order by avg(B.dex4) desc";
+                break;
+            case 17:
+                $query .= " order by avg(B.dex5) desc";
+                break;
         }
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$nationCount = MYDB_num_rows($result);
-for($i=0; $i < $nationCount; $i++) {
-    $nation = MYDB_fetch_array($result);
-
-    $query = "select COUNT(*) as cnt,
+        foreach ($db->query($query) as $nation) {
+            $gen = $db->queryFirstRow('SELECT COUNT(*) as cnt,
             ROUND(AVG(gold)) as avgg,
             ROUND(AVG(rice)) as avgr,
-                    SUM(leader) as leader,  ROUND(AVG(leader), 1) as avgl,
-                                            ROUND(AVG(power), 1) as avgp,
+            SUM(leadership) as leadership,  ROUND(AVG(leadership), 1) as avgl,
+                                    ROUND(AVG(strength), 1) as avgs,
                                     ROUND(AVG(intel), 1) as avgi,
                                     ROUND(AVG(explevel), 1) as avge,
             SUM(crew) as crew
-        from general where nation='{$nation['nation']}'";
-    $genResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $gen = MYDB_fetch_array($genResult);
+from general where nation=%i', $nation['nation']);
 
-    $query = "select COUNT(*) as cnt,
-                    SUM(pop) as pop,    SUM(pop2) as pop2,
-                    ROUND(SUM(pop)/SUM(pop2)*100, 2) as rate,
-                    ROUND(SUM(agri)/SUM(agri2)*100, 2) as agri,
-                    ROUND(SUM(comm)/SUM(comm2)*100, 2) as comm,
-                    ROUND(SUM(secu)/SUM(secu2)*100, 2) as secu,
-                    ROUND(SUM(wall)/SUM(wall2)*100, 2) as wall,
-                    ROUND(SUM(def)/SUM(def2)*100, 2) as def
-        from city where nation='{$nation['nation']}'";
-    $cityResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $city = MYDB_fetch_array($cityResult);
+            $city = $db->queryFirstRow('SELECT COUNT(*) as cnt,
+            SUM(pop) as pop,    SUM(pop_max) as pop_max,
+            ROUND(SUM(pop)/SUM(pop_max)*100, 2) as rate,
+            trust,
+            ROUND(SUM(agri)/SUM(agri_max)*100, 2) as agri,
+            ROUND(SUM(comm)/SUM(comm_max)*100, 2) as comm,
+            ROUND(SUM(secu)/SUM(secu_max)*100, 2) as secu,
+            ROUND(SUM(wall)/SUM(wall_max)*100, 2) as wall,
+            ROUND(SUM(def)/SUM(def_max)*100, 2) as def
+from city where nation=%i', $nation['nation']);
 
             echo "
     <tr>
@@ -229,27 +240,26 @@ for($i=0; $i < $nationCount; $i++) {
         <td align=center>&nbsp;{$nation['connect']}&nbsp;</td>
         <td align=center>&nbsp;{$nation['con']}&nbsp;</td>
         <td align=center>&nbsp;{$nation['power']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['chemi']}&nbsp;</td>
         <td align=center>&nbsp;{$gen['cnt']}&nbsp;</td>
         <td align=center>&nbsp;{$city['cnt']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['tech']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['sabotagelimit']}&nbsp;</td>
+        <td align=right>&nbsp;" . sprintf('%.1f', $nation['tech']) . "&nbsp;</td>
+        <td align=center>&nbsp;{$nation['strategic_cmd_limit']}&nbsp;</td>
         <td align=center>&nbsp;{$nation['gold']}&nbsp;</td>
         <td align=center>&nbsp;{$nation['rice']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgg']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgr']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgl']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgp']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avgi']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['avge']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex0']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex10']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex20']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex30']}&nbsp;</td>
-        <td align=center>&nbsp;{$nation['dex40']}&nbsp;</td>
-        <td align=center>&nbsp;{$gen['crew']}/{$gen['leader']}00&nbsp;</td>
-        <td align=center>&nbsp;{$city['pop']}/{$city['pop2']}&nbsp;</td>
-        <td align=center>&nbsp;{$city['rate']}%&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgg']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgr']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgl']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgs']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avgi']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['avge']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex1']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex2']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex3']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex4']}&nbsp;</td>
+        <td align=right>&nbsp;{$nation['dex5']}&nbsp;</td>
+        <td align=right>&nbsp;{$gen['crew']}/{$gen['leadership']}00&nbsp;</td>
+        <td align=center>&nbsp;{$city['pop']}/{$city['pop_max']}&nbsp;</td>
+        <td align=center>&nbsp;" . sprintf('%.1f', $city['pop'] / Util::valueFit($city['pop_max'], 1) * 100) . "%&nbsp;</td>
         <td align=center>&nbsp;{$city['agri']}%&nbsp;</td>
         <td align=center>&nbsp;{$city['comm']}%&nbsp;</td>
         <td align=center>&nbsp;{$city['secu']}%&nbsp;</td>
@@ -263,11 +273,13 @@ for($i=0; $i < $nationCount; $i++) {
         ?>
     </table>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=getSabotageLogRecent(20)?></td></tr>
+        <tr>
+            <td><?= getSabotageLogRecent(20) ?></td>
+        </tr>
     </table>
 
     <table align=center width=1760 class="tb_layout bg0">
-    <tr id=bg1>
+        <tr class='bg1'>
             <td width=30 align=center>년</td>
             <td width=30 align=center>월</td>
             <td width=50 align=center>국가수</td>
@@ -275,23 +287,32 @@ for($i=0; $i < $nationCount; $i++) {
             <?php
             switch ($type2) {
                 default:
-case 0: echo "<td width=1600>국력(국력,장수수,도시수,인구/100,최대인구/100,국가자원/100,장수자원/100,능력치,숙련/1000,경험공헌/100)</td>"; break;
-case 1: echo "<td width=1600>국가별성향</td>"; break;
-case 2: echo "<td width=1600>국가성향</td>"; break;
-case 3: echo "<td width=1600>장수성격</td>"; break;
-case 4: echo "<td width=1600>장수특기</td>"; break;
-case 5: echo "<td width=1600>병종수</td>"; break;
-case 6: echo "<td width=1600>기타</td>"; break;
+                case 0:
+                    echo "<td width=1600>국력(국력,장수수,도시수,인구/100,최대인구/100,국가자원/100,장수자원/100,능력치,숙련/1000,경험공헌/100)</td>";
+                    break;
+                case 1:
+                    echo "<td width=1600>국가별성향</td>";
+                    break;
+                case 2:
+                    echo "<td width=1600>국가성향</td>";
+                    break;
+                case 3:
+                    echo "<td width=1600>장수성격</td>";
+                    break;
+                case 4:
+                    echo "<td width=1600>장수특기</td>";
+                    break;
+                case 5:
+                    echo "<td width=1600>병종수</td>";
+                    break;
+                case 6:
+                    echo "<td width=1600>기타</td>";
+                    break;
             }
             ?>
         </tr>
         <?php
-$query = "select * from statistic where month=1 or no=1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$count = MYDB_num_rows($result);
-for($i=0; $i < $count; $i++) {
-    $stat = MYDB_fetch_array($result);
-
+        foreach ($db->query('SELECT * from statistic where month=1 or no=1') as $stat) {
             echo "
     <tr>
         <td align=center>{$stat['year']}</td>
@@ -301,13 +322,27 @@ for($i=0; $i < $count; $i++) {
 ";
             switch ($type2) {
                 default:
-        case 0: echo "<td>{$stat['power_hist']}</td>"; break;
-        case 1: echo "<td>{$stat['nation_name']}</td>"; break;
-        case 2: echo "<td>{$stat['nation_hist']}</td>"; break;
-        case 3: echo "<td>{$stat['personal_hist']}</td>"; break;
-        case 4: echo "<td>{$stat['special_hist']}</td>"; break;
-        case 5: echo "<td>{$stat['crewtype']}</td>"; break;
-        case 6: echo "<td>{$stat['etc']}</td>"; break;
+                case 0:
+                    echo "<td>{$stat['power_hist']}</td>";
+                    break;
+                case 1:
+                    echo "<td>{$stat['nation_name']}</td>";
+                    break;
+                case 2:
+                    echo "<td>{$stat['nation_hist']}</td>";
+                    break;
+                case 3:
+                    echo "<td>{$stat['personal_hist']}</td>";
+                    break;
+                case 4:
+                    echo "<td>{$stat['special_hist']}</td>";
+                    break;
+                case 5:
+                    echo "<td>{$stat['crewtype']}</td>";
+                    break;
+                case 6:
+                    echo "<td>{$stat['etc']}</td>";
+                    break;
             }
 
             echo "
@@ -318,8 +353,13 @@ for($i=0; $i < $count; $i++) {
     </table>
 
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/_admin5_submit.php

@@ -1,13 +1,12 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-$btn = Util::getReq('btn');
-$nation = Util::getReq('nation', 'int');
-
-extractMissingPostToGlobals();
+$btn = Util::getPost('btn');
+$nation = Util::getPost('nation', 'int');
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
@@ -19,24 +18,32 @@ if($session->userGrade < 5) {
 }
 
 $db = DB::db();
-$connect=$db->get();
 
 switch ($btn) {
     case "국가변경":
+        $oldNation = $db->queryFirstField('SELECT nation FROM general WHERE owner=%i', $userID);
         if ($nation == 0) {
             $db->update('general', [
                 'nation' => 0,
-                'level'=>0,
+                'officer_level' => 0,
+                'officer_city' => 0
             ], 'owner=%i', $userID);
         } else {
             $db->update('general', [
                 'nation' => $nation,
-                'level'=>1,
+                'officer_level' => 1,
+                'officer_city' => 0
             ], 'owner=%i', $userID);
+            $db->update('nation', [
+                'gennum' => $db->sqleval('gennum + 1')
+            ], 'nation=%i', $oldNation);
+        }
+        if ($oldNation != 0) {
+            $db->update('nation', [
+                'gennum' => $db->sqleval('gennum - 1')
+            ], 'nation=%i', $oldNation);
         }
         break;
 }
 
 header('location:_admin5.php');
-
-

hwe/_admin6.php

@@ -1,111 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$type = Util::getReq('type', 'int', 0);
-if($type < 0 || $type > 4){
-    $type = 0;
-}
-extractMissingPostToGlobals();
-
-//로그인 검사
-$session = Session::requireGameLogin()->setReadOnly();
-
-if($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
-}
-
-$db = DB::db();
-$connect=$db->get();
-
-$sel[$type] = "selected";
-
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>접속정보</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>접 속 정 보<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>접속률</option>
-            <option <?=$sel[1]??''?> value=1>총갱신</option>
-            <option <?=$sel[2]??''?> value=2>갱신/턴</option>
-            <option <?=$sel[3]??''?> value=3>총로그인</option>
-            <option <?=$sel[4]??''?> value=4>갱신/로그인</option>
-        </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
-</table>
-<table align=center class='tb_layout bg0'>
-    <tr id=bg1>
-        <td align=center width=120>장수명</td>
-        <td align=center width=50>접속률</td>
-        <td align=center width=40>시작연령</td>
-        <td align=center width=40>연령</td>
-        <td align=center width=80>총갱신</td>
-        <td align=center width=80>갱신/턴</td>
-        <td align=center width=80>총로그인</td>
-        <td align=center width=100>갱신/로그인</td>
-    </tr>
-<?php
-switch($type) {
-    case 0: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by connect desc limit 0,30"; break;
-    case 1: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by refcnt desc limit 0,30"; break;
-    case 2: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by ref desc limit 0,30"; break;
-    case 3: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by logcnt desc limit 0,30"; break;
-    case 4: $query = "select name,connect,startage,age,refcnt,logcnt,refcnt/(age-startage+1)/12 as ref,refcnt/logcnt as log from general order by log desc limit 0,30"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($genresult);
-
-for($i=0; $i < $gencount; $i++) {
-    $gen = MYDB_fetch_array($genresult);
-    echo "
-    <tr>
-        <td align=center>{$gen['name']}</td>
-        <td align=center>{$gen['connect']}</td>
-        <td align=center>{$gen['startage']}</td>
-        <td align=center>{$gen['age']}</td>
-        <td align=center>".round($gen['refcnt']/2, 1)."</td>
-        <td align=center>".round($gen['ref']/2,1)."</td>
-        <td align=center>{$gen['logcnt']}</td>
-        <td align=center>".round($gen['log']/2,1)."</td>
-    </tr>";
-}
-
-?>
-</table>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
-</table>
-</body>
-</html>

hwe/_admin7.php

@@ -1,147 +1,179 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
-$type = Util::getReq('type', 'int', 0);
+$btn = Util::getPost('btn');
+$gen = Util::getPost('gen', 'int', 0);
+$reqQueryType = Util::getPost('query_type', 'string', null);
 
-if($type < 0 || $type > 3){
-    $type = 0;
+// $queryTypeText, $reqArgType(0=>None, 1=>AdditionalColumn, 2=>rankVal, 3=>aux), $comp
+$queryMap = [
+    'turntime' => ['최근턴', 0, function ($lhs, $rhs) {
+        return - ($lhs['turntime'] <=> $rhs['turntime']);
+    }],
+    'recent_war' => ['최근전투', 1, function ($lhs, $rhs) {
+        return - ($lhs['recent_war'] <=> $rhs['recent_war']);
+    }],
+    'name' => ['장수명', 0, function ($lhs, $rhs) {
+        if ($lhs['npc'] !== $rhs['npc']) {
+            return $lhs['npc'] <=> $rhs['npc'];
         }
+        return $lhs['name'] <=> $rhs['name'];
+    }],
+    'warnum' => ['전투수', 2, function ($lhs, $rhs) {
+        return - ($lhs['warnum'] <=> $rhs['warnum']);
+    }]
+];
 
-extractMissingPostToGlobals();
+if ($reqQueryType === null || !key_exists($reqQueryType, $queryMap)) {
+    $reqQueryType = Util::array_first_key($queryMap);
+}
 
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
-$connect=$db->get();
 
 if ($btn == '정렬하기') {
     $gen = 0;
 }
 
-$sel[$type] = "selected";
+[$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
+if ($reqArgType === 0) {
+    $generalBasicList = $db->query('SELECT no, name, nation, npc, turntime FROM general');
+} else if ($reqArgType === 1) {
+    $generalBasicList = $db->query('SELECT no, name, nation, npc, turntime, %b FROM general', $reqQueryType);
+} else if ($reqArgType === 2) {
+    $generalBasicList = $db->query(
+        'SELECT no, name, nation, npc, turntime, value as %b
+        FROM general LEFT JOIN rank_data
+        ON general.no = rank_data.general_id
+        WHERE rank_data.type = %s',
+        $reqQueryType,
+        $reqQueryType
+    );
+} else if ($reqArgType === 3) {
+    $generalBasicList = array_map(function ($arr) {
+        $arr['aux'] = Json::decode($arr['aux']);
+        return $arr;
+    }, $db->query('SELECT no, name, nation, npc, turntime, aux FROM general'));
+} else {
+    throw new \sammo\MustNotBeReachedException();
+}
+
+usort($generalBasicList, $comp);
+
+if (!$gen) {
+    $gen = $generalBasicList[0]['no'];
+}
+
+$generalObj = General::createGeneralObjFromDB($gen);
+
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>로그정보</title>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>로 그 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
+        <tr>
+            <td>로 그 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
                 <form name=form1 method=post>
                     정렬순서 :
-        <select name=type size=1>
-            <option <?=$sel[0]??''?> value=0>최근턴</option>
-            <option <?=$sel[1]??''?> value=1>최근전투</option>
-            <option <?=$sel[2]??''?> value=2>장수명</option>
-            <option <?=$sel[3]??''?> value=3>전투수</option>
+                    <select name='query_type' size=1>
+                        <?php foreach ($queryMap as $queryType => [$queryTypeText,]) : ?>
+                            <option <?= $queryType == $reqQueryType ? 'selected' : '' ?> value='<?= $queryType ?>'><?= $queryTypeText ?></option>
+                        <?php endforeach; ?>
                     </select>
                     <input type=submit name=btn value='정렬하기'>
                     대상장수 :
                     <select name=gen size=1>
-<?php
-switch($type) {
-    case 0: $query = "select no,name from general order by turntime desc"; break;
-    case 1: $query = "select no,name from general order by recwar desc"; break;
-    case 2: $query = "select no,name from general order by npc,binary(name)"; break;
-    case 3: $query = "select no,name from general order by warnum desc"; break;
-}
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);
-
-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
-    // 선택 없으면 맨 처음 장수
-    if($gen == 0) {
-        $gen = $general['no'];
-    }
-    if($gen == $general['no']) {
-        echo "
-            <option selected value={$general['no']}>{$general['name']}</option>";
-    } else {
-        echo "
-            <option value={$general['no']}>{$general['name']}</option>";
-    }
-}
-?>
+                        <?php foreach ($generalBasicList as $general) : ?>
+                            <option <?= $gen == $general['no'] ? 'selected' : '' ?> value='<?= $general['no'] ?>'><?= $general['name'] ?> (<?= substr($general['turntime'], 14, 5) ?>)</option>
+                        <?php endforeach; ?>
                     </select>
                     <input type=submit name=btn value='조회하기'>
                 </form>
-    </td></tr>
+            </td>
+        </tr>
     </table>
     <table width=1000 align=center class='tb_layout bg0'>
         <tr>
-        <td width=50% align=center id=bg1><font color=skyblue size=3>장 수 정 보</font></td>
-        <td width=50% align=center id=bg1><font color=orange size=3>-</font></td>
+            <td width=50% align=center class='bg1'>
+                <font color=skyblue size=3>장 수 정 보</font>
+            </td>
+            <td width=50% align=center class='bg1'>
+                <font color=orange size=3>-</font>
+            </td>
         </tr>
         <tr>
             <td valign=top>
-            <?php generalInfo($gen); generalInfo2($gen); ?>
+                <?php generalInfo($generalObj);
+                generalInfo2($generalObj); ?>
             </td>
             <td valign=top>&nbsp;
             </td>
         </tr>
         <tr>
-        <td align=center id=bg1><font color=skyblue size=3>개인 기록</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 기록</font></td>
-    </tr>
-    <tr>
-        <td valign=top>
-            <?=getGenLogRecent($gen, 24)?>
+            <td align=center class='bg1'>
+                <font color=skyblue size=3>개인 기록</font>
             </td>
-        <td valign=top>
-            <?=getBatLogRecent($gen, 24)?>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 기록</font>
             </td>
         </tr>
         <tr>
-        <td align=center id=bg1><font color=skyblue size=3>장수 열전</font></td>
-        <td align=center id=bg1><font color=orange size=3>전투 결과</font></td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getGeneralActionLogRecent($gen, 24)) ?>
+            </td>
+            <td valign=top>
+                <?= formatHistoryToHTML(getBattleDetailLogRecent($gen, 24)) ?>
+            </td>
+        </tr>
+        <tr>
+            <td align=center class='bg1'>
+                <font color=skyblue size=3>장수 열전</font>
+            </td>
+            <td align=center class='bg1'>
+                <font color=orange size=3>전투 결과</font>
+            </td>
         </tr>
         <tr>
             <td valign=top>
-            <?=getGeneralHistoryAll($gen)?>
+                <?= formatHistoryToHTML(getGeneralHistoryLogAll($gen)) ?>
             </td>
             <td valign=top>
-            <?=getBatResRecent($gen, 24)?>
+                <?= formatHistoryToHTML(getBattleResultRecent($gen, 24)) ?>
             </td>
         </tr>
     </table>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/_admin8.php

@@ -1,41 +1,22 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
 include "func.php";
 
-$btn = Util::getReq('btn');
-$gen = Util::getReq('gen', 'int', 0);
+$btn = Util::getPost('btn');
+$gen = Util::getPost('gen', 'int', 0);
 $type = 0;
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 
 if ($session->userGrade < 5) {
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<title>관리메뉴</title>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-</head>
-<body>
-관리자가 아닙니다.<br>
-    <?=banner()?>
-</body>
-</html>
-<?php
-    exit();
+    die(requireAdminPermissionHTML());
 }
 
 $db = DB::db();
-$connect=$db->get();
 
 if ($btn == '정렬하기') {
     $gen = 0;
@@ -45,18 +26,24 @@ $sel[$type] = "selected";
 ?>
 <!DOCTYPE html>
 <html>
+
 <head>
     <title>외교정보</title>
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 </head>
+
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>외 교 정 보<br><?=closeButton()?></td></tr>
-    <tr><td>
+        <tr>
+            <td>외 교 정 보<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
                 <form name=form1 method=post>
                     정렬순서 :
                     <select name=type size=1>
@@ -64,16 +51,18 @@ $sel[$type] = "selected";
                     </select>
                     <input type=submit name=btn value='정렬하기'>
                 </form>
-    </td></tr>
+            </td>
+        </tr>
     </table>
     <table width=1000 align=center class='tb_layout bg0'>
-    <tr><td colspan=9 align=center bgcolor=blue>외 교 관 계</td></tr>
         <tr>
-        <td width=130 align=center id=bg1>국 가 명</td>
-        <td width=130 align=center id=bg1>국 가 명</td>
-        <td width=80  align=center id=bg1>상 태</td>
-        <td width=60  align=center id=bg1>기 간</td>
-        <td align=center id=bg1>비 고</td>
+            <td colspan=9 align=center bgcolor=blue>외 교 관 계</td>
+        </tr>
+        <tr>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=130 align=center class='bg1'>국 가 명</td>
+            <td width=80 align=center class='bg1'>상 태</td>
+            <td width=60 align=center class='bg1'>기 간</td>
         </tr>
         <?php
 
@@ -85,67 +74,30 @@ foreach (getAllNationStaticInfo() as $nation) {
         }
 
 
-$query = "select * from diplomacy where me < you order by state desc";
-
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$dipcount = MYDB_num_rows($result);
-for ($i=0; $i < $dipcount; $i++) {
-    $dip = MYDB_fetch_array($result);
-
+        foreach ($db->query('SELECT * from diplomacy where me < you order by state desc') as $dip) {
             $me = $dip['me'];
             $you = $dip['you'];
 
-    $query = "select reserved,showing from diplomacy where you='$me' and me='$you'";
-    $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $dip2 = MYDB_fetch_array($result2);
-
-    if ($dip['state'] == 2 && $dip['fixed'] == "" && $dip['reserved'] == "" && $dip2['reserved'] == "") {
+            if ($dip['state'] == 2) {
                 continue;
             }
 
             switch ($dip['state']) {
-        case 0: $state = "<font color=red>교 전</font>"; break;
-        case 1: $state = "<font color=magenta>선포중</font>"; break;
-        case 2: $state = "통 상"; break;
-        case 3: $state = "<font color=cyan>통합수락중</font>"; break;
-        case 4: $state = "<font color=cyan>통합제의중</font>"; break;
-        case 5: $state = "<font color=cyan>합병수락중</font>"; break;
-        case 6: $state = "<font color=cyan>합병제의중</font>"; break;
-        case 7: $state = "<font color=green>불가침</font>"; break;
+                case 0:
+                    $state = "<font color=red>교 전</font>";
+                    break;
+                case 1:
+                    $state = "<font color=magenta>선포중</font>";
+                    break;
+                case 2:
+                    $state = "통 상";
+                    break;
+                case 7:
+                    $state = "<font color=green>불가침</font>";
+                    break;
             }
 
-    $date = date('Y-m-d H:i:s');
-    $note = "";
-    if ($dip['fixed'] != "") {
-        if ($dip['state'] == 7) {
-            $note .= $dip['fixed'];
-        } else {
-            $note .= "<font color=gray>{$dip['fixed']}</font>";
-        }
-        if ($dip['reserved'] != "" || $dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip['reserved'] != "") {
-        if ($dip['showing'] >= $date) {
-            $note .= "<font color=skyblue>아국측 제의</font>: {$dip['reserved']}";
-        } else {
-            $note .= "<font color=gray>아국측 제의: {$dip['reserved']}</font>";
-        }
-        if ($dip2['reserved'] != "") {
-            $note .= "<br>";
-        }
-    }
-    if ($dip2['reserved'] != "") {
-        if ($dip2['showing'] >= $date) {
-            $note .= "<font color=limegreen>상대측 제의</font>: {$dip2['reserved']}";
-        } else {
-            $note .= "<font color=gray>상대측 제의: {$dip2['reserved']}</font>";
-        }
-    }
-    if ($note == "") {
-        $note = "&nbsp;";
-    }
+            $date = TimeUtil::now();
 
             echo "
     <tr>
@@ -153,14 +105,18 @@ for ($i=0; $i < $dipcount; $i++) {
         <td align=center style=color:" . newColor($nationColor[$you]) . ";background-color:{$nationColor[$you]};>$nationName[$you]</td>
         <td align=center>$state</td>
         <td align=center>{$dip['term']} 개월</td>
-        <td align=left style=font-size:7px;>{$note}</td>
     </tr>";
         }
         ?>
     </table>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/_admin_force_rehall.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace sammo;
+
+include "lib.php";
+include "func.php";
+//로그인 검사
+$session = Session::requireGameLogin()->setReadOnly();
+
+if ($session->userGrade < 5) {
+    die('권한 부족');
+}
+
+$db = DB::db();
+$gameStor = KVStorage::getStorage($db, 'game_env');
+
+if (!$gameStor->isunited) {
+    die('아직 천통하지 않았습니다');
+}
+
+foreach ($db->queryFirstColumn(
+    'SELECT no FROM general WHERE npc < 2 and age >= %i',
+    40
+) as $generalNo) {
+    CheckHall($generalNo);
+}
+
+foreach(General::createGeneralObjListFromDB($db->queryFirstColumn('SELECT `no` FROM general WHERE npc = 0')) as $genObj){
+    $genObj->mergeTotalInheritancePoint(true);
+    applyInheritanceUser($genObj->getVar('owner'));
+    $genObj->clearInheritancePoint();
+}

hwe/a_bestGeneral.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,8 +7,6 @@ include "func.php";
 
 $btn = Util::getReq('btn');
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -16,6 +15,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 
 increaseRefresh("명장일람", 1);
+$templates = new \League\Plates\Engine(__DIR__ . '/templates');
 
 ?>
 <!DOCTYPE html>
@@ -26,31 +26,38 @@ increaseRefresh("명장일람", 1);
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1136" />
     <title><?= UniqueConst::$serverName ?>: 명장일람</title>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printCSS('css/hallOfFame.css') ?>
-
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
+    <?= WebUtil::printDist('ts', 'common') ?>
 </head>
 
 <body>
     <table align=center width=1100 class='tb_layout bg0'>
-    <tr><td>명 장 일 람<br><?=closeButton()?></td></tr>
+        <tr>
+            <td>명 장 일 람<br><?= closeButton() ?></td>
+        </tr>
     </table>
     <table align=center width=1100 class='tb_layout bg0'>
         <form name=form1 action=a_bestGeneral.php method=post>
-    <tr><td align=center>
+            <tr>
+                <td align=center>
                     <input type=submit name=btn value='유저 보기'>
                     <input type=submit name=btn value='NPC 보기'>
-    </td></tr>
+                </td>
+            </tr>
         </form>
     </table>
-<div style="margin:auto;width=1000px;">
+    <div style="margin:auto;width:1100px;">
         <?php
 
+        $ownerNameList = [];
+        if ($gameStor->isunited) {
+            foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+                $ownerNameList[$ownerID] = $ownerName;
+            }
+        }
 
         $nationName = [0 => '재야'];
         $nationColor = [0 => '#000000'];
@@ -60,50 +67,96 @@ foreach (getAllNationStaticInfo() as $nation) {
         }
 
         $types = [
-    ["명 성", "int", function($v){$v['value'] = $v['experience']; return $v; }],
-    ["계 급", "int", function($v){$v['value'] = $v['dedication']; return $v; }],
-    ["계 략 성 공", "int", function($v){
+            ["명 성", "int", function ($v) {
+                $v['value'] = $v['experience'];
+                return $v;
+            }],
+            ["계 급", "int", function ($v) {
+                $v['value'] = $v['dedication'];
+                return $v;
+            }],
+            ["계 략 성 공", "int", function ($v) use ($gameStor) {
                 $v['value'] = $v['firenum'];
+                if ($gameStor->isunited) {
+                    return $v;
+                }
                 $v['nationName'] = '???';
                 $v['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
                 $v['name'] = '???';
-        $v['owner_name'] = null;
+                $v['ownerName'] = null;
                 $v['bgColor'] = GameConst::$basecolor4;
                 $v['fgColor'] = newColor($v['bgColor']);
                 return $v;
             }],
-    ["전 투 횟 수", "int", function($v){$v['value'] = $v['warnum']; return $v; }],
-    ["승 리", "int", function($v){$v['value'] = $v['killnum']; return $v; }],
+            ["전 투 횟 수", "int", function ($v) {
+                $v['value'] = $v['warnum'];
+                return $v;
+            }],
+            ["승 리", "int", function ($v) {
+                $v['value'] = $v['killnum'];
+                return $v;
+            }],
             ["승 률", "percent", function ($v) {
                 if ($v['warnum'] < 10) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['killnum'] / max(1, $v['warnum']);
                 }
                 return $v;
             }],
-    ["사 살", "int", function($v){$v['value'] = $v['killcrew']; return $v; }],
+            ["점 령", "int", function ($v) {
+                $v['value'] = $v['occupied'];
+                return $v;
+            }],
+            ["사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew'];
+                return $v;
+            }],
             ["살 상 률", "percent", function ($v) {
                 if ($v['warnum'] < 10) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['killcrew'] / max(1, $v['deathcrew']);
                 }
                 return $v;
             }],
-    ["보 병 숙 련 도", "int", function($v){$v['value'] = $v['dex0']; return $v; }],
-    ["궁 병 숙 련 도", "int", function($v){$v['value'] = $v['dex10']; return $v; }],
-    ["기 병 숙 련 도", "int", function($v){$v['value'] = $v['dex20']; return $v; }],
-    ["귀 병 숙 련 도", "int", function($v){$v['value'] = $v['dex30']; return $v; }],
-    ["차 병 숙 련 도", "int", function($v){$v['value'] = $v['dex40']; return $v; }],
+            ["대 인 사 살", "int", function ($v) {
+                $v['value'] = $v['killcrew_person'];
+                return $v;
+            }],
+            ["대 인 살 상 률", "percent", function ($v) {
+                if ($v['warnum'] < 10) {
+                    $v['value'] = 0;
+                } else {
+                    $v['value'] = $v['killcrew_person'] / max(1, $v['deathcrew_person']);
+                }
+                return $v;
+            }],
+            ["보 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex1'];
+                return $v;
+            }],
+            ["궁 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex2'];
+                return $v;
+            }],
+            ["기 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex3'];
+                return $v;
+            }],
+            ["귀 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex4'];
+                return $v;
+            }],
+            ["차 병 숙 련 도", "int", function ($v) {
+                $v['value'] = $v['dex5'];
+                return $v;
+            }],
             ["전 력 전 승 률", "percent", function ($v) {
                 $totalCnt = $v['ttw'] + $v['ttd'] + $v['ttl'];
                 if ($totalCnt < 50) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['ttw'] / max(1, $totalCnt);
                 }
                 return $v;
@@ -112,19 +165,17 @@ $types = [
                 $totalCnt = $v['tlw'] + $v['tld'] + $v['tll'];
                 if ($totalCnt < 50) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['tlw'] / max(1, $totalCnt);
                 }
                 return $v;
             }],
             ["일 기 토 승 률", "percent", function ($v) {
-        $totalCnt = $v['tpw']+$v['tpd']+$v['tpl'];
+                $totalCnt = $v['tsw'] + $v['tsd'] + $v['tsl'];
                 if ($totalCnt < 50) {
                     $v['value'] = 0;
-        }
-        else{
-            $v['value'] = $v['tpw']/max(1, $totalCnt);
+                } else {
+                    $v['value'] = $v['tsw'] / max(1, $totalCnt);
                 }
                 return $v;
             }],
@@ -132,28 +183,44 @@ $types = [
                 $totalCnt = $v['tiw'] + $v['tid'] + $v['til'];
                 if ($totalCnt < 50) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['tiw'] / max(1, $totalCnt);
                 }
 
                 return $v;
             }],
-    ["베 팅 투 자 액", "int", function($v){$v['value'] = $v['betgold']; return $v; }],
-    ["베 팅 당 첨", "int", function($v){$v['value'] = $v['betwin']; return $v; }],
-    ["베 팅 수 익 금", "int", function($v){$v['value'] = $v['betwingold']; return $v; }],
+            ["베 팅 투 자 액", "int", function ($v) {
+                $v['value'] = $v['betgold'];
+                return $v;
+            }],
+            ["베 팅 당 첨", "int", function ($v) {
+                $v['value'] = $v['betwin'];
+                return $v;
+            }],
+            ["베 팅 수 익 금", "int", function ($v) {
+                $v['value'] = $v['betwingold'];
+                return $v;
+            }],
             ["베 팅 수 익 률", "percent", function ($v) {
-        if($v['betgold'] < 1000){
+                if ($v['betgold'] < GameConst::$defaultGold) {
                     $v['value'] = 0;
-        }
-        else{
+                } else {
                     $v['value'] = $v['betwingold'] / max(1, $v['betgold']);
                 }
                 return $v;
             }],
         ];
 
-$generals = array_map(function($general) use($nationColor, $nationName) {
+        $generals = [];
+        foreach ($db->query(
+            "SELECT nation,no,name,owner_name as ownerName, owner, picture, imgsvr,
+    experience, dedication,
+    dex1, dex2, dex3, dex4, dex5,
+    horse, weapon, book, item
+    FROM general WHERE %l",
+            $btn == "NPC 보기" ? "npc>=2" : "npc<2"
+        ) as $general) {
+            $generalID = $general['no'];
             $general['bgColor'] = $nationColor[$general['nation']] ?? GameConst::$basecolor4;
             $general['fgColor'] = newColor($general['bgColor']);
             $general['nationName'] = $nationName[$general['nation']];
@@ -161,27 +228,26 @@ $generals = array_map(function($general) use($nationColor, $nationName) {
             if (key_exists('picture', $general)) {
                 $imageTemp = GetImageURL($general['imgsvr']);
                 $general['pictureFullPath'] = "$imageTemp/{$general['picture']}";
-    }
-    else{
+            } else {
                 $general['pictureFullPath'] = GetImageURL(0) . "/default.jpg";
             }
 
-    return $general;
-}, $db->query(
-    "SELECT nation,no,name,name2 as owner_name, picture, imgsvr, 
-    experience, dedication, firenum, warnum, killnum, killcrew, deathcrew, 
-    dex0, dex10, dex20, dex30, dex40, 
-    ttw, ttd, ttl, tlw, tld, tll, tpw, tpd, tpl, tiw, tid, til,
-    betgold, betwin, betwingold,
-    horse, weap, book, item
-    FROM general WHERE %l", $btn == "NPC 보기"?"npc>=2":"npc<2"));
+            $generals[$generalID] = $general;
+        }
 
+        foreach ($db->queryAllLists('SELECT general_id, `type`, `value` FROM rank_data') as [$generalID, $typeKey, $value]) {
+            if (!key_exists($generalID, $generals)) {
+                continue;
+            }
+            $generals[$generalID][$typeKey] = $value;
+        }
 
         $templates = new \League\Plates\Engine('templates');
 
         foreach ($types as $idx => [$typeName, $typeValue, $typeFunc]) {
             $validCnt = 0;
-    $typeGenerals = array_map(function($general) use($typeValue, $typeFunc, &$validCnt){
+            $typeGenerals = array_map(function ($general) use ($typeValue, $typeFunc, &$validCnt, $ownerNameList) {
+                $general['ownerName'] = $ownerNameList[$general['owner']] ?? null;
                 $general = ($typeFunc)($general);
                 $value = $general['value'];
 
@@ -191,8 +257,7 @@ foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
 
                 if ($typeValue == 'percent') {
                     $general['printValue'] = number_format($value * 100, 2) . '%';
-        }
-        else {
+                } else {
                     $general['printValue'] = number_format($value);
                 }
                 return $general;
@@ -211,50 +276,91 @@ foreach($types as $idx=>[$typeName, $typeValue, $typeFunc]){
         }
         ?>
     </div>
-<div style="margin:auto;width=1000px;margin-top:5px;">
+    <div style="margin:auto;width:1100px;margin-top:5px;">
         <?php
         //유니크 아이템 소유자
         $itemTypes = [
-    ["명 마", 'horse', function($v){return getHorseName($v);}, 7, 26, []],
-    ["명 검", 'weap', function($v){return getWeapName($v);}, 7, 26, []],
-    ["명 서", 'book', function($v){return getBookName($v);}, 7, 26, []],
-    ["도 구", 'item', function($v){return displayItemInfo($v);}, 7, 26, []],
+            'horse' => '명 마',
+            'weapon' => '명 검',
+            'book' => '명 서',
+            'item' => '도 구'
         ];
 
-$simpleItemTypes = array_map(function($itemType){return $itemType[1];}, $itemTypes);
+        $simpleItemTypes = array_keys($itemTypes);
+        array_map(function ($itemType) {
+            return $itemType[1];
+        }, $itemTypes);
+        $itemOwners = [];
 
         foreach ($generals as $general) {
-    foreach($itemTypes as $itemIdx=>[,$itemType, $itemFunc,,,]){
-        $itemCode = $general[$itemType];
-        if($itemCode <= 6){
+            foreach ($itemTypes as $itemType => $itemTypeName) {
+                $itemClassName = $general[$itemType];
+                $itemClass = buildItemClass($itemClassName);
+                if ($itemClass->isBuyable()) {
                     continue;
                 }
 
-        $itemName = ($itemFunc)($itemCode);
-        $general['rankName'] = $itemName;
-        $general['value'] = $itemCode;
-        $itemTypes[$itemIdx][5][$itemCode] = $general;
+                if (key_exists($itemClassName, $itemOwners)) {
+                    $itemOwners[$itemClassName][] = $general;
+                } else {
+                    $itemOwners[$itemClassName] = [$general];
+                }
             }
         }
 
-foreach($itemTypes as [$itemNameType, $itemType, $itemFunc, $itemMinCode, $itemMaxCode, $itemOwners]){
+        foreach (GameConst::$allItems as $itemType => $itemList) {
+            $itemNameType = $itemTypes[$itemType];
+            $itemList = array_reverse($itemList, true);
+
+
             $itemRanker = [];
-    for($itemCode = $itemMaxCode; $itemCode >= $itemMinCode; $itemCode--){
-        if(!key_exists($itemCode, $itemOwners)){
+            foreach ($itemList as $itemClassName => $itemCnt) {
+                if ($itemCnt == 0) {
+                    continue;
+                }
+                $itemClass = buildItemClass($itemClassName);
+
+                if ($itemClass->isBuyable()) {
+                    continue;
+                }
+
+                $info = $itemClass->getInfo();
+                $name = $itemClass->getName();
+
+
+                if ($info) {
+                    $name = $templates->render('tooltip', [
+                        'text' => $name,
+                        'info' => $info,
+                    ]);
+                }
+                foreach (Util::range($itemCnt) as $itemIdx) {
+                    if (($itemOwners[$itemClassName][$itemIdx] ?? null) === null) {
                         $emptyCard = [
-                'rankName' => ($itemFunc)($itemCode),
+                            'rankName' => $name,
                             'pictureFullPath' => GetImageURL(0) . "/default.jpg",
-                'value'=>$itemCode,
+                            'value' => $itemClassName,
                             'name' => '미발견',
                             'bgColor' => GameConst::$basecolor4,
                             'fgColor' => newColor(GameConst::$basecolor4),
                         ];
-            $itemRanker[$itemCode] = $emptyCard;
+                        $itemRanker[] = $emptyCard;
                         continue;
                     }
 
-        $general = $itemOwners[$itemCode];
-        $itemRanker[$itemCode] = $general;
+                    $general = $itemOwners[$itemClassName][$itemIdx];
+
+                    $card = [
+                        'rankName' => $name,
+                        'pictureFullPath' => $general['pictureFullPath'],
+                        'value' => $itemClassName,
+                        'nationName' => $general['nationName'],
+                        'name' => $general['name'],
+                        'bgColor' => $general['bgColor'],
+                        'fgColor' => $general['fgColor'],
+                    ];
+                    $itemRanker[] = $card;
+                }
             }
 
             echo $templates->render('hallOfFrame', [
@@ -265,9 +371,13 @@ foreach($itemTypes as [$itemNameType, $itemType, $itemFunc, $itemMinCode, $itemM
         ?>
     </div>
     <table align=center width=1100 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?> </td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?> </td>
+        </tr>
     </table>
 </body>
-</html>
 
+</html>

hwe/a_emperior.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -16,20 +17,20 @@ increaseRefresh("왕조일람", 1);
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
+    <?= WebUtil::printJS('../d_shared/common_path.js') ?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
+    <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
 
 <body>
     <table align=center width=1000 class="tb_layout bg0">
-    <tr><td>역 대 왕 조<br>
+        <tr>
+            <td>역 대 왕 조<br>
                 <button onclick=window.close()>창 닫기</button><br>
-    </td></tr>
+            </td>
+        </tr>
     </table>
 
     <?php
@@ -54,7 +55,7 @@ if ($showCurrentNation) {
             <tr>
                 <td style="background-color:#333333;" align=center colspan=8>
                     <font size=5>현재 (<?= $year ?>年 <?= $month ?>月)</font>
-            <a href="a_history.php"><button>역사 보기</button></a>
+                    <a href="a_history.php"><button type='button'>역사 보기</button></a>
                 </td>
             </tr>
         </table>
@@ -71,38 +72,48 @@ foreach($emperiors as $emperior){
                 <td bgcolor=skyblue align=center colspan=8>
                     <font size=5><?= $emperior['phase'] ?></font>
 
-            <a href="a_emperior_detail.php?select=<?=$emperior['no']?>"><button>자세히</button></a>
+                    <a href="a_emperior_detail.php?select=<?= $emperior['no'] ?>"><button type='button'>자세히</button></a>
 
                     <?php if ($emperior['server_id']) : ?>
-            <a href="a_history.php?serverID=<?=$emperior['server_id']?>"><button>역사 보기</button></a>
+                        <a href="a_history.php?serverID=<?= $emperior['server_id'] ?>"><button type='button'>역사 보기</button></a>
                     <?php endif ?>
                 </td>
             </tr>
             <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor=<?=$emperior['color']?> colspan=8>
+                <td align=center style='color:<?= newColor($emperior['color']) ?>;background-color:<?= $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 class='bg1' align=center width=80>국 력</td>
                 <td align=center width=170><?= $emperior['power'] ?></td>
-        <td id=bg1 align=center width=80>장 수</td>
+                <td class='bg1' align=center width=80>장 수</td>
                 <td align=center width=170><?= $emperior['gennum'] ?></td>
-        <td id=bg1 align=center width=80>속 령</td>
+                <td class='bg1' align=center width=80>속 령</td>
                 <td align=center width=170><?= $emperior['citynum'] ?></td>
-        <td id=bg1 align=center width=80>성 향</td>
+                <td class='bg1' align=center width=80>성 향</td>
                 <td align=center width=170><?= $emperior['type'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>황 제</td>
+                <td class='bg1' align=center>황 제</td>
                 <td align=center><?= $emperior['l12name'] ?></td>
-        <td id=bg1 align=center>승 상</td>
+                <td class='bg1' align=center>승 상</td>
                 <td align=center><?= $emperior['l11name'] ?></td>
-        <td id=bg1 align=center>위 장 군</td>
+                <td class='bg1' align=center>표 기 장 군</td>
                 <td align=center><?= $emperior['l10name'] ?></td>
-        <td id=bg1 align=center>사 공</td>
+                <td class='bg1' align=center>사 공</td>
                 <td align=center><?= $emperior['l9name'] ?></td>
             </tr>
+            <tr>
+                <td class='bg1' align=center>거 기 장 군</td>
+                <td align=center><?= $emperior['l8name'] ?></td>
+                <td class='bg1' align=center>태 위</td>
+                <td align=center><?= $emperior['l7name'] ?></td>
+                <td class='bg1' align=center>위 장 군</td>
+                <td align=center><?= $emperior['l6name'] ?></td>
+                <td class='bg1' align=center>사 도</td>
+                <td align=center><?= $emperior['l5name'] ?></td>
+            </tr>
         </table>
 
 
@@ -112,8 +123,13 @@ foreach($emperiors as $emperior){
     ?>
 
     <table style="margin-top:10px;" align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/a_emperior2.php

@@ -1,213 +0,0 @@
-<?php
-namespace sammo;
-
-include "lib.php";
-include "func.php";
-
-$select = Util::getReq('select', 'int', 0);
-
-extractMissingPostToGlobals();
-
-$db = DB::db();
-$connect=$db->get();
-
-increaseRefresh("왕조일람", 2);
-?>
-<!DOCTYPE html>
-<html>
-
-<head>
-<meta charset="UTF-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=1024" />
-<title><?=UniqueConst::$serverName?>: 왕조일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
-<?=WebUtil::printCSS('../d_shared/common.css')?>
-<?=WebUtil::printCSS('css/common.css')?>
-
-</head>
-
-<body>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>역 대 왕 조<br>
-        <input type=button value='창 닫기' onclick=window.close()><br>
-    </td></tr>
-</table>
-
-<?php
-
-if ($select == 0) {
-    $query = "select * from emperior_table order by no desc";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $empcount = MYDB_num_rows($result);
-
-    for ($i=0; $i < $empcount; $i++) {
-        $emperior = MYDB_fetch_array($result);
-
-        echo "
-<form action=a_emperior2.php method=post>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=8>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='자세히'>
-            <input type=hidden name=select value='{$emperior['no']}'>
-        </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>
-    </tr>
-    <tr>
-        <td id=bg1 align=center width=80>국 력</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 id=bg1 align=center width=80>속 령</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>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>황 제</td>
-        <td align=center>{$emperior['l12name']}</td>
-        <td id=bg1 align=center>승 상</td>
-        <td align=center>{$emperior['l11name']}</td>
-        <td id=bg1 align=center>위 장 군</td>
-        <td align=center>{$emperior['l10name']}</td>
-        <td id=bg1 align=center>사 공</td>
-        <td align=center>{$emperior['l9name']}</td>
-    </tr>
-</table>
-</form>";
-    }
-} else {
-    $query = "select * from emperior_table where no='$select'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-    $emperior = MYDB_fetch_array($result);
-
-    echo "
-<form action=a_emperior2.php method=post>
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr>
-        <td bgcolor=skyblue align=center colspan=6>
-            <font size=5>{$emperior['phase']}</font>
-            <input type=submit value='전체보기'>
-            <input type=hidden name=select value='0'>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['nation_count']}</td>
-        <td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
-        <td align=center width=398 colspan=2>{$emperior['gen_count']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>등 장 국 가</td>
-        <td colspan=5>{$emperior['nation_name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국가별 성향</td>
-        <td colspan=5>{$emperior['nation_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 성 격</td>
-        <td colspan=5>{$emperior['personal_hist']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 특 기</td>
-        <td colspan=5>{$emperior['special_hist']}</td>
-    </tr>
-    <tr>
-        <td align=center style=color:".newColor($emperior['color'])."; bgcolor={$emperior['color']} colspan=6>
-            <font size=5>{$emperior['name']} ({$emperior['year']}年 {$emperior['month']}月)</font>
-        </td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>국 력</td>
-        <td align=center width=398 colspan=2>{$emperior['power']}</td>
-        <td id=bg1 width=98 align=center>성 향</td>
-        <td align=center width=398 colspan=2>{$emperior['type']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 width=98 align=center>장 수</td>
-        <td align=center width=398 colspan=2>{$emperior['gennum']}</td>
-        <td id=bg1 width=98 align=center>속 령</td>
-        <td align=center width=398 colspan=2>{$emperior['citynum']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>총 인 구</td>
-        <td align=center colspan=2>{$emperior['pop']}</td>
-        <td id=bg1 align=center>인 구 율</td>
-        <td align=center colspan=2>{$emperior['poprate']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>국 고</td>
-        <td align=center colspan=2>{$emperior['gold']}</td>
-        <td id=bg1 align=center>병 량</td>
-        <td align=center colspan=2>{$emperior['rice']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>황 제</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l12name']}</td>
-        <td id=bg1 align=center>승 상</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l11name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>위 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l10name']}</td>
-        <td id=bg1 align=center>사 공</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l9name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>표 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l8name']}</td>
-        <td id=bg1 align=center>태 위</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l7name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l6name']}</td>
-        <td id=bg1 align=center>사 도</td>
-        <td width=64>&nbsp;</td>
-        <td width=332>{$emperior['l5name']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>오 호 장 군</td>
-        <td colspan=5>{$emperior['tiger']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>건 안 칠 자</td>
-        <td colspan=5>{$emperior['eagle']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
-        <td colspan=5>{$emperior['gen']}</td>
-    </tr>
-    <tr>
-        <td id=bg1 align=center>역 사 기 록</td>
-        <td colspan=5>".ConvertLog($emperior['history'], 1)."</td>
-    </tr>
-</table>
-</form>";
-}
-?>
-
-<table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
-</table>
-</body>
-</html>
-

hwe/a_emperior_detail.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -26,21 +27,21 @@ $serverID = $emperior['server_id']??($emperior['serverID']??null);
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <title><?= UniqueConst::$serverName ?>: 왕조일람</title>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
-<?=WebUtil::printJS('js/common.js')?>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
+    <?= WebUtil::printDist('ts', 'common', true) ?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
 
 </head>
 
 <body>
     <table align=center width=1000 class="tb_layout bg0">
-    <tr><td>역 대 왕 조<br>
+        <tr>
+            <td>역 대 왕 조<br>
                 <button onclick=window.close()>창 닫기</button>
-        <div style="float:right;"><a href="a_emperior.php"><button>전체보기</button></a><div>
-    </td></tr>
+                <div style="float:right;"><a href="a_emperior.php"><button type='button'>전체보기</button></a>
+                    <div>
+            </td>
+        </tr>
 
     </table>
 
@@ -57,25 +58,25 @@ if($emperior):
                 </td>
             </tr>
             <tr>
-        <td id=bg1 width=98 align=center>국 가 수<br>(최종 / 최대)</td>
+                <td class='bg1' width=98 align=center>국 가 수<br>(최종 / 최대)</td>
                 <td align=center width=398 colspan=2><?= $emperior['nation_count'] ?></td>
-        <td id=bg1 width=98 align=center>장 수 수<br>(최종 / 최대)</td>
+                <td class='bg1' width=98 align=center>장 수 수<br>(최종 / 최대)</td>
                 <td align=center width=398 colspan=2><?= $emperior['gen_count'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>등 장 국 가</td>
+                <td class='bg1' align=center>등 장 국 가</td>
                 <td colspan=5><?= $emperior['nation_name'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>국가별 성향</td>
+                <td class='bg1' align=center>국가별 성향</td>
                 <td colspan=5><?= $emperior['nation_hist'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>장 수 성 격</td>
+                <td class='bg1' align=center>장 수 성 격</td>
                 <td colspan=5><?= $emperior['personal_hist'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>장 수 특 기</td>
+                <td class='bg1' align=center>장 수 특 기</td>
                 <td colspan=5><?= $emperior['special_hist'] ?></td>
             </tr>
             <tr>
@@ -84,76 +85,76 @@ if($emperior):
                 </td>
             </tr>
             <tr>
-        <td id=bg1 width=98 align=center>국 력</td>
+                <td class='bg1' width=98 align=center>국 력</td>
                 <td align=center width=398 colspan=2><?= $emperior['power'] ?></td>
-        <td id=bg1 width=98 align=center>성 향</td>
+                <td class='bg1' width=98 align=center>성 향</td>
                 <td align=center width=398 colspan=2><?= $emperior['type'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 width=98 align=center>장 수</td>
+                <td class='bg1' width=98 align=center>장 수</td>
                 <td align=center width=398 colspan=2><?= $emperior['gennum'] ?></td>
-        <td id=bg1 width=98 align=center>속 령</td>
+                <td class='bg1' width=98 align=center>속 령</td>
                 <td align=center width=398 colspan=2><?= $emperior['citynum'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>총 인 구</td>
+                <td class='bg1' align=center>총 인 구</td>
                 <td align=center colspan=2><?= $emperior['pop'] ?></td>
-        <td id=bg1 align=center>인 구 율</td>
+                <td class='bg1' align=center>인 구 율</td>
                 <td align=center colspan=2><?= $emperior['poprate'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>국 고</td>
+                <td class='bg1' align=center>국 고</td>
                 <td align=center colspan=2><?= $emperior['gold'] ?></td>
-        <td id=bg1 align=center>병 량</td>
+                <td class='bg1' align=center>병 량</td>
                 <td align=center colspan=2><?= $emperior['rice'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>황 제</td>
+                <td class='bg1' align=center>황 제</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l12name'] ?></td>
-        <td id=bg1 align=center>승 상</td>
+                <td class='bg1' align=center>승 상</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l11name'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>위 장 군</td>
+                <td class='bg1' align=center>위 장 군</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l10name'] ?></td>
-        <td id=bg1 align=center>사 공</td>
+                <td class='bg1' align=center>사 공</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l9name'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>표 기 장 군</td>
+                <td class='bg1' align=center>표 기 장 군</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l8name'] ?></td>
-        <td id=bg1 align=center>태 위</td>
+                <td class='bg1' align=center>태 위</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l7name'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>거 기 장 군</td>
+                <td class='bg1' align=center>거 기 장 군</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l6name'] ?></td>
-        <td id=bg1 align=center>사 도</td>
+                <td class='bg1' align=center>사 도</td>
                 <td width=64>&nbsp;</td>
                 <td width=332><?= $emperior['l5name'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>오 호 장 군</td>
+                <td class='bg1' align=center>오 호 장 군</td>
                 <td colspan=5><?= $emperior['tiger'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>건 안 칠 자</td>
+                <td class='bg1' align=center>건 안 칠 자</td>
                 <td colspan=5><?= $emperior['eagle'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>장 수 들<br>(공헌도 순서)</td>
+                <td class='bg1' align=center>장 수 들<br>(공헌도 순서)</td>
                 <td colspan=5><?= $emperior['gen'] ?></td>
             </tr>
             <tr>
-        <td id=bg1 align=center>역 사 기 록</td>
-        <td colspan=5><?=ConvertLog($emperior['history'], 1)?></td>
+                <td class='bg1' align=center>역 사 기 록</td>
+                <td colspan=5><?= formatHistoryToHTML(Json::decode($emperior['history'])) ?></td>
             </tr>
         </table>
 
@@ -176,24 +177,25 @@ if($showServers){
 
             $nation['typeName'] = getNationType($nation['type']);
             $nation['levelName'] = getNationLevel($nation['level']);
-        if($nation['generals']){
-            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);
+            /** @var int[]|null $nationGenerals */
+            $nationGenerals = $nation['generals'];
 
-            if(count($generals) != $nation['generals'] && $serverID == UniqueConst::$serverID){
-                $liveGenerals = $nation['generals'];
+            if ($nationGenerals) {
+                $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nationGenerals);
+
+                if (count($generals) != count($nationGenerals) && $serverID == UniqueConst::$serverID) {
+                    $liveGenerals = $nationGenerals;
                     foreach ($generals as $general) {
-                    if(in_array($general['general_no'], $nation['generals'])){
-                        unset($nation['generals'][$general['general_no']]);
+                        if (in_array($general['general_no'], $nationGenerals)) {
+                            unset($nationGenerals[$general['general_no']]);
                         }
                     }
                     $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
                     $nation['generalsFull'] = array_merge($liveGenerals, $generals);
-            }
-            else{
+                } else {
                     $nation['generalsFull'] = $generals;
                 }
-        }
-        else{
+            } else {
                 $nation['generalsFull'] = [];
             }
 
@@ -207,8 +209,13 @@ if($showServers){
     ?>
 
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
     </table>
 </body>
+
 </html>

hwe/a_genList.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 include "lib.php";
@@ -6,21 +7,16 @@ include "func.php";
 
 $type = Util::getReq('type', 'int', 9);
 
-extractMissingPostToGlobals();
-
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
-$connect=$db->get();
 
 increaseRefresh("장수일람", 2);
 
-$query = "select con,turntime from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$me = MYDB_fetch_array($result);
+$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID);
 
 $con = checkLimit($me['con']);
 if ($con >= 2) {
@@ -32,6 +28,13 @@ if ($type <= 0 || $type > 15) {
     $type = 9;
 }
 
+$ownerNameList = [];
+if ($gameStor->isunited) {
+    foreach (RootDB::db()->queryAllLists('SELECT no, name FROM member') as [$ownerID, $ownerName]) {
+        $ownerNameList[$ownerID] = $ownerName;
+    }
+}
+
 ?>
 <!DOCTYPE html>
 <html>
@@ -41,20 +44,21 @@ if ($type <= 0 || $type > 15) {
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=1024" />
     <title><?= UniqueConst::$serverName ?>: 장수일람</title>
-<?=WebUtil::printCSS('../e_lib/bootstrap.min.css')?>
     <?= WebUtil::printCSS('../d_shared/common.css') ?>
-<?=WebUtil::printCSS('css/common.css')?>
-<?=WebUtil::printJS('../e_lib/jquery-3.3.1.min.js')?>
-<?=WebUtil::printJS('../e_lib/bootstrap.bundle.min.js')?>
+    <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard/dist/web/static/pretendard.css" />
     <?= WebUtil::printJS('../d_shared/common_path.js') ?>
-<?=WebUtil::printJS('js/common.js')?>
+    <?= WebUtil::printDist('ts', 'common') ?>
 
 </head>
 
 <body>
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td>장 수 일 람<br><?=closeButton()?></td></tr>
-    <tr><td><form name=form1 method=post>정렬순서 :
+        <tr>
+            <td>장 수 일 람<br><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td>
+                <form name=form1 method=post>정렬순서 :
                     <select id='viewType' name='type' size=1>
                         <option value=1>국가</option>
                         <option value=2>통솔</option>
@@ -72,8 +76,10 @@ if ($type <= 0 || $type > 15) {
                         <option value=14>연령</option>
                         <option value=15>NPC</option>
                     </select>
-        <input type=submit value='정렬하기'></form>
-    </td></tr>
+                    <input type=submit value='정렬하기'>
+                </form>
+            </td>
+        </tr>
     </table>
     <?php
     $nationname = [];
@@ -84,57 +90,50 @@ foreach (getAllNationStaticInfo() as $nation) {
         $nationlevel[$nation['nation']] = $nation['level'];
     }
 
-switch ($type) { //FIXME:  $query 처리 조심.
-    case  1: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by nation"; break;
-    case  2: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by leader desc"; break;
-    case  3: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by power desc"; break;
-    case  4: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by intel desc"; break;
-    case  5: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case  6: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by dedication desc"; break;
-    case  7: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by level desc"; break;
-    case  8: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by killturn"; break;
-    default:
-    case  9: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by connect desc"; break;
-    case 10: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by experience desc"; break;
-    case 11: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by personal"; break;
-    case 12: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special desc"; break;
-    case 13: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by special2 desc"; break;
-    case 14: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by age desc"; break;
-    case 15: $query = "select no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leader,power,intel,experience,dedication,level,killturn,connect from general order by npc desc"; break;
-}
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
-$gencount = MYDB_num_rows($genresult);
+
+    [$orderKey, $orderDesc] = [
+        1 => ['nation', false],
+        2 => ['leadership', true],
+        3 => ['strength', true],
+        4 => ['intel', true],
+        5 => ['experience', true],
+        6 => ['dedication', true],
+        7 => ['officer_level', true],
+        8 => ['killturn', false],
+        9 => ['connect', true],
+        10 => ['experience', true],
+        11 => ['personal', true],
+        12 => ['special', true],
+        13 => ['special2', true],
+        14 => ['age', true],
+        15 => ['npc', true],
+    ][$type];
+
+    $generalList = $db->query('SELECT owner,no,picture,imgsvr,npc,age,nation,special,special2,personal,name,injury,leadership,strength,intel,experience,dedication,officer_level,killturn,connect from general order by %b %l', $orderKey, $orderDesc ? 'desc' : '');
 
     echo "
 <table align=center width=1000 class='tb_layout bg0'>
     <tr>
-        <td width=64  align=center id=bg1>얼 굴</td>
-        <td width=140 align=center id=bg1>이 름</td>
-        <td width=45 align=center id=bg1>연령</td>
-        <td width=45 align=center id=bg1>성격</td>
-        <td width=80 align=center id=bg1>특기</td>
-        <td width=45 align=center id=bg1>레 벨</td>
-        <td width=140 align=center id=bg1>국 가</td>
-        <td width=55 align=center id=bg1>명 성</td>
-        <td width=55 align=center id=bg1>계 급</td>
-        <td width=75 align=center id=bg1>관 직</td>
-        <td width=45 align=center id=bg1>통솔</td>
-        <td width=45 align=center id=bg1>무력</td>
-        <td width=45 align=center id=bg1>지력</td>
-        <td width=45 align=center id=bg1>삭턴</td>
-        <td width=70 align=center id=bg1>벌점</td>
+        <td width=64  align=center class='bg1'>얼 굴</td>
+        <td width=140 align=center class='bg1'>이 름</td>
+        <td width=45 align=center class='bg1'>연령</td>
+        <td width=45 align=center class='bg1'>성격</td>
+        <td width=80 align=center class='bg1'>특기</td>
+        <td width=45 align=center class='bg1'>레 벨</td>
+        <td width=140 align=center class='bg1'>국 가</td>
+        <td width=55 align=center class='bg1'>명 성</td>
+        <td width=55 align=center class='bg1'>계 급</td>
+        <td width=75 align=center class='bg1'>관 직</td>
+        <td width=45 align=center class='bg1'>통솔</td>
+        <td width=45 align=center class='bg1'>무력</td>
+        <td width=45 align=center class='bg1'>지력</td>
+        <td width=45 align=center class='bg1'>삭턴</td>
+        <td width=70 align=center class='bg1'>벌점</td>
     </tr>";
-for ($j=0; $j < $gencount; $j++) {
-    $general = MYDB_fetch_array($genresult);
+    foreach ($generalList as $general) {
         $nation = $nationname[$general['nation']];
 
-    if ($general['level'] == 12) {
-        $lbonus = $nationlevel[$general['nation']] * 2;
-    } elseif ($general['level'] >= 5) {
-        $lbonus = $nationlevel[$general['nation']];
-    } else {
-        $lbonus = 0;
-    }
+        $lbonus = calcLeadershipBonus($general['officer_level'], $nationlevel[$general['nation']] ?? 0);
         if ($lbonus > 0) {
             $lbonusText = "<font color=cyan>+{$lbonus}</font>";
         } else {
@@ -142,35 +141,35 @@ for ($j=0; $j < $gencount; $j++) {
         }
 
         if ($general['injury'] > 0) {
-        $leader = intdiv($general['leader'] * (100 - $general['injury']), 100);
-        $power = intdiv($general['power'] * (100 - $general['injury']), 100);
+            $leadership = intdiv($general['leadership'] * (100 - $general['injury']), 100);
+            $strength = intdiv($general['strength'] * (100 - $general['injury']), 100);
             $intel = intdiv($general['intel'] * (100 - $general['injury']), 100);
-        $leader = "<font color=red>{$leader}</font>{$lbonusText}";
-        $power = "<font color=red>{$power}</font>";
+            $leadership = "<font color=red>{$leadership}</font>{$lbonusText}";
+            $strength = "<font color=red>{$strength}</font>";
             $intel = "<font color=red>{$intel}</font>";
         } else {
-        $leader = "{$general['leader']}{$lbonusText}";
-        $power = "{$general['power']}";
+            $leadership = "{$general['leadership']}{$lbonusText}";
+            $strength = "{$general['strength']}";
             $intel = "{$general['intel']}";
         }
 
-    if ($general['npc'] >= 2) {
-        $name = "<font color=cyan>{$general['name']}</font>";
-    } elseif ($general['npc'] == 1) {
-        $name = "<font color=skyblue>{$general['name']}</font>";
-    } else {
-        $name =  "{$general['name']}";
+
+
+        $name = formatName($general['name'], $general['npc']);
+
+        if (key_exists($general['owner'], $ownerNameList)) {
+            $name = $name . '<br><small>(' . $ownerNameList[$general['owner']] . ')</small>';
         }
 
-    $general['connect'] = Util::round($general['connect'] / 10) * 10;
+        $general['connect'] = Util::round($general['connect'], -1);
 
         $imageTemp = GetImageURL($general['imgsvr']);
         echo "
     <tr data-general-id='{$general['no']}'
         data-general-wounded='{$general['injury']}'
-        data-general-leadership='{$general['leader']}'
+        data-general-leadership='{$general['leadership']}'
         data-general-leadership-bonus='{$lbonus}'
-        data-general-power='{$general['power']}'
+        data-general-strength='{$general['strength']}'
         data-general-intel='{$general['intel']}'
         data-is-npc='" . ($general['npc'] >= 2 ? 'true' : 'false') . "'
     >
@@ -178,16 +177,16 @@ for ($j=0; $j < $gencount; $j++) {
         <td align=center>$name</td>
         <td align=center>{$general['age']}세</td>
         <td align=center>" . displayCharInfo($general['personal']) . "</td>
-        <td align=center>".displaySpecialInfo($general['special'])." / ".displaySpecialInfo($general['special2'])."</td>
+        <td align=center>" . displaySpecialDomesticInfo($general['special']) . " / " . displaySpecialWarInfo($general['special2']) . "</td>
         <td align=center>Lv " . getExpLevel($general['experience']) . "</td>
         <td align=center>{$nation}</td>
         <td align=center>" . getHonor($general['experience']) . "</td>
         <td align=center>" . getDed($general['dedication']) . "</td>
         <td align=center>";
-    echo getLevel($general['level']);
+        echo getOfficerLevelText($general['officer_level']);
         echo "</td>
-        <td align=center>$leader</td>
-        <td align=center>$power</td>
+        <td align=center>$leadership</td>
+        <td align=center>$strength</td>
         <td align=center>$intel</td>
         <td align=center>{$general['killturn']}</td>
         <td align=center>{$general['connect']}";
@@ -201,8 +200,12 @@ echo "
     ?>
 
     <table align=center width=1000 class='tb_layout bg0'>
-    <tr><td><?=closeButton()?></td></tr>
-    <tr><td><?=banner()?></td></tr>
+        <tr>
+            <td><?= closeButton() ?></td>
+        </tr>
+        <tr>
+            <td><?= banner() ?></td>
+        </tr>
     </table>
     <script type="text/javascript">
         $(document).ready(function() {