diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php
index ef69b1e1..b00137da 100644
--- a/f_install/j_setup_db.php
+++ b/f_install/j_setup_db.php
@@ -11,6 +11,11 @@ $dbName = Util::getReq('db_name');
$servHost = Util::getReq('serv_host');
$sharedIconPath = Util::getReq('shared_icon_path');
$gameImagePath = Util::getReq('game_image_path');
+$imageRequestKey = Util::getReq('image_request_key');
+
+$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', '');
+$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', '');
+
if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) {
Json::die([
@@ -186,6 +191,8 @@ $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',
@@ -193,11 +200,17 @@ $result = Util::generateFileUsingSimpleTemplate(
[
'serverBasePath'=>$servHost,
'sharedIconPath'=>$sharedIconPath,
- 'gameImagePath'=>$gameImagePath
+ 'gameImagePath'=>$gameImagePath,
+ 'imageRequestPath'=>$imageRequestPath,
+ 'imageRequestKey'=>$imageRequestKey
],
true
);
+if($imageRequestKey){
+ @file_get_contents($imageKeyInstallPath.'?key='.$imageRequestKey);
+}
+
if ($result !== true) {
Json::die([
'result'=>false,
@@ -263,10 +276,15 @@ $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
);
@@ -280,5 +298,6 @@ if ($result !== true) {
Json::die([
'result'=>true,
- 'reason'=>'success'
+ 'reason'=>'success',
+ 'globalSalt'=>$globalSalt
]);
diff --git a/f_install/templates/RootDB.orig.php b/f_install/templates/RootDB.orig.php
index 64c69998..f41fbd15 100644
--- a/f_install/templates/RootDB.orig.php
+++ b/f_install/templates/RootDB.orig.php
@@ -30,7 +30,7 @@ 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= false;
+ self::$uDB->error_handler= function(){};
self::$uDB->throw_exception_on_error = true;
self::$uDB->throw_exception_on_nonsql_error = true;
}
diff --git a/f_install/templates/ServConfig.orig.php b/f_install/templates/ServConfig.orig.php
index adb6b8be..ef6c7aa3 100644
--- a/f_install/templates/ServConfig.orig.php
+++ b/f_install/templates/ServConfig.orig.php
@@ -10,6 +10,8 @@ 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_';
public static function getSharedIconPath(string $filepath='') : string
{
@@ -32,6 +34,13 @@ 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}";
+ }
+
/**
* 서버 주소 반환. 서버의 경로가 하부 디렉토리인 경우에 하부 디렉토리까지 포함
diff --git a/f_install/templates/common.orig.css b/f_install/templates/common.orig.css
index d3b58b00..506e4a6a 100644
--- a/f_install/templates/common.orig.css
+++ b/f_install/templates/common.orig.css
@@ -88,6 +88,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;
@@ -109,4 +162,11 @@
.map_theme_chess .map_bglayer1{
background: url('_tK_gameImagePath_/map/chess/chessboard.png') no-repeat;
background-size: 700px 500px;
-}
\ No newline at end of file
+}
+
+
+/*포켓몬 v1 지도*/
+.map_theme_pokemon_v1 .map_bglayer1{
+ background: url('_tK_gameImagePath_/map/pokemon_v1/back_pal8.png') no-repeat;
+ background-size: 700px 500px;
+}
diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php
index 88690181..b5223c2b 100644
--- a/i_entrance/entrance.php
+++ b/i_entrance/entrance.php
@@ -32,6 +32,7 @@ $acl = $session->acl;
+
diff --git a/index.php b/index.php
index a6ff8f98..0538c213 100644
--- a/index.php
+++ b/index.php
@@ -196,7 +196,7 @@ function postOAuthResult(result){